From 9c367ab6cd9afe993d817fed8372496f5c49119a Mon Sep 17 00:00:00 2001
From: Julien Odent <jodent@fb.com>
Date: Mon, 16 Jul 2018 05:35:02 -0700
Subject: [PATCH] Don't accept dashes (-) as token separators

Summary:
This is causing some issues, e.g. `20-30` resolving to 8:30pm (latent).
Updating `Numeral` rules to account for that (`EN`, `FR`, `NL` following tests).

Differential Revision: D8854891

fbshipit-source-id: ba17099b014d9cf2f48a7d85147cc890b02578f5
---
 Duckling/Numeral/EN/Rules.hs          |   2 +
 Duckling/Numeral/FR/Rules.hs          |   8 +-
 Duckling/Numeral/NL/Rules.hs          |   2 +-
 Duckling/Ranking/Classifiers/DA_XX.hs | 251 ++++----
 Duckling/Ranking/Classifiers/DE_XX.hs | 407 ++++++------
 Duckling/Ranking/Classifiers/EL_XX.hs | 622 +++++++++----------
 Duckling/Ranking/Classifiers/EN_AU.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_BZ.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_CA.hs | 852 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_GB.hs | 842 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_IE.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_IN.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_JM.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_NZ.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_PH.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_TT.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/EN_US.hs | 863 +++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_XX.hs | 840 ++++++++++++-------------
 Duckling/Ranking/Classifiers/EN_ZA.hs | 791 ++++++++++++-----------
 Duckling/Ranking/Classifiers/ES_XX.hs |  98 ++-
 Duckling/Ranking/Classifiers/FR_XX.hs | 606 +++++++++---------
 Duckling/Ranking/Classifiers/HE_XX.hs | 152 +++--
 Duckling/Ranking/Classifiers/HR_XX.hs | 392 ++++++------
 Duckling/Ranking/Classifiers/IT_XX.hs | 270 ++++----
 Duckling/Ranking/Classifiers/KO_XX.hs | 244 ++++----
 Duckling/Ranking/Classifiers/NB_XX.hs | 260 ++++----
 Duckling/Ranking/Classifiers/NL_BE.hs | 414 ++++++------
 Duckling/Ranking/Classifiers/NL_NL.hs | 414 ++++++------
 Duckling/Ranking/Classifiers/NL_XX.hs | 414 ++++++------
 Duckling/Ranking/Classifiers/PL_XX.hs | 362 +++++------
 Duckling/Ranking/Classifiers/PT_XX.hs | 184 +++---
 Duckling/Ranking/Classifiers/SV_XX.hs | 260 ++++----
 Duckling/Types/Document.hs            |   2 +-
 33 files changed, 7686 insertions(+), 8194 deletions(-)

diff --git a/Duckling/Numeral/EN/Rules.hs b/Duckling/Numeral/EN/Rules.hs
index 3e0e3ceb..28a0b4b7 100644
--- a/Duckling/Numeral/EN/Rules.hs
+++ b/Duckling/Numeral/EN/Rules.hs
@@ -148,10 +148,12 @@ ruleCompositeTens = Rule
   { name = "integer 21..99"
   , pattern =
     [ oneOf [20,30..90]
+    , regex "[\\s\\-]+"
     , numberBetween 1 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = tens}:
+       _:
        Token Numeral NumeralData{TNumeral.value = units}:
        _) -> double $ tens + units
       _ -> Nothing
diff --git a/Duckling/Numeral/FR/Rules.hs b/Duckling/Numeral/FR/Rules.hs
index ed0100a4..f65ef7b6 100644
--- a/Duckling/Numeral/FR/Rules.hs
+++ b/Duckling/Numeral/FR/Rules.hs
@@ -57,10 +57,12 @@ ruleNumerals2 = Rule
   { name = "numbers 22..29 32..39 .. 52..59"
   , pattern =
     [ oneOf [20, 50, 40, 30]
+    , regex "[\\s\\-]+"
     , numberBetween 2 10
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
+       _:
        Token Numeral NumeralData{TNumeral.value = v2}:
        _) -> double $ v1 + v2
       _ -> Nothing
@@ -117,10 +119,12 @@ ruleNumerals5 = Rule
   { name = "numbers 62..69 .. 92..99"
   , pattern =
     [ oneOf [60, 80]
+    , regex "[\\s\\-]+"
     , numberBetween 2 20
     ]
   , prod = \tokens -> case tokens of
       (Token Numeral NumeralData{TNumeral.value = v1}:
+       _:
        Token Numeral NumeralData{TNumeral.value = v2}:
        _) -> double $ v1 + v2
       _ -> Nothing
@@ -166,10 +170,12 @@ ruleNumeral3 = Rule
   { name = "number (17..19)"
   , pattern =
     [ numberWith TNumeral.value (== 10)
+    , regex "[\\s\\-]+"
     , numberBetween 7 10
     ]
   , prod = \tokens -> case tokens of
       (_:
+       _:
        Token Numeral NumeralData{TNumeral.value = v}:
        _) -> double $ 10 + v
       _ -> Nothing
@@ -224,7 +230,7 @@ ruleNumerals = Rule
   { name = "numbers 21 31 41 51"
   , pattern =
     [ oneOf [20, 50, 40, 30]
-    , regex "et"
+    , regex "-?et-?"
     , numberWith TNumeral.value (== 1)
     ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Numeral/NL/Rules.hs b/Duckling/Numeral/NL/Rules.hs
index a582dfa9..2f4f5980 100644
--- a/Duckling/Numeral/NL/Rules.hs
+++ b/Duckling/Numeral/NL/Rules.hs
@@ -148,7 +148,7 @@ ruleNumeralsEn = Rule
   { name = "numbers en"
   , pattern =
     [ numberBetween 1 10
-    , regex "en"
+    , regex "-?en-?"
     , oneOf [20, 30 .. 90]
     ]
   , prod = \tokens -> case tokens of
diff --git a/Duckling/Ranking/Classifiers/DA_XX.hs b/Duckling/Ranking/Classifiers/DA_XX.hs
index 96f390af..9ed9508f 100644
--- a/Duckling/Ranking/Classifiers/DA_XX.hs
+++ b/Duckling/Ranking/Classifiers/DA_XX.hs
@@ -42,11 +42,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.8013607652001781, unseen = -4.955827057601261,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 140},
+                     ClassData{prior = -0.8157495026522777, unseen = -4.941642422609305,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 138},
                    koData =
-                     ClassData{prior = -0.5955087109960292, unseen = -5.159055299214529,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 172}}),
+                     ClassData{prior = -0.5839478885949533, unseen = -5.170483995038151,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 174}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -82,13 +82,12 @@ classifiers
                                n = 3}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097,
-                               unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -0.916290731874155, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -287,140 +286,135 @@ classifiers
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4402080565520373, unseen = -5.84354441703136,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -5.820082930352362,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.048882188145344),
+                                     -4.02535169073515),
                                     ("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -5.147494476813453),
+                                     -5.123963979403259),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.048882188145344),
-                                    ("hourday", -5.147494476813453),
-                                    ("dayhour", -2.896202678206958),
-                                    ("daymonth", -3.355735007585398),
-                                    ("monthyear", -3.068052935133617),
-                                    ("Mondayon <date>", -5.147494476813453),
-                                    ("intersecthh:mm", -5.147494476813453),
-                                    ("Wednesdaynext <cycle>", -5.147494476813453),
-                                    ("Marchyear", -4.742029368705289),
+                                     -4.02535169073515),
+                                    ("hourday", -5.123963979403259),
+                                    ("dayhour", -2.872672180796764),
+                                    ("daymonth", -3.332204510175204),
+                                    ("monthyear", -3.044522437723423),
+                                    ("Mondayon <date>", -5.123963979403259),
+                                    ("intersecthh:mm", -5.123963979403259),
+                                    ("Wednesdaynext <cycle>", -5.123963979403259),
+                                    ("Marchyear", -4.718498871295094),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.742029368705289),
-                                    ("Mondayintersect", -5.147494476813453),
-                                    ("last <day-of-week> of <time>year", -4.742029368705289),
-                                    ("todayat <time-of-day>", -4.742029368705289),
-                                    ("Thursday<time> timezone", -3.894731508318085),
-                                    ("dayday", -3.132591456271188),
-                                    ("dd/mmat <time-of-day>", -4.231203744939298),
-                                    ("the <day-of-month> (ordinal)February", -4.742029368705289),
-                                    ("intersect by \",\"hh:mm", -4.231203744939298),
-                                    ("Mondaythe <day-of-month> (non ordinal)", -5.147494476813453),
+                                     -4.718498871295094),
+                                    ("Mondayintersect", -5.123963979403259),
+                                    ("last <day-of-week> of <time>year", -4.718498871295094),
+                                    ("todayat <time-of-day>", -4.718498871295094),
+                                    ("Thursday<time> timezone", -3.871201010907891),
+                                    ("dayday", -3.109060958860994),
+                                    ("dd/mmat <time-of-day>", -4.207673247529104),
+                                    ("the <day-of-month> (ordinal)February", -4.718498871295094),
+                                    ("intersect by \",\"hh:mm", -4.207673247529104),
+                                    ("Mondaythe <day-of-month> (non ordinal)", -5.123963979403259),
                                     ("Thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.147494476813453),
-                                    ("dayyear", -3.275692299911862),
+                                     -5.123963979403259),
+                                    ("dayyear", -3.4192158871648335),
                                     ("Thursdaybetween <datetime> and <datetime> (interval)",
-                                     -5.147494476813453),
-                                    ("Thursdayat <time-of-day>", -4.231203744939298),
-                                    ("tomorrow<time-of-day> sharp", -4.742029368705289),
+                                     -5.123963979403259),
+                                    ("Thursdayat <time-of-day>", -4.207673247529104),
+                                    ("tomorrow<time-of-day> sharp", -4.718498871295094),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.742029368705289),
+                                     -4.718498871295094),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.231203744939298),
+                                     -4.207673247529104),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.742029368705289),
+                                     -4.718498871295094),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.742029368705289),
-                                    ("tomorrowuntil <time-of-day>", -4.742029368705289),
+                                     -4.718498871295094),
+                                    ("tomorrowuntil <time-of-day>", -4.718498871295094),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.454347296253507),
-                                    ("the <day-of-month> (ordinal)March", -4.231203744939298),
-                                    ("after <time-of-day>at <time-of-day>", -4.742029368705289),
+                                     -4.430816798843313),
+                                    ("the <day-of-month> (ordinal)March", -4.207673247529104),
+                                    ("after <time-of-day>at <time-of-day>", -4.718498871295094),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.742029368705289),
-                                    ("Mondaythe <day-of-month> (ordinal)", -5.147494476813453),
-                                    ("tomorrowafter <time-of-day>", -4.742029368705289),
+                                     -4.718498871295094),
+                                    ("Mondaythe <day-of-month> (ordinal)", -5.123963979403259),
+                                    ("tomorrowafter <time-of-day>", -4.718498871295094),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.231203744939298),
+                                     -4.207673247529104),
                                     ("Sunday<day-of-month> (non ordinal) <named-month>",
-                                     -5.147494476813453),
-                                    ("dayminute", -2.5825451193519164),
-                                    ("Tuesdaythis <time>", -4.454347296253507),
+                                     -5.123963979403259),
+                                    ("dayminute", -2.559014621941722),
+                                    ("Tuesdaythis <time>", -4.430816798843313),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.454347296253507),
-                                    ("<ordinal> <cycle> of <time>year", -4.742029368705289),
-                                    ("minuteday", -2.5448047913690695),
+                                     -4.430816798843313),
+                                    ("<ordinal> <cycle> of <time>year", -4.718498871295094),
+                                    ("minuteday", -2.521274293958875),
                                     ("absorption of , after named dayintersect",
-                                     -5.147494476813453),
-                                    ("Octoberyear", -3.5380565643793527),
-                                    ("yearhh:mm", -5.147494476813453),
+                                     -5.123963979403259),
+                                    ("Octoberyear", -3.5145260669691587),
+                                    ("yearhh:mm", -5.123963979403259),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.742029368705289),
-                                    ("dd/mmyear", -4.742029368705289),
-                                    ("Septemberyear", -4.231203744939298),
-                                    ("at <time-of-day>on <date>", -5.147494476813453),
+                                     -4.718498871295094),
+                                    ("Septemberyear", -4.207673247529104),
+                                    ("at <time-of-day>on <date>", -5.123963979403259),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.147494476813453),
+                                     -5.123963979403259),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.147494476813453),
-                                    ("dayweek", -4.048882188145344),
-                                    ("weekyear", -4.231203744939298),
-                                    ("hh:mmtomorrow", -4.454347296253507),
-                                    ("Wednesdaythis <time>", -4.231203744939298),
-                                    ("tomorrowat <time-of-day>", -3.894731508318085),
-                                    ("at <time-of-day>tomorrow", -4.742029368705289),
-                                    ("intersectFebruary", -5.147494476813453),
-                                    ("last <cycle> of <time>year", -4.231203744939298),
-                                    ("Mondaythis <time>", -5.147494476813453),
+                                     -5.123963979403259),
+                                    ("dayweek", -4.02535169073515),
+                                    ("weekyear", -4.207673247529104),
+                                    ("hh:mmtomorrow", -4.430816798843313),
+                                    ("Wednesdaythis <time>", -4.207673247529104),
+                                    ("tomorrowat <time-of-day>", -3.871201010907891),
+                                    ("at <time-of-day>tomorrow", -4.718498871295094),
+                                    ("intersectFebruary", -5.123963979403259),
+                                    ("last <cycle> of <time>year", -4.207673247529104),
+                                    ("Mondaythis <time>", -5.123963979403259),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.742029368705289),
-                                    ("yearminute", -5.147494476813453)],
-                               n = 132},
+                                     -4.718498871295094),
+                                    ("yearminute", -5.123963979403259)],
+                               n = 130},
                    koData =
-                     ClassData{prior = -1.032550537990017, unseen = -5.424950017481403,
+                     ClassData{prior = -1.0986122886681098, unseen = -5.332718793265369,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.1179499062782403),
-                                    ("daymonth", -2.1624384612508036),
-                                    ("monthday", -3.8110970868381857),
-                                    ("monthyear", -3.8110970868381857),
-                                    ("Marchyear", -4.034240638152395),
+                                   [("dayhour", -3.0252910757955354),
+                                    ("daymonth", -2.236833715431265),
+                                    ("monthyear", -3.7184382563554808),
+                                    ("Marchyear", -3.9415818076696905),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.4746248502169728),
-                                    ("Sundaythis <time>", -3.8110970868381857),
-                                    ("absorption of , after named dayJuly", -4.321922710604176),
-                                    ("dd/mmat <time-of-day>", -3.8110970868381857),
-                                    ("hourhour", -3.4746248502169728),
+                                     -3.381966019734268),
+                                    ("Sundaythis <time>", -3.7184382563554808),
+                                    ("absorption of , after named dayJuly", -4.229263880121471),
+                                    ("dd/mmat <time-of-day>", -3.7184382563554808),
+                                    ("hourhour", -3.381966019734268),
                                     ("Thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.727387818712341),
-                                    ("dayyear", -3.34109345759245),
+                                     -4.634728988229636),
+                                    ("dayyear", -3.248434627109745),
                                     ("Thursdaybetween <datetime> and <datetime> (interval)",
-                                     -4.727387818712341),
-                                    ("Thursdayat <time-of-day>", -3.2233104219360666),
-                                    ("Thursdayhh:mm", -4.321922710604176),
-                                    ("WednesdayFebruary", -4.727387818712341),
+                                     -4.634728988229636),
+                                    ("Thursdayat <time-of-day>", -3.1306515914533617),
+                                    ("Thursdayhh:mm", -4.229263880121471),
+                                    ("WednesdayFebruary", -4.634728988229636),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.321922710604176),
+                                     -4.229263880121471),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.321922710604176),
+                                     -4.229263880121471),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.727387818712341),
-                                    ("Aprilyear", -4.727387818712341),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -3.8110970868381857),
-                                    ("until <time-of-day>on <date>", -4.727387818712341),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -3.8110970868381857),
-                                    ("dayminute", -3.0226397264739155),
-                                    ("Tuesdaythis <time>", -3.8110970868381857),
-                                    ("minuteday", -3.2233104219360666),
-                                    ("hh:mmon <date>", -3.34109345759245),
-                                    ("Wednesdaythis <time>", -3.4746248502169728),
-                                    ("absorption of , after named dayFebruary", -4.321922710604176),
-                                    ("this <part-of-day>until <time-of-day>", -4.321922710604176),
-                                    ("tomorrownoon", -4.727387818712341),
-                                    ("this <time>until <time-of-day>", -4.321922710604176),
-                                    ("Mondaythis <time>", -4.321922710604176)],
-                               n = 73}}),
+                                     -4.634728988229636),
+                                    ("Aprilyear", -4.634728988229636),
+                                    ("until <time-of-day>on <date>", -4.634728988229636),
+                                    ("dayminute", -2.9299808959912106),
+                                    ("Tuesdaythis <time>", -3.7184382563554808),
+                                    ("minuteday", -3.1306515914533617),
+                                    ("hh:mmon <date>", -3.248434627109745),
+                                    ("Wednesdaythis <time>", -3.381966019734268),
+                                    ("absorption of , after named dayFebruary", -4.229263880121471),
+                                    ("this <part-of-day>until <time-of-day>", -4.229263880121471),
+                                    ("tomorrownoon", -4.634728988229636),
+                                    ("this <time>until <time-of-day>", -4.229263880121471),
+                                    ("Mondaythis <time>", -4.229263880121471)],
+                               n = 65}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.890371757896165,
@@ -921,13 +915,14 @@ classifiers
                                n = 56}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.1431008436406733, unseen = -3.332204510175204,
+                     ClassData{prior = -0.2231435513142097, unseen = -3.258096538021482,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 26},
+                               n = 24},
                    koData =
-                     ClassData{prior = -2.0149030205422647, unseen = -1.791759469228055,
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 6}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.833213344056216,
@@ -1447,23 +1442,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.48550781578170077,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.11778303565638351,
+                               unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Aprilinteger (numeric)", -2.3513752571634776),
-                                    ("month", -0.8472978603872037),
-                                    ("Februaryinteger (numeric)", -1.4350845252893227),
-                                    ("Julyinteger (numeric)", -1.6582280766035324)],
+                                   [("Aprilinteger (numeric)", -2.3025850929940455),
+                                    ("month", -0.7985076962177716),
+                                    ("Februaryinteger (numeric)", -1.3862943611198906),
+                                    ("Julyinteger (numeric)", -1.6094379124341003)],
                                n = 8},
                    koData =
-                     ClassData{prior = -0.9555114450274363, unseen = -2.772588722239781,
+                     ClassData{prior = -2.1972245773362196,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Augustinteger (numeric)", -1.0986122886681098),
-                                    ("Aprilinteger (numeric)", -2.0149030205422647),
-                                    ("month", -0.916290731874155)],
-                               n = 5}}),
+                                   [("Aprilinteger (numeric)", -1.0986122886681098),
+                                    ("month", -1.0986122886681098)],
+                               n = 1}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/DE_XX.hs b/Duckling/Ranking/Classifiers/DE_XX.hs
index 00ec24e7..7a6c9003 100644
--- a/Duckling/Ranking/Classifiers/DE_XX.hs
+++ b/Duckling/Ranking/Classifiers/DE_XX.hs
@@ -403,263 +403,251 @@ classifiers
                                n = 1}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.1745489670397881, unseen = -6.88653164253051,
+                     ClassData{prior = -0.14959964799183942,
+                               unseen = -6.879355804460439,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Samstag<time-of-day>  o'clock", -6.192362489474872),
-                                    ("hourday", -4.939599520979504),
-                                    ("<datetime> - <datetime> (interval)year", -4.939599520979504),
-                                    ("dayhour", -2.5288008433452256),
-                                    ("daymonth", -3.147840051751449),
+                                   [("Samstag<time-of-day>  o'clock", -6.18517928773138),
+                                    ("hourday", -4.932416319236012),
+                                    ("<datetime> - <datetime> (interval)year", -4.932416319236012),
+                                    ("dayhour", -2.521617641601733),
+                                    ("daymonth", -3.140656850007957),
                                     ("<day-of-month>(ordinal) <named-month> year<time-of-day>  o'clock",
-                                     -6.192362489474872),
-                                    ("monthyear", -4.487614397236447),
-                                    ("yearhour", -6.192362489474872),
-                                    ("Juliintersect", -6.192362489474872),
-                                    ("intersect<time-of-day>  o'clock", -4.052296325978602),
-                                    ("after lunchat <time-of-day>", -6.192362489474872),
+                                     -6.18517928773138),
+                                    ("monthyear", -4.4804311954929545),
+                                    ("yearhour", -6.18517928773138),
+                                    ("Juliintersect", -6.18517928773138),
+                                    ("intersect<time-of-day>  o'clock", -4.045113124235109),
+                                    ("after lunchat <time-of-day>", -6.18517928773138),
                                     ("absorption of , after named daymm/dd/yyyy",
-                                     -6.192362489474872),
-                                    ("intersectJuli", -5.499215308914927),
-                                    ("<day-of-month> (ordinal)Dienstag", -6.192362489474872),
-                                    ("intersect by 'of', 'from', 'syear", -5.786897381366708),
-                                    ("<day-of-month> (ordinal)September", -5.786897381366708),
-                                    ("intersect<time> <part-of-day>", -4.112920947795036),
-                                    ("<time-of-day>  o'clockafter lunch", -5.499215308914927),
-                                    ("<day-of-month> (ordinal)Mittwoch", -6.192362489474872),
-                                    ("Montagthis <cycle>", -6.192362489474872),
+                                     -6.18517928773138),
+                                    ("intersectJuli", -5.492032107171434),
+                                    ("<day-of-month> (ordinal)Dienstag", -6.18517928773138),
+                                    ("intersect by 'of', 'from', 'syear", -5.779714179623215),
+                                    ("<day-of-month> (ordinal)September", -5.779714179623215),
+                                    ("intersect<time> <part-of-day>", -4.105737746051544),
+                                    ("<time-of-day>  o'clockafter lunch", -5.492032107171434),
+                                    ("<day-of-month> (ordinal)Mittwoch", -6.18517928773138),
+                                    ("Montagthis <cycle>", -6.18517928773138),
                                     ("<time> <part-of-day><time-of-day>  o'clock",
-                                     -6.192362489474872),
-                                    ("Oktoberyear", -5.093750200806762),
-                                    ("today<time-of-day>  o'clock", -6.192362489474872),
-                                    ("<time-of-day>  o'clockon <date>", -5.786897381366708),
-                                    ("intersect by ','year", -5.093750200806762),
-                                    ("on <date><time-of-day>  o'clock", -6.192362489474872),
-                                    ("exactly <time-of-day>tomorrow", -5.786897381366708),
-                                    ("mm/dd<time-of-day>  o'clock", -6.192362489474872),
-                                    ("monthhour", -5.786897381366708),
+                                     -6.18517928773138),
+                                    ("Oktoberyear", -5.08656699906327),
+                                    ("today<time-of-day>  o'clock", -6.18517928773138),
+                                    ("<time-of-day>  o'clockon <date>", -5.779714179623215),
+                                    ("intersect by ','year", -5.08656699906327),
+                                    ("on <date><time-of-day>  o'clock", -6.18517928773138),
+                                    ("exactly <time-of-day>tomorrow", -5.779714179623215),
+                                    ("mm/dd<time-of-day>  o'clock", -6.18517928773138),
+                                    ("monthhour", -5.779714179623215),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -6.192362489474872),
-                                    ("last <day-of-week> of <time>year", -6.192362489474872),
-                                    ("hourmonth", -5.786897381366708),
-                                    ("todayat <time-of-day>", -5.499215308914927),
-                                    ("mm/ddabout <time-of-day>", -5.786897381366708),
+                                     -6.18517928773138),
+                                    ("last <day-of-week> of <time>year", -6.18517928773138),
+                                    ("hourmonth", -5.779714179623215),
+                                    ("todayat <time-of-day>", -5.492032107171434),
+                                    ("mm/ddabout <time-of-day>", -5.779714179623215),
                                     ("Donnerstagfrom <datetime> - <datetime> (interval)",
-                                     -5.786897381366708),
+                                     -5.779714179623215),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -6.192362489474872),
-                                    ("on <date>at <time-of-day>", -5.786897381366708),
-                                    ("dayday", -3.0143086591269266),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.786897381366708),
-                                    ("about <time-of-day>on <date>", -6.192362489474872),
+                                     -6.18517928773138),
+                                    ("on <date>at <time-of-day>", -5.779714179623215),
+                                    ("dayday", -3.007125457383434),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.779714179623215),
+                                    ("about <time-of-day>on <date>", -6.18517928773138),
                                     ("<hour-of-day> <integer> (as relative minutes)in|during the <part-of-day>",
-                                     -5.786897381366708),
-                                    ("<day-of-month> (ordinal)intersect", -5.093750200806762),
-                                    ("hourhour", -3.6666338451666167),
-                                    ("hh:mmintersect by ','", -4.939599520979504),
+                                     -5.779714179623215),
+                                    ("<day-of-month> (ordinal)intersect", -5.08656699906327),
+                                    ("hourhour", -3.659450643423124),
+                                    ("hh:mmintersect by ','", -4.932416319236012),
                                     ("Donnerstagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.499215308914927),
-                                    ("Dienstagthis <cycle>", -6.192362489474872),
-                                    ("<part-of-day> of <time>Februar", -5.786897381366708),
-                                    ("dayyear", -3.274591757390593),
-                                    ("Mittwochthis <cycle>", -6.192362489474872),
+                                     -5.492032107171434),
+                                    ("Dienstagthis <cycle>", -6.18517928773138),
+                                    ("<part-of-day> of <time>Februar", -5.779714179623215),
+                                    ("dayyear", -3.2674085556471004),
+                                    ("Mittwochthis <cycle>", -6.18517928773138),
                                     ("<time-of-day>  o'clockin|during the <part-of-day>",
-                                     -5.093750200806762),
-                                    ("tomorrow<time-of-day>  o'clock", -6.192362489474872),
-                                    ("<time-of-day>  o'clocktomorrow", -5.499215308914927),
+                                     -5.08656699906327),
+                                    ("tomorrow<time-of-day>  o'clock", -6.18517928773138),
+                                    ("<time-of-day>  o'clocktomorrow", -5.492032107171434),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.786897381366708),
+                                     -5.779714179623215),
                                     ("half <integer> (german style hour-of-day)after lunch",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.939599520979504),
-                                    ("hourminute", -5.499215308914927),
-                                    ("the <day-of-month> (ordinal)Juli", -6.192362489474872),
+                                     -4.932416319236012),
+                                    ("hourminute", -5.492032107171434),
+                                    ("the <day-of-month> (ordinal)Juli", -6.18517928773138),
                                     ("on <date><day-of-month>(ordinal) <named-month>",
-                                     -5.786897381366708),
-                                    ("minutemonth", -3.6666338451666167),
-                                    ("minutehour", -3.941070690868377),
+                                     -5.779714179623215),
+                                    ("minutemonth", -3.659450643423124),
+                                    ("minutehour", -3.9338874891248845),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.276071757600717),
+                                     -5.268888555857225),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month> year",
-                                     -5.786897381366708),
+                                     -5.779714179623215),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -5.093750200806762),
+                                     -5.08656699906327),
                                     ("<day-of-month>(ordinal) <named-month> year<time> <part-of-day>",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("<hour-of-day> <integer> (as relative minutes)after lunch",
-                                     -6.192362489474872),
-                                    ("Donnerstag<time> timezone", -5.786897381366708),
-                                    ("Samstagat <time-of-day>", -5.786897381366708),
+                                     -6.18517928773138),
+                                    ("Donnerstag<time> timezone", -5.779714179623215),
+                                    ("Samstagat <time-of-day>", -5.779714179623215),
                                     ("intersect<day-of-month>(ordinal) <named-month>",
-                                     -4.939599520979504),
-                                    ("this <part-of-day><time-of-day>  o'clock",
-                                     -6.192362489474872),
+                                     -4.932416319236012),
+                                    ("this <part-of-day><time-of-day>  o'clock", -6.18517928773138),
                                     ("<day-of-month>(ordinal) <named-month>intersect",
-                                     -6.192362489474872),
-                                    ("hh:mmintersect", -3.7500154541056676),
-                                    ("Donnerstaghh:mm", -6.192362489474872),
-                                    ("Weihnachtenyear", -6.192362489474872),
-                                    ("<day-of-month> (ordinal)Juli", -5.499215308914927),
-                                    ("intersect by ','intersect", -4.939599520979504),
-                                    ("intersect by 'of', 'from', 'sJuli", -6.192362489474872),
+                                     -6.18517928773138),
+                                    ("hh:mmintersect", -3.742832252362175),
+                                    ("Donnerstaghh:mm", -6.18517928773138),
+                                    ("Weihnachtenyear", -6.18517928773138),
+                                    ("<day-of-month> (ordinal)Juli", -5.492032107171434),
+                                    ("intersect by ','intersect", -4.932416319236012),
+                                    ("intersect by 'of', 'from', 'sJuli", -6.18517928773138),
                                     ("half <integer> (german style hour-of-day)in|during the <part-of-day>",
-                                     -5.786897381366708),
+                                     -5.779714179623215),
                                     ("from <datetime> - <datetime> (interval)year",
-                                     -5.499215308914927),
-                                    ("at <time-of-day>intersect", -4.400603020246817),
+                                     -5.492032107171434),
+                                    ("at <time-of-day>intersect", -4.393419818503324),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.786897381366708),
+                                     -5.779714179623215),
                                     ("<time> <part-of-day>from <time-of-day> - <time-of-day> (interval)",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("absorption of , after named day<day-of-month> (ordinal)",
-                                     -4.939599520979504),
+                                     -4.932416319236012),
                                     ("Donnerstagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -6.192362489474872),
-                                    ("dayminute", -3.941070690868377),
+                                     -6.18517928773138),
+                                    ("dayminute", -3.9338874891248845),
                                     ("on <date>from <datetime> - <datetime> (interval)",
-                                     -6.192362489474872),
-                                    ("Mittwochnext <cycle>", -6.192362489474872),
+                                     -6.18517928773138),
+                                    ("Mittwochnext <cycle>", -6.18517928773138),
                                     ("Donnerstagbetween <datetime> and <datetime> (interval)",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("<time> <part-of-day>from <datetime> - <datetime> (interval)",
-                                     -6.192362489474872),
-                                    ("intersectyear", -4.400603020246817),
-                                    ("on <date>intersect", -5.786897381366708),
-                                    ("on <date><day-of-month> (ordinal)", -5.786897381366708),
-                                    ("intersectSeptember", -3.5533051598596135),
-                                    ("<ordinal> <cycle> of <time>year", -6.192362489474872),
-                                    ("minuteday", -2.3422148877648135),
+                                     -6.18517928773138),
+                                    ("intersectyear", -4.393419818503324),
+                                    ("on <date>intersect", -5.779714179623215),
+                                    ("on <date><day-of-month> (ordinal)", -5.779714179623215),
+                                    ("intersectSeptember", -3.546121958116121),
+                                    ("<ordinal> <cycle> of <time>year", -6.18517928773138),
+                                    ("minuteday", -2.335031686021321),
                                     ("absorption of , after named dayintersect",
-                                     -3.7944672166765017),
-                                    ("intersect by ','September", -4.8060681283549815),
-                                    ("year<time-of-day>  o'clock", -6.192362489474872),
-                                    ("Juliyear", -5.786897381366708),
-                                    ("at <time-of-day>intersect by ','", -5.499215308914927),
-                                    ("hh:mmabsorption of , after named day", -5.786897381366708),
-                                    ("intersect by ','<time> <part-of-day>", -5.276071757600717),
-                                    ("hh:mmon <date>", -3.7500154541056676),
+                                     -3.787284014933009),
+                                    ("intersect by ','September", -4.798884926611489),
+                                    ("year<time-of-day>  o'clock", -6.18517928773138),
+                                    ("Juliyear", -5.779714179623215),
+                                    ("at <time-of-day>intersect by ','", -5.492032107171434),
+                                    ("hh:mmabsorption of , after named day", -5.779714179623215),
+                                    ("intersect by ','<time> <part-of-day>", -5.268888555857225),
+                                    ("hh:mmon <date>", -3.742832252362175),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.192362489474872),
-                                    ("until <time-of-day>after lunch", -6.192362489474872),
-                                    ("mm/ddyear", -5.786897381366708),
-                                    ("intersect by ','<time-of-day>  o'clock", -5.276071757600717),
-                                    ("intersect<day-of-month> (ordinal)", -4.939599520979504),
-                                    ("absorption of , after named daymm/dd", -6.192362489474872),
-                                    ("on <date>September", -5.276071757600717),
-                                    ("Septemberyear", -5.786897381366708),
+                                     -6.18517928773138),
+                                    ("until <time-of-day>after lunch", -6.18517928773138),
+                                    ("mm/ddyear", -5.779714179623215),
+                                    ("intersect by ','<time-of-day>  o'clock", -5.268888555857225),
+                                    ("intersect<day-of-month> (ordinal)", -4.932416319236012),
+                                    ("absorption of , after named daymm/dd", -6.18517928773138),
+                                    ("on <date>September", -5.268888555857225),
+                                    ("Septemberyear", -5.779714179623215),
                                     ("<day-of-month> (ordinal)intersect by 'of', 'from', 's",
-                                     -5.499215308914927),
-                                    ("at <time-of-day>on <date>", -4.3205603125732805),
-                                    ("intersectintersect", -4.112920947795036),
-                                    ("<day-of-month> (ordinal)Februar", -5.093750200806762),
-                                    ("dayweek", -5.093750200806762),
-                                    ("intersect by ','Juli", -5.499215308914927),
+                                     -5.492032107171434),
+                                    ("at <time-of-day>on <date>", -4.313377110829788),
+                                    ("intersectintersect", -4.105737746051544),
+                                    ("<day-of-month> (ordinal)Februar", -5.08656699906327),
+                                    ("dayweek", -5.08656699906327),
+                                    ("intersect by ','Juli", -5.492032107171434),
                                     ("absorption of , after named daythe <day-of-month> (ordinal)",
-                                     -6.192362489474872),
-                                    ("weekyear", -5.786897381366708),
-                                    ("hh:mmin|during the <part-of-day>", -5.276071757600717),
-                                    ("Marzyear", -6.192362489474872),
-                                    ("tomorrowat <time-of-day>", -5.786897381366708),
+                                     -6.18517928773138),
+                                    ("weekyear", -5.779714179623215),
+                                    ("hh:mmin|during the <part-of-day>", -5.268888555857225),
+                                    ("Marzyear", -6.18517928773138),
+                                    ("tomorrowat <time-of-day>", -5.779714179623215),
                                     ("<hour-of-day> <integer> (as relative minutes)on <date>",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("Donnerstag<time-of-day> - <time-of-day> (interval)",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("Donnerstag<datetime> - <datetime> (interval)",
-                                     -6.192362489474872),
-                                    ("Sonntaglast <cycle>", -6.192362489474872),
-                                    ("at <time-of-day>tomorrow", -6.192362489474872),
+                                     -6.18517928773138),
+                                    ("Sonntaglast <cycle>", -6.18517928773138),
+                                    ("at <time-of-day>tomorrow", -6.18517928773138),
                                     ("about <time-of-day>in|during the <part-of-day>",
-                                     -5.786897381366708),
+                                     -5.779714179623215),
                                     ("half <integer> (german style hour-of-day)on <date>",
-                                     -6.192362489474872),
-                                    ("this <part-of-day>at <time-of-day>", -5.786897381366708),
-                                    ("<datetime> - <datetime> (interval)Juli", -5.786897381366708),
+                                     -6.18517928773138),
+                                    ("this <part-of-day>at <time-of-day>", -5.779714179623215),
+                                    ("<datetime> - <datetime> (interval)Juli", -5.779714179623215),
                                     ("after lunch<hour-of-day> <integer> (as relative minutes)",
-                                     -5.786897381366708),
-                                    ("<day-of-month> (ordinal)Marz", -6.192362489474872),
-                                    ("last <cycle> of <time>year", -5.786897381366708),
+                                     -5.779714179623215),
+                                    ("<day-of-month> (ordinal)Marz", -6.18517928773138),
+                                    ("last <cycle> of <time>year", -5.779714179623215),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -6.192362489474872),
+                                     -6.18517928773138),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -6.192362489474872)],
+                                     -6.18517928773138)],
                                n = 409},
                    koData =
-                     ClassData{prior = -1.8315552963929982, unseen = -5.75890177387728,
+                     ClassData{prior = -1.9736600620082156, unseen = -5.655991810819852,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Juli<day-of-month> (non ordinal) <named-month>",
-                                     -5.062595033026967),
-                                    ("absorption of , after named daythe <day-of-month> (non ordinal)",
-                                     -5.062595033026967),
-                                    ("<datetime> - <datetime> (interval)year", -5.062595033026967),
-                                    ("dayhour", -4.3694478524670215),
-                                    ("<named-month> <day-of-month> (non ordinal)Juli",
-                                     -5.062595033026967),
-                                    ("daymonth", -3.1907928561253756),
-                                    ("monthday", -4.657129924918802),
-                                    ("monthyear", -5.062595033026967),
-                                    ("yearhour", -5.062595033026967),
-                                    ("after lunchat <time-of-day>", -4.657129924918802),
-                                    ("mm/dduntil <time-of-day>", -4.657129924918802),
-                                    ("until <time-of-day>year", -4.657129924918802),
-                                    ("<day-of-month> (ordinal)Dienstag", -4.657129924918802),
-                                    ("absorption of , after named dayFebruar", -3.963982744358857),
-                                    ("on <date>Februar", -5.062595033026967),
-                                    ("intersect by 'of', 'from', 'syear", -4.3694478524670215),
-                                    ("intersect<time> <part-of-day>", -5.062595033026967),
-                                    ("<time-of-day>  o'clockafter lunch", -5.062595033026967),
-                                    ("<day-of-month> (ordinal)Mittwoch", -5.062595033026967),
-                                    ("after lunch<time-of-day>  o'clock", -5.062595033026967),
-                                    ("absorption of , after named dayhh:mm", -5.062595033026967),
+                                   [("absorption of , after named daythe <day-of-month> (non ordinal)",
+                                     -4.959341999708705),
+                                    ("<datetime> - <datetime> (interval)year", -4.959341999708705),
+                                    ("dayhour", -4.26619481914876), ("daymonth", -3.25459390747028),
+                                    ("monthyear", -4.959341999708705),
+                                    ("yearhour", -4.959341999708705),
+                                    ("after lunchat <time-of-day>", -4.553876891600541),
+                                    ("mm/dduntil <time-of-day>", -4.553876891600541),
+                                    ("until <time-of-day>year", -4.553876891600541),
+                                    ("<day-of-month> (ordinal)Dienstag", -4.553876891600541),
+                                    ("absorption of , after named dayFebruar", -3.8607297110405954),
+                                    ("on <date>Februar", -4.959341999708705),
+                                    ("intersect by 'of', 'from', 'syear", -4.26619481914876),
+                                    ("intersect<time> <part-of-day>", -4.959341999708705),
+                                    ("<time-of-day>  o'clockafter lunch", -4.959341999708705),
+                                    ("<day-of-month> (ordinal)Mittwoch", -4.959341999708705),
+                                    ("after lunch<time-of-day>  o'clock", -4.959341999708705),
+                                    ("absorption of , after named dayhh:mm", -4.959341999708705),
                                     ("<time-of-day>  o'clock<time> <part-of-day>",
-                                     -4.146304301152812),
-                                    ("mm/ddhh:mm", -4.146304301152812),
-                                    ("monthhour", -5.062595033026967),
+                                     -4.04305126783455),
+                                    ("monthhour", -4.959341999708705),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -5.062595033026967),
-                                    ("todayat <time-of-day>", -5.062595033026967),
+                                     -4.959341999708705),
+                                    ("todayat <time-of-day>", -4.959341999708705),
                                     ("Donnerstagfrom <datetime> - <datetime> (interval)",
-                                     -4.657129924918802),
+                                     -4.553876891600541),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("dayday", -3.676300671907076),
-                                    ("hourhour", -3.5585176362506927),
+                                     -4.959341999708705),
+                                    ("dayday", -3.5730476385888146),
+                                    ("hourhour", -3.455264602932431),
                                     ("Donnerstagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.3694478524670215),
-                                    ("Donnerstagafter <time-of-day>", -5.062595033026967),
-                                    ("dayyear", -2.9831534913471307),
-                                    ("Aprilyear", -5.062595033026967),
-                                    ("Dienstagafter <time-of-day>", -5.062595033026967),
-                                    ("Donnerstaghh:mm", -4.657129924918802),
-                                    ("<day-of-month> (ordinal)Juli", -4.657129924918802),
-                                    ("<day-of-month> (ordinal)hh:mm", -4.146304301152812),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.062595033026967),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -5.062595033026967),
+                                     -4.26619481914876),
+                                    ("Donnerstagafter <time-of-day>", -4.959341999708705),
+                                    ("dayyear", -2.879900458028869),
+                                    ("Aprilyear", -4.959341999708705),
+                                    ("Dienstagafter <time-of-day>", -4.959341999708705),
+                                    ("Donnerstaghh:mm", -4.553876891600541),
+                                    ("<day-of-month> (ordinal)Juli", -4.553876891600541),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -4.657129924918802),
+                                     -4.553876891600541),
                                     ("Donnerstagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("dayminute", -2.388446383600438),
+                                     -4.959341999708705),
+                                    ("dayminute", -2.6079667425452278),
                                     ("on <date>from <datetime> - <datetime> (interval)",
-                                     -5.062595033026967),
+                                     -4.959341999708705),
                                     ("Donnerstagbetween <datetime> and <datetime> (interval)",
-                                     -5.062595033026967),
-                                    ("until <time-of-day>Juli", -5.062595033026967),
-                                    ("year<time> <part-of-day>", -5.062595033026967),
-                                    ("mm/ddyear", -3.5585176362506927),
+                                     -4.959341999708705),
+                                    ("until <time-of-day>Juli", -4.959341999708705),
+                                    ("year<time> <part-of-day>", -4.959341999708705),
+                                    ("mm/ddyear", -3.455264602932431),
                                     ("<day-of-month> (ordinal)intersect by 'of', 'from', 's",
-                                     -4.657129924918802),
-                                    ("Donnerstag<part-of-day> of <time>", -5.062595033026967),
-                                    ("<day-of-month> (ordinal)April", -5.062595033026967),
+                                     -4.553876891600541),
+                                    ("Donnerstag<part-of-day> of <time>", -4.959341999708705),
+                                    ("<day-of-month> (ordinal)April", -4.959341999708705),
                                     ("Donnerstag<time-of-day> - <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("after <time-of-day>year", -5.062595033026967),
-                                    ("on <date>after <time-of-day>", -5.062595033026967),
-                                    ("tomorrownoon", -5.062595033026967)],
-                               n = 78}}),
+                                     -4.959341999708705),
+                                    ("after <time-of-day>year", -4.959341999708705),
+                                    ("on <date>after <time-of-day>", -4.959341999708705),
+                                    ("tomorrownoon", -4.959341999708705)],
+                               n = 66}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1791,23 +1779,22 @@ classifiers
                                n = 2}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -2.3025850929940455,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)Marz", -1.5040773967762742),
-                                    ("integer (numeric)April", -1.5040773967762742),
-                                    ("month", -1.0986122886681098)],
+                                   [("integer (numeric)Marz", -1.3862943611198906),
+                                    ("integer (numeric)April", -1.3862943611198906),
+                                    ("month", -0.9808292530117262)],
                                n = 2},
                    koData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.639057329615259,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)August", -1.8718021769015913),
-                                    ("month", -0.9555114450274363),
-                                    ("integer (numeric)Juli", -1.1786549963416462)],
-                               n = 4}}),
+                                   [("month", -0.9808292530117262),
+                                    ("integer (numeric)Juli", -0.9808292530117262)],
+                               n = 2}}),
        ("this|next <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.833213344056216,
diff --git a/Duckling/Ranking/Classifiers/EL_XX.hs b/Duckling/Ranking/Classifiers/EL_XX.hs
index d591254a..f4a1362c 100644
--- a/Duckling/Ranking/Classifiers/EL_XX.hs
+++ b/Duckling/Ranking/Classifiers/EL_XX.hs
@@ -139,24 +139,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (ordinal or number)",
         Classifier{okData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -2.0794415416798357,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("month", -1.252762968495368),
-                                    ("Julyinteger (numeric)", -1.252762968495368)],
+                                   [("month", -1.0986122886681098),
+                                    ("Julyinteger (numeric)", -1.0986122886681098)],
                                n = 1},
                    koData =
-                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
                                    [("absorption of article before timeinteger (numeric)",
-                                     -1.8718021769015913),
-                                    ("Augustinteger (numeric)", -1.8718021769015913),
-                                    ("Aprilinteger (numeric)", -1.8718021769015913),
-                                    ("month", -0.9555114450274363),
-                                    ("Julyinteger (numeric)", -1.8718021769015913)],
-                               n = 4}}),
+                                     -1.3862943611198906),
+                                    ("Aprilinteger (numeric)", -1.3862943611198906),
+                                    ("month", -0.9808292530117262)],
+                               n = 2}}),
        ("<time-of-day> approximately",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -560,363 +559,352 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.42294807088851183,
-                               unseen = -6.862757913051402,
+                     ClassData{prior = -0.40898623850674326,
+                               unseen = -6.856461984594587,
                                likelihoods =
                                  HashMap.fromList
-                                   [("tuesdaySeptember", -5.25227342804663),
+                                   [("tuesdaySeptember", -5.245970886175828),
                                     ("Father's Dayabsorption of article before time",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("last <cycle> <time>'s'absorption of article before time",
-                                     -5.47541697936084),
-                                    ("hourday", -4.296761983019193),
-                                    ("dayhour", -2.3619016701504654),
-                                    ("daymonth", -3.8171889027573074),
-                                    ("monthyear", -3.7706688871224143),
+                                     -5.469114437490037),
+                                    ("hourday", -4.290459441148391),
+                                    ("dayhour", -2.3555991282796627),
+                                    ("daymonth", -3.8108863608865047),
+                                    ("monthyear", -3.764366345251612),
                                     ("<time-of-day> am|pmabsorption of article before time",
-                                     -4.028497996424514),
-                                    ("tuesdaythis <cycle>", -6.168564159920785),
+                                     -4.022195454553712),
+                                    ("tuesdaythis <cycle>", -6.162261618049983),
                                     ("last <day-of-week> of <time>absorption of article before time",
-                                     -6.168564159920785),
-                                    ("wednesdayintersect", -5.069951871252675),
+                                     -6.162261618049983),
+                                    ("wednesdayintersect", -5.063649329381873),
                                     ("absorption of article before timeabsorption of , after named day",
-                                     -6.168564159920785),
-                                    ("houryear", -6.168564159920785),
+                                     -6.162261618049983),
+                                    ("houryear", -6.162261618049983),
                                     ("absorption of article before timeat <time-of-day>",
-                                     -5.47541697936084),
+                                     -5.469114437490037),
                                     ("absorption of article before time<day-of-month> (ordinal or number) <named-month>",
-                                     -5.25227342804663),
+                                     -5.245970886175828),
                                     ("absorption of article before time<time> <part-of-day>",
-                                     -5.47541697936084),
-                                    ("Octoberabsorption of article before time", -5.47541697936084),
+                                     -5.469114437490037),
+                                    ("Octoberabsorption of article before time",
+                                     -5.469114437490037),
                                     ("intersect<day-of-month> (ordinal or number) <named-month>",
-                                     -4.296761983019193),
-                                    ("intersect by 'of', 'from', 'syear", -6.168564159920785),
-                                    ("<time-of-day> am|pmintersect", -4.664486763144511),
-                                    ("intersectat <time-of-day>", -5.76309905181262),
+                                     -4.290459441148391),
+                                    ("intersect by 'of', 'from', 'syear", -6.162261618049983),
+                                    ("<time-of-day> am|pmintersect", -4.658184221273708),
+                                    ("intersectat <time-of-day>", -5.756796509941818),
                                     ("thursday<day-of-month> ( ordinal) <named-month> year",
-                                     -6.168564159920785),
-                                    ("saturday<time-of-day> am|pm", -5.76309905181262),
-                                    ("saturdayat <time-of-day>", -5.76309905181262),
-                                    ("after tomorrowat <time-of-day>", -6.168564159920785),
-                                    ("intersect<time-of-day> am|pm", -6.168564159920785),
-                                    ("<part-of-day> of <time>February", -6.168564159920785),
-                                    ("absorption of article before timeOctober", -5.76309905181262),
+                                     -6.162261618049983),
+                                    ("saturday<time-of-day> am|pm", -5.756796509941818),
+                                    ("saturdayat <time-of-day>", -5.756796509941818),
+                                    ("after tomorrowat <time-of-day>", -6.162261618049983),
+                                    ("intersect<time-of-day> am|pm", -6.162261618049983),
+                                    ("<part-of-day> of <time>February", -6.162261618049983),
+                                    ("absorption of article before timeOctober",
+                                     -5.756796509941818),
                                     ("<time-of-day>  o'clockabsorption of article before time",
-                                     -6.168564159920785),
-                                    ("after tomorrow<time-of-day> am|pm", -5.76309905181262),
+                                     -6.162261618049983),
+                                    ("after tomorrow<time-of-day> am|pm", -5.756796509941818),
                                     ("wednesdayabsorption of article before time",
-                                     -4.664486763144511),
-                                    ("Marchabsorption of article before time", -6.168564159920785),
-                                    ("wednesdayat <time-of-day>", -5.76309905181262),
-                                    ("intersect by ','<time-of-day> am|pm", -5.25227342804663),
-                                    ("thursdayhh(:mm) - <time-of-day> am|pm", -6.168564159920785),
-                                    ("<time-of-day> am|pmintersect by ','", -5.25227342804663),
+                                     -4.658184221273708),
+                                    ("Marchabsorption of article before time", -6.162261618049983),
+                                    ("wednesdayat <time-of-day>", -5.756796509941818),
+                                    ("intersect by ','<time-of-day> am|pm", -5.245970886175828),
+                                    ("thursdayhh(:mm) - <time-of-day> am|pm", -6.162261618049983),
+                                    ("<time-of-day> am|pmintersect by ','", -5.245970886175828),
                                     ("absorption of article before timeLast year",
-                                     -5.76309905181262),
+                                     -5.756796509941818),
                                     ("absorption of article before timeintersect",
-                                     -5.25227342804663),
-                                    ("wednesday<time> <part-of-day>", -5.25227342804663),
-                                    ("hourmonth", -6.168564159920785),
-                                    ("todayat <time-of-day>", -6.168564159920785),
+                                     -5.245970886175828),
+                                    ("wednesday<time> <part-of-day>", -5.245970886175828),
+                                    ("hourmonth", -6.162261618049983),
+                                    ("todayat <time-of-day>", -6.162261618049983),
                                     ("absorption of article before timeabsorption of article before time",
-                                     -3.5658744744764013),
-                                    ("thursday<time> timezone", -4.915801191425417),
+                                     -3.559571932605599),
+                                    ("thursday<time> timezone", -4.909498649554615),
                                     ("yesterdayabsorption of article before time",
-                                     -6.168564159920785),
-                                    ("dayday", -3.6036148024592483),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.76309905181262),
-                                    ("tonightat <time-of-day>", -5.76309905181262),
+                                     -6.162261618049983),
+                                    ("dayday", -3.597312260588446),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.756796509941818),
+                                    ("tonightat <time-of-day>", -5.756796509941818),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.25227342804663),
-                                    ("today<time-of-day> am|pm", -5.76309905181262),
-                                    ("at <time-of-day><time> <part-of-day>", -5.47541697936084),
+                                     -5.245970886175828),
+                                    ("today<time-of-day> am|pm", -5.756796509941818),
+                                    ("at <time-of-day><time> <part-of-day>", -5.469114437490037),
                                     ("absorption of , after named day<day-of-month> (ordinal or number) <named-month>",
-                                     -4.2226540108654715),
-                                    ("hourhour", -2.854378155248259),
+                                     -4.216351468994669),
+                                    ("hourhour", -2.848075613377457),
                                     ("<time-of-day> - <time-of-day> (interval)absorption of article before time",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("halloween dayabsorption of article before time",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("<datetime> - <datetime> (interval)absorption of article before time",
-                                     -5.76309905181262),
-                                    ("dayyear", -2.949688335052584),
+                                     -5.756796509941818),
+                                    ("dayyear", -2.9433857931817817),
                                     ("thursday<day-of-month> (ordinal or number) <named-month>",
-                                     -6.168564159920785),
-                                    ("last weekend of <named-month>year", -6.168564159920785),
+                                     -6.162261618049983),
+                                    ("last weekend of <named-month>year", -6.162261618049983),
                                     ("<time-of-day>  o'clockin|during the <part-of-day>",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("tuesdayabsorption of article before time",
-                                     -4.664486763144511),
+                                     -4.658184221273708),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -6.168564159920785),
-                                    ("wednesday<time-of-day> am|pm (verbose)", -5.76309905181262),
-                                    ("before yesterday<time-of-day> am|pm", -5.76309905181262),
-                                    ("wednesdaythis <cycle>", -6.168564159920785),
-                                    ("todayin|during the <part-of-day>", -6.168564159920785),
-                                    ("<time-of-day> am|pmtomorrow", -5.25227342804663),
-                                    ("thursdayhh:mm", -6.168564159920785),
-                                    ("minutehour", -4.46381606768236),
-                                    ("before yesterdayat <time-of-day>", -5.76309905181262),
-                                    ("tonightin|during the <part-of-day>", -6.168564159920785),
+                                     -6.162261618049983),
+                                    ("wednesday<time-of-day> am|pm (verbose)", -5.756796509941818),
+                                    ("before yesterday<time-of-day> am|pm", -5.756796509941818),
+                                    ("wednesdaythis <cycle>", -6.162261618049983),
+                                    ("todayin|during the <part-of-day>", -6.162261618049983),
+                                    ("<time-of-day> am|pmtomorrow", -5.245970886175828),
+                                    ("thursdayhh:mm", -6.162261618049983),
+                                    ("minutehour", -4.4575135258115575),
+                                    ("before yesterdayat <time-of-day>", -5.756796509941818),
+                                    ("tonightin|during the <part-of-day>", -6.162261618049983),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.25227342804663),
-                                    ("thursdayintersect", -6.168564159920785),
+                                     -5.245970886175828),
+                                    ("thursdayintersect", -6.162261618049983),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.25227342804663),
-                                    ("Aprilyear", -5.76309905181262),
+                                     -5.245970886175828),
+                                    ("Aprilyear", -5.756796509941818),
                                     ("absorption of article before timetomorrow",
-                                     -5.47541697936084),
+                                     -5.469114437490037),
                                     ("absorption of article before timehh(:mm) - <time-of-day> am|pm",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("absorption of article before timein|during the <part-of-day>",
-                                     -5.25227342804663),
-                                    ("yesterdayin|during the <part-of-day>", -6.168564159920785),
+                                     -5.245970886175828),
+                                    ("yesterdayin|during the <part-of-day>", -6.162261618049983),
                                     ("before yesterdayabsorption of article before time",
-                                     -5.76309905181262),
+                                     -5.756796509941818),
                                     ("this <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.168564159920785),
-                                    ("tuesday<time> <part-of-day>", -5.25227342804663),
+                                     -6.162261618049983),
+                                    ("tuesday<time> <part-of-day>", -5.245970886175828),
                                     ("absorption of article before timeFebruary",
-                                     -5.76309905181262),
-                                    ("weekmonth", -5.25227342804663),
-                                    ("tuesdayat <time-of-day>", -5.76309905181262),
-                                    ("mondaythis <cycle>", -6.168564159920785),
-                                    ("tomorrowintersect", -5.25227342804663),
-                                    ("intersectin|during the <part-of-day>", -4.915801191425417),
+                                     -5.756796509941818),
+                                    ("weekmonth", -5.245970886175828),
+                                    ("tuesdayat <time-of-day>", -5.756796509941818),
+                                    ("mondaythis <cycle>", -6.162261618049983),
+                                    ("tomorrowintersect", -5.245970886175828),
+                                    ("intersectin|during the <part-of-day>", -4.909498649554615),
                                     ("<time> <part-of-day>absorption of article before time",
-                                     -5.76309905181262),
-                                    ("the <cycle> of <time>October", -5.76309905181262),
+                                     -5.756796509941818),
+                                    ("the <cycle> of <time>October", -5.756796509941818),
                                     ("revolution dayabsorption of article before time",
-                                     -5.76309905181262),
+                                     -5.756796509941818),
                                     ("thursday<datetime> - <datetime> (interval)",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("Septemberabsorption of article before time",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("absorption of article before time<time-of-day> am|pm",
-                                     -5.76309905181262),
-                                    ("tonightabsorption of article before time", -5.47541697936084),
-                                    ("todayabsorption of article before time", -5.76309905181262),
+                                     -5.756796509941818),
+                                    ("tonightabsorption of article before time",
+                                     -5.469114437490037),
+                                    ("todayabsorption of article before time", -5.756796509941818),
                                     ("at <time-of-day>absorption of article before time",
-                                     -4.664486763144511),
+                                     -4.658184221273708),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -6.168564159920785),
-                                    ("absorption of article before timeyear", -6.168564159920785),
-                                    ("tuesday<time-of-day> am|pm (verbose)", -5.76309905181262),
-                                    ("revolution dayLast year", -5.76309905181262),
-                                    ("at <time-of-day>intersect", -5.25227342804663),
+                                     -6.162261618049983),
+                                    ("absorption of article before timeyear", -6.162261618049983),
+                                    ("tuesday<time-of-day> am|pm (verbose)", -5.756796509941818),
+                                    ("revolution dayLast year", -5.756796509941818),
+                                    ("at <time-of-day>intersect", -5.245970886175828),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("absorption of article before timeintersect by ','",
-                                     -6.168564159920785),
-                                    ("dayminute", -3.9172723613142897),
-                                    ("intersectyear", -5.069951871252675),
-                                    ("hh:mmabsorption of article before time", -5.47541697936084),
+                                     -6.162261618049983),
+                                    ("dayminute", -3.9109698194434874),
+                                    ("intersectyear", -5.063649329381873),
+                                    ("hh:mmabsorption of article before time", -5.469114437490037),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.168564159920785),
-                                    ("minuteday", -2.687324070585093),
+                                     -6.162261618049983),
+                                    ("minuteday", -2.681021528714291),
                                     ("absorption of , after named dayintersect",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("the <cycle> of <time>absorption of article before time",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("<ordinal> <cycle> of <time>absorption of article before time",
-                                     -6.168564159920785),
-                                    ("at <time-of-day>intersect by ','", -6.168564159920785),
-                                    ("Octoberyear", -4.915801191425417),
+                                     -6.162261618049983),
+                                    ("at <time-of-day>intersect by ','", -6.162261618049983),
+                                    ("Octoberyear", -4.909498649554615),
                                     ("absorption of , after named dayintersect by ','",
-                                     -5.76309905181262),
+                                     -5.756796509941818),
                                     ("this <cycle>hh(:mm) - <time-of-day> am|pm",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("intersectabsorption of article before time",
-                                     -4.5591262474866845),
+                                     -4.552823705615882),
                                     ("after tomorrowabsorption of article before time",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("saturdayabsorption of article before time",
-                                     -5.76309905181262),
-                                    ("tuesdaythe <day-of-month> (non ordinal)", -6.168564159920785),
+                                     -5.756796509941818),
+                                    ("tuesdaythe <day-of-month> (non ordinal)", -6.162261618049983),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.168564159920785),
-                                    ("tomorrowin|during the <part-of-day>", -5.069951871252675),
+                                     -6.162261618049983),
+                                    ("tomorrowin|during the <part-of-day>", -5.063649329381873),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -3.9172723613142897),
-                                    ("year<time-of-day> am|pm", -6.168564159920785),
-                                    ("Septemberyear", -5.25227342804663),
+                                     -3.9109698194434874),
+                                    ("year<time-of-day> am|pm", -6.162261618049983),
+                                    ("Septemberyear", -5.245970886175828),
                                     ("christmasabsorption of article before time",
-                                     -6.168564159920785),
-                                    ("dayweek", -5.069951871252675),
-                                    ("weekyear", -5.25227342804663),
-                                    ("hh:mmin|during the <part-of-day>", -5.47541697936084),
+                                     -6.162261618049983),
+                                    ("dayweek", -5.063649329381873),
+                                    ("weekyear", -5.245970886175828),
+                                    ("hh:mmin|during the <part-of-day>", -5.469114437490037),
                                     ("the <day-of-month> (non ordinal)absorption of article before time",
-                                     -5.76309905181262),
-                                    ("tomorrowat <time-of-day>", -6.168564159920785),
-                                    ("tuesdayintersect", -4.5591262474866845),
+                                     -5.756796509941818),
+                                    ("tomorrowat <time-of-day>", -6.162261618049983),
+                                    ("tuesdayintersect", -4.552823705615882),
                                     ("tomorrowbetween <time-of-day> and <time-of-day> (interval)",
-                                     -6.168564159920785),
-                                    ("at <time-of-day>tomorrow", -5.47541697936084),
-                                    ("tomorrow<time-of-day> am|pm", -5.76309905181262),
+                                     -6.162261618049983),
+                                    ("at <time-of-day>tomorrow", -5.469114437490037),
+                                    ("tomorrow<time-of-day> am|pm", -5.756796509941818),
                                     ("last <cycle> of <time>absorption of article before time",
-                                     -5.76309905181262),
+                                     -5.756796509941818),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.168564159920785),
+                                     -6.162261618049983),
                                     ("in|during the <part-of-day>absorption of article before time",
-                                     -6.168564159920785),
-                                    ("intersectFebruary", -6.168564159920785),
-                                    ("<datetime> - <datetime> (interval)July", -6.168564159920785),
+                                     -6.162261618049983),
+                                    ("intersectFebruary", -6.162261618049983),
+                                    ("<datetime> - <datetime> (interval)July", -6.162261618049983),
                                     ("tomorrowabsorption of article before time",
-                                     -4.915801191425417),
-                                    ("yearminute", -6.168564159920785),
+                                     -4.909498649554615),
+                                    ("yearminute", -6.162261618049983),
                                     ("Mother's Dayabsorption of article before time",
-                                     -6.168564159920785)],
+                                     -6.162261618049983)],
                                n = 378},
                    koData =
-                     ClassData{prior = -1.0645374417836073, unseen = -6.393590753950631,
+                     ClassData{prior = -1.091607006079701, unseen = -6.3561076606958915,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -5.293304824724492),
+                                   [("hourday", -5.661222860237405),
                                     ("thursdayabsorption of article before time",
-                                     -5.293304824724492),
-                                    ("dayhour", -3.6193283911528207),
-                                    ("daymonth", -2.520716102484711),
-                                    ("hourquarter", -5.698769932832657),
-                                    ("monthday", -5.293304824724492),
-                                    ("absorption of article before timedd/mm", -5.698769932832657),
-                                    ("monthyear", -3.3473946756691793),
+                                     -5.255757752129241),
+                                    ("dayhour", -3.581781318557569),
+                                    ("daymonth", -2.570180406879089),
+                                    ("hourquarter", -5.661222860237405),
+                                    ("absorption of article before timedd/mm", -5.661222860237405),
+                                    ("monthyear", -3.3098476030739272),
                                     ("absorption of article before timeDecember",
-                                     -5.698769932832657),
-                                    ("tuesdayFebruary", -5.698769932832657),
-                                    ("wednesdayintersect", -5.698769932832657),
-                                    ("intersecthh:mm", -5.698769932832657),
-                                    ("hh:mmuntil <time>", -5.0056227522727115),
-                                    ("houryear", -5.293304824724492),
-                                    ("absorption of article before time<day-of-month> (ordinal or number) <named-month>",
-                                     -5.698769932832657),
-                                    ("intersect by 'of', 'from', 'syear", -4.782479200958502),
-                                    ("absorption of article before timeJuly", -5.293304824724492),
-                                    ("thursdayafter <time-of-day>", -4.600157644164547),
-                                    ("Marchyear", -4.194692536056383),
-                                    ("after tomorrowat <time-of-day>", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("tuesdayFebruary", -5.661222860237405),
+                                    ("wednesdayintersect", -5.661222860237405),
+                                    ("intersecthh:mm", -5.661222860237405),
+                                    ("hh:mmuntil <time>", -4.96807567967746),
+                                    ("houryear", -5.255757752129241),
+                                    ("intersect by 'of', 'from', 'syear", -4.74493212836325),
+                                    ("absorption of article before timeJuly", -5.255757752129241),
+                                    ("thursdayafter <time-of-day>", -4.562610571569295),
+                                    ("Marchyear", -4.157145463461131),
+                                    ("after tomorrowat <time-of-day>", -5.661222860237405),
                                     ("absorption of article before timeOctober",
-                                     -5.293304824724492),
-                                    ("<time-of-day> am|pmuntil <time>", -5.293304824724492),
+                                     -5.255757752129241),
+                                    ("<time-of-day> am|pmuntil <time>", -5.255757752129241),
                                     ("wednesdayabsorption of article before time",
-                                     -5.293304824724492),
-                                    ("<named-month> <day-of-month> (ordinal or number)July",
-                                     -5.698769932832657),
-                                    ("intersect by ','<time-of-day> am|pm", -5.698769932832657),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.698769932832657),
+                                     -5.255757752129241),
+                                    ("intersect by ','<time-of-day> am|pm", -5.661222860237405),
                                     ("absorption of article before timethe <cycle> of <time>",
-                                     -5.698769932832657),
+                                     -5.661222860237405),
                                     ("intersect by 'of', 'from', 'sabsorption of article before time",
-                                     -5.698769932832657),
-                                    ("intersect by ','hh:mm", -4.600157644164547),
-                                    ("mondayabsorption of article before time", -5.698769932832657),
-                                    ("hourmonth", -3.300874660034286),
-                                    ("todayat <time-of-day>", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("intersect by ','hh:mm", -4.562610571569295),
+                                    ("mondayabsorption of article before time", -5.661222860237405),
+                                    ("hourmonth", -3.2633275874390346),
+                                    ("todayat <time-of-day>", -5.661222860237405),
                                     ("absorption of article before timeabsorption of article before time",
-                                     -3.6193283911528207),
-                                    ("dayday", -3.396184839838611),
-                                    ("dayquarter", -5.698769932832657),
+                                     -3.6463198396951406),
+                                    ("dayday", -3.3586377672433594),
+                                    ("dayquarter", -5.661222860237405),
                                     ("<time-of-day> - <time-of-day> (interval)absorption of article before time",
-                                     -5.698769932832657),
-                                    ("thursdayat <time-of-day>", -5.293304824724492),
-                                    ("week-endintersect", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("thursdayat <time-of-day>", -5.255757752129241),
+                                    ("week-endintersect", -5.661222860237405),
                                     ("<datetime> - <datetime> (interval)absorption of article before time",
-                                     -5.293304824724492),
-                                    ("dayyear", -3.1730412885244013),
-                                    ("thursdaydd/mm", -5.698769932832657),
+                                     -5.255757752129241),
+                                    ("dayyear", -3.1354942159291497),
+                                    ("thursdaydd/mm", -5.661222860237405),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.698769932832657),
-                                    ("tuesdayabsorption of article before time",
-                                     -5.0056227522727115),
-                                    ("tuesdayintersect by 'of', 'from', 's", -5.293304824724492),
-                                    ("monthminute", -5.293304824724492),
-                                    ("<time-of-day> am|pmtomorrow", -5.698769932832657),
-                                    ("<named-month> <day-of-month> (ordinal or number)August",
-                                     -5.698769932832657),
-                                    ("tuesdayMarch", -4.782479200958502),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.698769932832657),
-                                    ("thursdayhh:mm", -5.293304824724492),
-                                    ("after <time-of-day>December", -5.698769932832657),
-                                    ("for <duration> from <time>December", -5.698769932832657),
-                                    ("thursdayintersect", -5.293304824724492),
-                                    ("Aprilyear", -4.600157644164547),
-                                    ("sundayintersect by 'of', 'from', 's", -5.698769932832657),
-                                    ("tuesdayJanuary", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("tuesdayabsorption of article before time", -4.96807567967746),
+                                    ("tuesdayintersect by 'of', 'from', 's", -5.255757752129241),
+                                    ("monthminute", -5.255757752129241),
+                                    ("<time-of-day> am|pmtomorrow", -5.661222860237405),
+                                    ("tuesdayMarch", -4.74493212836325),
+                                    ("thursdayhh:mm", -5.255757752129241),
+                                    ("after <time-of-day>December", -5.661222860237405),
+                                    ("for <duration> from <time>December", -5.661222860237405),
+                                    ("thursdayintersect", -5.255757752129241),
+                                    ("Aprilyear", -4.562610571569295),
+                                    ("sundayintersect by 'of', 'from', 's", -5.661222860237405),
+                                    ("tuesdayJanuary", -5.661222860237405),
                                     ("absorption of article before timehh(:mm) - <time-of-day> am|pm",
-                                     -5.698769932832657),
-                                    ("tuesdayOctober", -5.293304824724492),
+                                     -5.661222860237405),
+                                    ("tuesdayOctober", -5.255757752129241),
                                     ("<day-of-month> (ordinal or number) of <named-month>year",
-                                     -5.0056227522727115),
+                                     -4.96807567967746),
                                     ("absorption of article before timeFebruary",
-                                     -5.293304824724492),
+                                     -5.255757752129241),
                                     ("tuesday<day-of-month> (ordinal or number) <named-month>",
-                                     -5.698769932832657),
-                                    ("weekmonth", -4.782479200958502),
-                                    ("daysecond", -3.8269677559310655),
-                                    ("sundayabsorption of article before time",
-                                     -5.0056227522727115),
-                                    ("todayabsorption of article before time", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("weekmonth", -4.74493212836325),
+                                    ("daysecond", -3.7894206833358135),
+                                    ("sundayabsorption of article before time", -4.96807567967746),
+                                    ("todayabsorption of article before time", -5.661222860237405),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.698769932832657),
-                                    ("yearmonth", -5.293304824724492),
-                                    ("absorption of article before timeyear", -4.600157644164547),
-                                    ("dayminute", -3.907010463604602),
-                                    ("intersectyear", -3.907010463604602),
-                                    ("hh:mmabsorption of article before time", -5.293304824724492),
-                                    ("thursdayApril", -5.698769932832657),
-                                    ("minuteday", -4.782479200958502),
+                                     -5.661222860237405),
+                                    ("yearmonth", -5.661222860237405),
+                                    ("absorption of article before timeyear", -4.562610571569295),
+                                    ("dayminute", -3.86946339100935),
+                                    ("intersectyear", -3.86946339100935),
+                                    ("hh:mmabsorption of article before time", -5.255757752129241),
+                                    ("thursdayApril", -5.661222860237405),
+                                    ("minuteday", -4.74493212836325),
                                     ("absorption of , after named dayintersect",
-                                     -5.698769932832657),
+                                     -5.661222860237405),
                                     ("the <cycle> of <time>absorption of article before time",
-                                     -5.0056227522727115),
-                                    ("tuesdayApril", -5.293304824724492),
-                                    ("Octoberyear", -5.698769932832657),
+                                     -4.96807567967746),
+                                    ("tuesdayApril", -5.255757752129241),
+                                    ("Octoberyear", -5.661222860237405),
                                     ("absorption of , after named dayintersect by ','",
-                                     -5.698769932832657),
-                                    ("yearhh:mm", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("yearhh:mm", -5.661222860237405),
                                     ("this <cycle>hh(:mm) - <time-of-day> am|pm",
-                                     -5.698769932832657),
+                                     -5.661222860237405),
                                     ("intersectabsorption of article before time",
-                                     -4.600157644164547),
+                                     -4.562610571569295),
                                     ("tuesday<day-of-month> (ordinal or number) of <named-month>",
-                                     -5.698769932832657),
+                                     -5.661222860237405),
                                     ("after tomorrowabsorption of article before time",
-                                     -5.698769932832657),
+                                     -5.661222860237405),
                                     ("absorption of article before timeuntil <time>",
-                                     -4.312475571712766),
-                                    ("hoursecond", -4.446006964337289),
+                                     -4.2749284991175145),
+                                    ("hoursecond", -4.408459891742037),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -5.0056227522727115),
-                                    ("<duration> after <time>December", -5.698769932832657),
-                                    ("intersectintersect", -5.698769932832657),
-                                    ("tuesdaytuesday", -5.698769932832657),
+                                     -4.96807567967746),
+                                    ("<duration> after <time>December", -5.661222860237405),
+                                    ("intersectintersect", -5.661222860237405),
+                                    ("tuesdaytuesday", -5.661222860237405),
                                     ("the <day-of-month> (non ordinal)absorption of article before time",
-                                     -3.907010463604602),
-                                    ("at <time-of-day>February", -5.698769932832657),
+                                     -3.95647476799898),
+                                    ("at <time-of-day>February", -5.661222860237405),
                                     ("week-endabsorption of article before time",
-                                     -4.782479200958502),
-                                    ("thursdayOctober", -5.293304824724492),
-                                    ("tomorrowat <time-of-day>", -5.698769932832657),
-                                    ("tuesdayintersect", -3.907010463604602),
-                                    ("minutesecond", -5.0056227522727115),
+                                     -4.74493212836325),
+                                    ("thursdayOctober", -5.255757752129241),
+                                    ("tomorrowat <time-of-day>", -5.661222860237405),
+                                    ("tuesdayintersect", -3.86946339100935),
+                                    ("minutesecond", -4.96807567967746),
                                     ("tomorrowbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.698769932832657),
-                                    ("tuesdayMay", -5.698769932832657),
+                                     -5.661222860237405),
+                                    ("tuesdayMay", -5.661222860237405),
                                     ("after <time-of-day>absorption of article before time",
-                                     -5.698769932832657),
+                                     -5.661222860237405),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.293304824724492),
-                                    ("sundayintersect", -5.698769932832657),
-                                    ("thursdayintersect by 'of', 'from', 's", -5.698769932832657),
+                                     -5.255757752129241),
+                                    ("sundayintersect", -5.661222860237405),
+                                    ("thursdayintersect by 'of', 'from', 's", -5.661222860237405),
                                     ("tomorrowabsorption of article before time",
-                                     -5.698769932832657),
-                                    ("absorption of article before timeAugust", -5.698769932832657),
-                                    ("yearminute", -5.698769932832657)],
-                               n = 199}}),
+                                     -5.661222860237405),
+                                    ("yearminute", -5.661222860237405)],
+                               n = 191}}),
        ("quarter to|past <integer> (hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.1972245773362196,
@@ -1079,15 +1067,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("integer 21..99",
-        Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
-                               likelihoods = HashMap.fromList [], n = 0},
-                   koData =
-                     ClassData{prior = 0.0, unseen = -1.3862943611198906,
-                               likelihoods =
-                                 HashMap.fromList [("integer (numeric)integer (numeric)", 0.0)],
-                               n = 2}}),
        ("this <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1111,15 +1090,15 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.5108256237659907),
-                                    ("negative numbers", -0.916290731874155)],
-                               n = 3}}),
+                                   [("integer (numeric)", -0.6931471805599453),
+                                    ("negative numbers", -0.6931471805599453)],
+                               n = 2}}),
        ("absorption of article before time",
         Classifier{okData =
-                     ClassData{prior = -0.24251310408386942, unseen = -6.54965074223381,
+                     ClassData{prior = -0.2325627732307014, unseen = -6.54965074223381,
                                likelihoods =
                                  HashMap.fromList
                                    [("midnight", -5.855071922202427),
@@ -1186,39 +1165,39 @@ classifiers
                                     ("summer", -5.855071922202427), ("August", -5.855071922202427)],
                                n = 317},
                    koData =
-                     ClassData{prior = -1.5355067593065663, unseen = -5.521460917862246,
+                     ClassData{prior = -1.5726239393113841, unseen = -5.488937726156687,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.7256934272366524),
-                                    ("<duration> hence|ago", -4.824305715904762),
+                                   [("week", -3.6930374642626003),
+                                    ("<duration> hence|ago", -4.791649752930709),
                                     ("<named-month> <day-of-month> (ordinal or number)",
-                                     -4.824305715904762),
+                                     -4.791649752930709),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -3.0325462466767075),
-                                    ("September", -4.824305715904762),
-                                    ("October", -4.418840607796598),
-                                    ("<ordinal> quarter", -4.824305715904762),
-                                    ("intersect", -3.214867803470662),
-                                    ("the <cycle> of <time>", -3.9080149840306073),
-                                    ("year (latent)", -4.418840607796598),
-                                    ("second", -3.3202283191284883), ("April", -4.824305715904762),
-                                    ("this|last|next <cycle>", -4.824305715904762),
-                                    ("day", -2.1501570664782337), ("afternoon", -4.824305715904762),
-                                    ("quarter", -4.1311585353448175),
-                                    ("time-of-day (latent)", -2.472930458741285),
-                                    ("year", -4.418840607796598), ("hh:mm", -4.824305715904762),
-                                    ("until <time>", -3.3202283191284883),
-                                    ("intersect by 'of', 'from', 's", -4.824305715904762),
-                                    ("March", -4.418840607796598),
-                                    ("<day-of-month> (ordinal)", -2.952503539003171),
-                                    ("hour", -2.4264104431063918), ("month", -2.7448641742249267),
-                                    ("last <cycle>", -4.1311585353448175),
-                                    ("<datetime> - <datetime> (interval)", -4.824305715904762),
+                                     -3.1822118404966093),
+                                    ("September", -4.791649752930709),
+                                    ("October", -4.386184644822546),
+                                    ("<ordinal> quarter", -4.791649752930709),
+                                    ("intersect", -3.1822118404966093),
+                                    ("the <cycle> of <time>", -3.8753590210565547),
+                                    ("year (latent)", -4.791649752930709),
+                                    ("second", -3.2875723561544357), ("April", -4.791649752930709),
+                                    ("this|last|next <cycle>", -4.791649752930709),
+                                    ("day", -2.226700395469173), ("afternoon", -4.791649752930709),
+                                    ("quarter", -4.098502572370764),
+                                    ("time-of-day (latent)", -2.440274495767232),
+                                    ("year", -4.791649752930709), ("hh:mm", -4.791649752930709),
+                                    ("until <time>", -3.2875723561544357),
+                                    ("intersect by 'of', 'from', 's", -4.791649752930709),
+                                    ("March", -4.386184644822546),
+                                    ("<day-of-month> (ordinal)", -2.999890283702655),
+                                    ("hour", -2.393754480132339), ("month", -2.7122082112508736),
+                                    ("last <cycle>", -4.098502572370764),
+                                    ("<datetime> - <datetime> (interval)", -4.791649752930709),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -4.418840607796598),
-                                    ("minute", -3.7256934272366524),
-                                    ("August", -4.418840607796598)],
-                               n = 87}}),
+                                     -4.386184644822546),
+                                    ("minute", -3.6930374642626003),
+                                    ("August", -4.386184644822546)],
+                               n = 83}}),
        ("dd/mm/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -1289,13 +1268,13 @@ classifiers
                                n = 3}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.8109302162163288, unseen = -1.791759469228055,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.587786664902119, unseen = -1.9459101490553135,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 5}}),
+                               n = 4}}),
        ("April",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.890371757896165,
@@ -2039,21 +2018,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.6418538861723948,
-                               unseen = -2.5649493574615367,
+                     ClassData{prior = -0.587786664902119, unseen = -2.5649493574615367,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (1st..12th, 20th, 30th..90th)", -1.3862943611198906),
                                     ("ordinal (digits)", -0.2876820724517809)],
                                n = 10},
                    koData =
-                     ClassData{prior = -0.7472144018302211,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.8109302162163288,
+                               unseen = -2.3978952727983707,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinals (1st..12th, 20th, 30th..90th)", -0.3184537311185346),
-                                    ("ordinal (digits)", -1.2992829841302609)],
-                               n = 9}}),
+                                   [("ordinals (1st..12th, 20th, 30th..90th)", -0.2231435513142097),
+                                    ("ordinal (digits)", -1.6094379124341003)],
+                               n = 8}}),
        ("noon",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
diff --git a/Duckling/Ranking/Classifiers/EN_AU.hs b/Duckling/Ranking/Classifiers/EN_AU.hs
index 0ba63b84..99cfff8f 100644
--- a/Duckling/Ranking/Classifiers/EN_AU.hs
+++ b/Duckling/Ranking/Classifiers/EN_AU.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_BZ.hs b/Duckling/Ranking/Classifiers/EN_BZ.hs
index d88fca12..8f62f776 100644
--- a/Duckling/Ranking/Classifiers/EN_BZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_BZ.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_CA.hs b/Duckling/Ranking/Classifiers/EN_CA.hs
index c05014a1..15ce5daa 100644
--- a/Duckling/Ranking/Classifiers/EN_CA.hs
+++ b/Duckling/Ranking/Classifiers/EN_CA.hs
@@ -68,11 +68,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5888343339345626, unseen = -5.768320995793772,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 318},
+                     ClassData{prior = -0.5919839428374589, unseen = -5.765191102784844,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 317},
                    koData =
-                     ClassData{prior = -0.8096221715563133, unseen = -5.54907608489522,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 255}}),
+                     ClassData{prior = -0.805708272235177, unseen = -5.552959584921617,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 256}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -221,7 +221,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -239,40 +239,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -319,29 +320,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -402,12 +401,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("mm/dd",
         Classifier{okData =
-                     ClassData{prior = -1.2729656758128873,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = -1.4271163556401458,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -0.3285040669720361, unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18}}),
+                     ClassData{prior = -0.2744368457017603, unseen = -3.044522437723423,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 19}}),
        ("at <time-of-day>",
         Classifier{okData =
                      ClassData{prior = -8.223809823697212e-2,
@@ -646,7 +645,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.12516314295400605,
+                     ClassData{prior = -0.10536051565782628,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -668,14 +667,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.1400661634962708,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.3025850929940455), ("year", -1.791759469228055),
-                                    ("<integer> <unit-of-duration>", -1.791759469228055),
-                                    ("a <unit-of-duration>", -2.3025850929940455)],
-                               n = 6}}),
+                                   [("quarter", -2.639057329615259), ("year", -1.7227665977411035),
+                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
+                                    ("a <unit-of-duration>", -2.2335922215070942)],
+                               n = 5}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -816,8 +814,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -830,361 +828,347 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4661500599297456, unseen = -6.771935555839602,
+                     ClassData{prior = -0.4457931534951362, unseen = -6.762729506931879,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.077642243349034),
-                                    ("Father's Dayyear (latent)", -6.077642243349034),
-                                    ("Ramadanyear (latent)", -6.077642243349034),
+                                   [("Navaratriyear (latent)", -6.068425588244111),
+                                    ("Father's Dayyear (latent)", -6.068425588244111),
+                                    ("Ramadanyear (latent)", -6.068425588244111),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.824879274853666),
-                                    ("Bhai Doojyear (latent)", -6.077642243349034),
+                                     -4.815662619748743),
+                                    ("Bhai Doojyear (latent)", -6.068425588244111),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.824879274853666),
-                                    ("hourday", -4.372894151110609),
-                                    ("dayhour", -3.2742818624424994),
-                                    ("Martin Luther King's Dayyear (latent)", -5.67217713524087),
-                                    ("Shemini Atzeretyear (latent)", -6.077642243349034),
-                                    ("daymonth", -5.161351511474879),
-                                    ("monthday", -5.67217713524087),
-                                    ("monthyear", -4.285882774120979),
-                                    ("Yom Ha'atzmautyear (latent)", -6.077642243349034),
-                                    ("Vijayadashamiyear (latent)", -6.077642243349034),
+                                     -4.815662619748743),
+                                    ("hourday", -4.363677496005685),
+                                    ("dayhour", -3.2650652073375754),
+                                    ("Martin Luther King's Dayyear (latent)", -5.662960480135946),
+                                    ("Shemini Atzeretyear (latent)", -6.068425588244111),
+                                    ("daymonth", -5.152134856369956),
+                                    ("monthday", -5.662960480135946),
+                                    ("monthyear", -4.276666119016055),
+                                    ("Yom Ha'atzmautyear (latent)", -6.068425588244111),
+                                    ("Vijayadashamiyear (latent)", -6.068425588244111),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -5.67217713524087),
-                                    ("Thanksgiving Dayyear (latent)", -4.979029954680924),
-                                    ("Thai Pongalyear (latent)", -5.384495062789089),
-                                    ("Thiru Onamyear (latent)", -5.384495062789089),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.077642243349034),
+                                     -5.662960480135946),
+                                    ("Thanksgiving Dayyear (latent)", -4.969813299576001),
+                                    ("Thai Pongalyear (latent)", -5.375278407684165),
+                                    ("Thiru Onamyear (latent)", -5.375278407684165),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.068425588244111),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.077642243349034),
-                                    ("houryear", -5.384495062789089),
+                                     -6.068425588244111),
+                                    ("houryear", -5.375278407684165),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.077642243349034),
-                                    ("Christmas<time-of-day> am|pm", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Christmas<time-of-day> am|pm", -6.068425588244111),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.077642243349034),
+                                     -6.068425588244111),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.384495062789089),
-                                    ("<time-of-day> am|pmintersect", -4.824879274853666),
-                                    ("Earth Houryear (latent)", -6.077642243349034),
-                                    ("Family Dayyear (latent)", -5.161351511474879),
-                                    ("Octoberyear (latent)", -4.5735648465727605),
-                                    ("intersect<time-of-day> am|pm", -6.077642243349034),
-                                    ("Mattu Pongalyear (latent)", -6.077642243349034),
-                                    ("Shavuotyear (latent)", -6.077642243349034),
+                                     -5.375278407684165),
+                                    ("<time-of-day> am|pmintersect", -4.815662619748743),
+                                    ("Earth Houryear (latent)", -6.068425588244111),
+                                    ("Family Dayyear (latent)", -5.152134856369956),
+                                    ("Octoberyear (latent)", -4.564348191467836),
+                                    ("intersect<time-of-day> am|pm", -6.068425588244111),
+                                    ("Mattu Pongalyear (latent)", -6.068425588244111),
+                                    ("Shavuotyear (latent)", -6.068425588244111),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.077642243349034),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.068425588244111),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.67217713524087),
-                                    ("Marchyear (latent)", -6.077642243349034),
-                                    ("Sukkotyear (latent)", -5.67217713524087),
+                                     -5.662960480135946),
+                                    ("Marchyear (latent)", -6.068425588244111),
+                                    ("Sukkotyear (latent)", -5.662960480135946),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.077642243349034),
-                                    ("Clean Mondayyear (latent)", -5.67217713524087),
-                                    ("monthhour", -5.67217713524087),
-                                    ("todayat <time-of-day>", -6.077642243349034),
-                                    ("Thursday<time> timezone", -4.372894151110609),
-                                    ("from|since|after <time>December", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Clean Mondayyear (latent)", -5.662960480135946),
+                                    ("monthhour", -5.662960480135946),
+                                    ("todayat <time-of-day>", -6.068425588244111),
+                                    ("Thursday<time> timezone", -4.363677496005685),
+                                    ("from|since|after <time>December", -6.068425588244111),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.077642243349034),
-                                    ("dayday", -4.062739222806769),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.077642243349034),
-                                    ("mm/ddat <time-of-day>", -6.077642243349034),
-                                    ("tonightat <time-of-day>", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("dayday", -4.053522567701846),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.068425588244111),
+                                    ("mm/ddat <time-of-day>", -6.068425588244111),
+                                    ("tonightat <time-of-day>", -6.068425588244111),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.384495062789089),
-                                    ("today<time-of-day> am|pm", -6.077642243349034),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.67217713524087),
-                                    ("at <time-of-day><time> <part-of-day>", -6.077642243349034),
-                                    ("mm/dd<time-of-day> am|pm", -6.077642243349034),
-                                    ("hourhour", -4.824879274853666),
-                                    ("<time-of-day> am|pmon <date>", -4.062739222806769),
-                                    ("Navaratriin|during <named-month>|year", -6.077642243349034),
-                                    ("National Patriots' Dayyear (latent)", -5.384495062789089),
-                                    ("Wednesdaythis|last|next <cycle>", -6.077642243349034),
-                                    ("Lentyear (latent)", -6.077642243349034),
+                                     -5.375278407684165),
+                                    ("today<time-of-day> am|pm", -6.068425588244111),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.662960480135946),
+                                    ("at <time-of-day><time> <part-of-day>", -6.068425588244111),
+                                    ("mm/dd<time-of-day> am|pm", -6.068425588244111),
+                                    ("hourhour", -4.815662619748743),
+                                    ("<time-of-day> am|pmon <date>", -4.053522567701846),
+                                    ("Navaratriin|during <named-month>|year", -6.068425588244111),
+                                    ("National Patriots' Dayyear (latent)", -5.375278407684165),
+                                    ("Wednesdaythis|last|next <cycle>", -6.068425588244111),
+                                    ("Lentyear (latent)", -6.068425588244111),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.5735648465727605),
-                                    ("Boghiyear (latent)", -6.077642243349034),
-                                    ("dayyear", -1.9109770195473075),
-                                    ("Thursdayfrom|since|after <time>", -5.67217713524087),
+                                     -4.564348191467836),
+                                    ("Boghiyear (latent)", -6.068425588244111),
+                                    ("dayyear", -1.9095425048844386),
+                                    ("Thursdayfrom|since|after <time>", -5.662960480135946),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.077642243349034),
-                                    ("Thursdayat <time-of-day>", -5.67217713524087),
-                                    ("Islamic New Yearyear (latent)", -5.67217713524087),
-                                    ("Laylat al-Qadryear (latent)", -5.161351511474879),
-                                    ("Discovery Dayyear (latent)", -5.67217713524087),
-                                    ("Shrove Tuesdayyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Thursdayat <time-of-day>", -5.662960480135946),
+                                    ("Islamic New Yearyear (latent)", -5.662960480135946),
+                                    ("Laylat al-Qadryear (latent)", -5.152134856369956),
+                                    ("Discovery Dayyear (latent)", -5.662960480135946),
+                                    ("Shrove Tuesdayyear (latent)", -6.068425588244111),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.384495062789089),
-                                    ("<time-of-day> am|pmtomorrow", -5.384495062789089),
-                                    ("Yom Kippuryear (latent)", -6.077642243349034),
-                                    ("<part-of-day> of <time>year (latent)", -6.077642243349034),
-                                    ("minutehour", -5.161351511474879),
-                                    ("Kaanum Pongalyear (latent)", -5.67217713524087),
-                                    ("Maha Saptamiyear (latent)", -6.077642243349034),
+                                     -5.375278407684165),
+                                    ("<time-of-day> am|pmtomorrow", -5.375278407684165),
+                                    ("Yom Kippuryear (latent)", -6.068425588244111),
+                                    ("<part-of-day> of <time>year (latent)", -6.068425588244111),
+                                    ("minutehour", -5.152134856369956),
+                                    ("Kaanum Pongalyear (latent)", -5.662960480135946),
+                                    ("Maha Saptamiyear (latent)", -6.068425588244111),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.67217713524087),
+                                     -5.662960480135946),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.372894151110609),
-                                    ("for <duration> from <time>December", -6.077642243349034),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.077642243349034),
+                                     -4.363677496005685),
+                                    ("for <duration> from <time>December", -6.068425588244111),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.068425588244111),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.161351511474879),
+                                     -5.152134856369956),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.67217713524087),
-                                    ("Pentecostyear (latent)", -6.077642243349034),
+                                     -5.662960480135946),
+                                    ("Pentecostyear (latent)", -6.068425588244111),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.161351511474879),
-                                    ("Eid al-Fitryear (latent)", -6.077642243349034),
+                                     -5.152134856369956),
+                                    ("Eid al-Fitryear (latent)", -6.068425588244111),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.077642243349034),
-                                    ("Mondayin|during the <part-of-day>", -6.077642243349034),
-                                    ("Chhathin|during <named-month>|year", -6.077642243349034),
-                                    ("Diwaliin|during <named-month>|year", -6.077642243349034),
-                                    ("Raksha Bandhanyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Mondayin|during the <part-of-day>", -6.068425588244111),
+                                    ("Chhathin|during <named-month>|year", -6.068425588244111),
+                                    ("Diwaliin|during <named-month>|year", -6.068425588244111),
+                                    ("Raksha Bandhanyear (latent)", -6.068425588244111),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.67217713524087),
-                                    ("Ashurayear (latent)", -6.077642243349034),
-                                    ("Tuesdayin|during <named-month>|year", -6.077642243349034),
-                                    ("Chinese New Yearyear (latent)", -6.077642243349034),
-                                    ("Lag BaOmeryear (latent)", -6.077642243349034),
+                                     -5.662960480135946),
+                                    ("Ashurayear (latent)", -6.068425588244111),
+                                    ("Tuesdayin|during <named-month>|year", -6.068425588244111),
+                                    ("Chinese New Yearyear (latent)", -6.068425588244111),
+                                    ("Lag BaOmeryear (latent)", -6.068425588244111),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.077642243349034),
-                                    ("Eid al-Adhayear (latent)", -5.161351511474879),
-                                    ("intersectin|during the <part-of-day>", -6.077642243349034),
-                                    ("Palm Sundayyear (latent)", -6.077642243349034),
-                                    ("Christmasat <time-of-day>", -6.077642243349034),
-                                    ("Passoveryear (latent)", -6.077642243349034),
-                                    ("Lazarus Saturdayyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Eid al-Adhayear (latent)", -5.152134856369956),
+                                    ("intersectin|during the <part-of-day>", -6.068425588244111),
+                                    ("Palm Sundayyear (latent)", -6.068425588244111),
+                                    ("Christmasat <time-of-day>", -6.068425588244111),
+                                    ("Passoveryear (latent)", -6.068425588244111),
+                                    ("Lazarus Saturdayyear (latent)", -6.068425588244111),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.077642243349034),
-                                    ("Yom HaShoahyear (latent)", -5.67217713524087),
+                                     -6.068425588244111),
+                                    ("Yom HaShoahyear (latent)", -5.662960480135946),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.67217713524087),
+                                     -5.662960480135946),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.077642243349034),
-                                    ("Septemberyear (latent)", -5.67217713524087),
-                                    ("mm/ddyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Septemberyear (latent)", -5.662960480135946),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.824879274853666),
-                                    ("Halloweenyear (latent)", -6.077642243349034),
+                                     -4.815662619748743),
+                                    ("Halloweenyear (latent)", -6.068425588244111),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.67217713524087),
+                                     -5.662960480135946),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.384495062789089),
+                                     -5.375278407684165),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.077642243349034),
-                                    ("at <time-of-day>intersect", -5.67217713524087),
-                                    ("Rosh Hashanahyear (latent)", -5.384495062789089),
-                                    ("Dhanterasyear (latent)", -6.077642243349034),
-                                    ("Tu BiShvatyear (latent)", -6.077642243349034),
-                                    ("Holiyear (latent)", -5.384495062789089),
+                                     -6.068425588244111),
+                                    ("at <time-of-day>intersect", -5.662960480135946),
+                                    ("Rosh Hashanahyear (latent)", -5.375278407684165),
+                                    ("Dhanterasyear (latent)", -6.068425588244111),
+                                    ("Tu BiShvatyear (latent)", -6.068425588244111),
+                                    ("Holiyear (latent)", -5.375278407684165),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.077642243349034),
-                                    ("Holika Dahanyear (latent)", -5.384495062789089),
+                                     -6.068425588244111),
+                                    ("Holika Dahanyear (latent)", -5.375278407684165),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.077642243349034),
-                                    ("dayminute", -3.438584913733776),
-                                    ("Mawlidyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("dayminute", -3.429368258628852),
+                                    ("Mawlidyear (latent)", -6.068425588244111),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.67217713524087),
+                                     -5.662960480135946),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.077642243349034),
-                                    ("Jumu'atul-Widayear (latent)", -5.161351511474879),
-                                    ("minuteday", -2.4400560836226486),
+                                     -6.068425588244111),
+                                    ("Jumu'atul-Widayear (latent)", -5.152134856369956),
+                                    ("minuteday", -2.4308394285177246),
                                     ("absorption of , after named dayintersect",
-                                     -6.077642243349034),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.068425588244111),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.077642243349034),
+                                     -6.068425588244111),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.077642243349034),
-                                    ("Boss's Dayyear (latent)", -5.67217713524087),
-                                    ("Global Youth Service Dayyear (latent)", -6.077642243349034),
-                                    ("Dhanterasin|during <named-month>|year", -6.077642243349034),
-                                    ("Tisha B'Avyear (latent)", -6.077642243349034),
-                                    ("Isra and Mi'rajyear (latent)", -5.161351511474879),
+                                     -6.068425588244111),
+                                    ("Boss's Dayyear (latent)", -5.662960480135946),
+                                    ("Global Youth Service Dayyear (latent)", -6.068425588244111),
+                                    ("Dhanterasin|during <named-month>|year", -6.068425588244111),
+                                    ("Tisha B'Avyear (latent)", -6.068425588244111),
+                                    ("Isra and Mi'rajyear (latent)", -5.152134856369956),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.077642243349034),
-                                    ("Christmasyear (latent)", -5.67217713524087),
-                                    ("Naraka Chaturdashiyear (latent)", -5.67217713524087),
-                                    ("at <time-of-day>on <date>", -4.979029954680924),
-                                    ("Thai Pongalin|during <named-month>|year", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Christmasyear (latent)", -5.662960480135946),
+                                    ("Naraka Chaturdashiyear (latent)", -5.662960480135946),
+                                    ("at <time-of-day>on <date>", -4.969813299576001),
+                                    ("Thai Pongalin|during <named-month>|year", -6.068425588244111),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.468204330914934),
-                                    ("dayweek", -6.077642243349034),
-                                    ("Easter Sundayyear (latent)", -5.384495062789089),
-                                    ("Labour Dayyear (latent)", -6.077642243349034),
-                                    ("weekyear", -4.979029954680924),
-                                    ("hh:mmin|during the <part-of-day>", -5.384495062789089),
+                                     -4.45898767581001),
+                                    ("dayweek", -6.068425588244111),
+                                    ("Easter Sundayyear (latent)", -5.375278407684165),
+                                    ("Labour Dayyear (latent)", -6.068425588244111),
+                                    ("weekyear", -4.969813299576001),
+                                    ("hh:mmin|during the <part-of-day>", -5.375278407684165),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.67217713524087),
-                                    ("Hanukkahyear (latent)", -5.384495062789089),
-                                    ("February<time> <part-of-day>", -6.077642243349034),
-                                    ("Great Lentyear (latent)", -6.077642243349034),
-                                    ("tomorrowat <time-of-day>", -5.384495062789089),
-                                    ("between <time> and <time>on <date>", -4.468204330914934),
+                                     -5.662960480135946),
+                                    ("Hanukkahyear (latent)", -5.375278407684165),
+                                    ("February<time> <part-of-day>", -6.068425588244111),
+                                    ("Great Lentyear (latent)", -6.068425588244111),
+                                    ("tomorrowat <time-of-day>", -5.375278407684165),
+                                    ("between <time> and <time>on <date>", -4.45898767581001),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.077642243349034),
-                                    ("last <cycle> of <time>year (latent)", -5.384495062789089),
-                                    ("at <time-of-day>tomorrow", -5.67217713524087),
-                                    ("tomorrow<time-of-day> am|pm", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("last <cycle> of <time>year (latent)", -5.375278407684165),
+                                    ("at <time-of-day>tomorrow", -5.662960480135946),
+                                    ("tomorrow<time-of-day> am|pm", -6.068425588244111),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.077642243349034),
-                                    ("Diwaliyear (latent)", -6.077642243349034),
-                                    ("Black Fridayyear (latent)", -5.67217713524087),
+                                     -6.068425588244111),
+                                    ("Diwaliyear (latent)", -6.068425588244111),
+                                    ("Black Fridayyear (latent)", -5.662960480135946),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.077642243349034),
+                                     -6.068425588244111),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.077642243349034),
-                                    ("Chhathyear (latent)", -5.67217713524087),
-                                    ("Vasant Panchamiyear (latent)", -6.077642243349034),
+                                     -6.068425588244111),
+                                    ("Chhathyear (latent)", -5.662960480135946),
+                                    ("Vasant Panchamiyear (latent)", -6.068425588244111),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.077642243349034),
-                                    ("Februaryintersect", -6.077642243349034),
-                                    ("Mother's Dayyear (latent)", -6.077642243349034),
-                                    ("Simchat Torahyear (latent)", -6.077642243349034),
-                                    ("Victoria Dayyear (latent)", -5.67217713524087),
-                                    ("minuteyear", -6.077642243349034)],
-                               n = 325},
+                                     -6.068425588244111),
+                                    ("Februaryintersect", -6.068425588244111),
+                                    ("Mother's Dayyear (latent)", -6.068425588244111),
+                                    ("Simchat Torahyear (latent)", -6.068425588244111),
+                                    ("Victoria Dayyear (latent)", -5.662960480135946),
+                                    ("minuteyear", -6.068425588244111)],
+                               n = 324},
                    koData =
-                     ClassData{prior = -0.9872850533545976, unseen = -6.411818267709897,
+                     ClassData{prior = -1.0225299822106702, unseen = -6.364750756851911,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.800736969532067),
-                                    ("hourday", -4.800736969532067),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.717027701406222),
-                                    ("dayhour", -3.152078343944685),
-                                    ("Tuesdayfrom|since|after <time>", -5.717027701406222),
-                                    ("daymonth", -3.576961537909951),
-                                    ("monthday", -5.311562593298057),
-                                    ("monthyear", -4.464264732910854),
-                                    ("<time-of-day> am|pmyear (latent)", -5.311562593298057),
-                                    ("Thai Pongalyear (latent)", -5.0238805208462765),
-                                    ("intersecthh:mm", -5.717027701406222),
+                                     -4.7535901911063645),
+                                    ("hourday", -4.7535901911063645),
+                                    ("dayhour", -3.104931565518983),
+                                    ("Tuesdayfrom|since|after <time>", -5.66988092298052),
+                                    ("daymonth", -3.654977902438255),
+                                    ("monthyear", -4.4171179544851515),
+                                    ("<time-of-day> am|pmyear (latent)", -5.264415814872355),
+                                    ("Thai Pongalyear (latent)", -4.976733742420574),
+                                    ("intersecthh:mm", -5.66988092298052),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.717027701406222),
-                                    ("houryear", -4.800736969532067),
+                                     -5.66988092298052),
+                                    ("houryear", -4.7535901911063645),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.717027701406222),
+                                     -5.66988092298052),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.0238805208462765),
-                                    ("<time-of-day> am|pmintersect", -4.464264732910854),
-                                    ("until <time>on <date>", -5.0238805208462765),
-                                    ("Octoberyear (latent)", -5.717027701406222),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.717027701406222),
+                                     -4.976733742420574),
+                                    ("<time-of-day> am|pmintersect", -4.4171179544851515),
+                                    ("until <time>on <date>", -4.976733742420574),
+                                    ("Octoberyear (latent)", -5.66988092298052),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.464264732910854),
-                                    ("about|exactly <time-of-day>year (latent)",
-                                     -5.717027701406222),
-                                    ("absorption of , after named dayJuly", -5.311562593298057),
-                                    ("from|since|after <time>July", -5.717027701406222),
+                                     -4.976733742420574),
+                                    ("about|exactly <time-of-day>year (latent)", -5.66988092298052),
+                                    ("absorption of , after named dayJuly", -5.264415814872355),
+                                    ("from|since|after <time>July", -5.66988092298052),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.800736969532067),
-                                    ("Clean Mondayyear (latent)", -5.717027701406222),
-                                    ("monthhour", -5.717027701406222),
-                                    ("hourmonth", -4.800736969532067),
-                                    ("todayat <time-of-day>", -5.717027701406222),
-                                    ("from|since|after <time>December", -5.717027701406222),
+                                     -4.7535901911063645),
+                                    ("Clean Mondayyear (latent)", -5.66988092298052),
+                                    ("monthhour", -5.66988092298052),
+                                    ("hourmonth", -4.7535901911063645),
+                                    ("todayat <time-of-day>", -5.66988092298052),
+                                    ("from|since|after <time>December", -5.66988092298052),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.717027701406222),
-                                    ("Mondayyear (latent)", -5.0238805208462765),
-                                    ("dayday", -5.311562593298057),
-                                    ("mm/ddat <time-of-day>", -5.311562593298057),
-                                    ("<time-of-day> am|pmon <date>", -4.464264732910854),
-                                    ("dayyear", -2.7212954278522306),
-                                    ("Thursdaymm/dd", -5.717027701406222),
-                                    ("New Year's Dayyear (latent)", -5.311562593298057),
-                                    ("Thursdayfrom|since|after <time>", -4.012279609167797),
-                                    ("Thursdayat <time-of-day>", -4.464264732910854),
+                                     -5.66988092298052),
+                                    ("Mondayyear (latent)", -4.976733742420574),
+                                    ("dayday", -5.264415814872355),
+                                    ("mm/ddat <time-of-day>", -5.264415814872355),
+                                    ("<time-of-day> am|pmon <date>", -4.4171179544851515),
+                                    ("dayyear", -2.779509165084355),
+                                    ("Thursdaymm/dd", -5.66988092298052),
+                                    ("New Year's Dayyear (latent)", -5.264415814872355),
+                                    ("Thursdayfrom|since|after <time>", -3.9651328307420943),
+                                    ("Thursdayat <time-of-day>", -4.4171179544851515),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.717027701406222),
-                                    ("Aprilyear (latent)", -5.717027701406222),
-                                    ("this <time><time-of-day> am|pm", -5.717027701406222),
-                                    ("monthminute", -5.717027701406222),
-                                    ("<time-of-day> am|pmtomorrow", -5.717027701406222),
-                                    ("Thursdayhh:mm", -4.800736969532067),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.717027701406222),
-                                    ("minutemonth", -3.925268232178167),
-                                    ("Augustyear (latent)", -5.311562593298057),
+                                     -5.66988092298052),
+                                    ("Aprilyear (latent)", -5.66988092298052),
+                                    ("monthminute", -5.66988092298052),
+                                    ("<time-of-day> am|pmtomorrow", -5.66988092298052),
+                                    ("Thursdayhh:mm", -4.7535901911063645),
+                                    ("minutemonth", -3.8781214537524646),
+                                    ("Augustyear (latent)", -5.264415814872355),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.311562593298057),
+                                     -5.264415814872355),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.311562593298057),
-                                    ("week-endin|during <named-month>|year", -5.717027701406222),
+                                     -5.264415814872355),
+                                    ("week-endin|during <named-month>|year", -5.66988092298052),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.311562593298057),
+                                     -5.264415814872355),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.717027701406222),
-                                    ("Sundayyear (latent)", -4.800736969532067),
-                                    ("Christmasat <time-of-day>", -5.717027701406222),
-                                    ("from|since|after <time>year (latent)", -4.464264732910854),
+                                     -5.66988092298052),
+                                    ("Sundayyear (latent)", -4.7535901911063645),
+                                    ("Christmasat <time-of-day>", -5.66988092298052),
+                                    ("from|since|after <time>year (latent)", -4.57126863431241),
                                     ("<duration> after|before|from <time>December",
-                                     -5.717027701406222),
-                                    ("yesterday<time-of-day> am|pm", -5.717027701406222),
+                                     -5.66988092298052),
+                                    ("yesterday<time-of-day> am|pm", -5.66988092298052),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.717027701406222),
-                                    ("mm/ddyear (latent)", -5.717027701406222),
+                                     -5.66988092298052),
+                                    ("mm/ddyear (latent)", -5.66988092298052),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.0238805208462765),
+                                     -4.976733742420574),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.717027701406222),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.717027701406222),
-                                    ("at <time-of-day>intersect", -5.311562593298057),
-                                    ("hh:mmyear (latent)", -4.618415412738112),
-                                    ("Holiyear (latent)", -5.717027701406222),
-                                    ("until <time><time-of-day> am|pm", -5.717027701406222),
+                                     -5.66988092298052),
+                                    ("at <time-of-day>intersect", -5.264415814872355),
+                                    ("hh:mmyear (latent)", -4.57126863431241),
+                                    ("Holiyear (latent)", -5.66988092298052),
+                                    ("until <time><time-of-day> am|pm", -5.66988092298052),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.717027701406222),
-                                    ("dayminute", -3.077970371790963),
-                                    ("intersectSeptember", -4.212950304629947),
-                                    ("minuteday", -2.6489747662726044),
-                                    ("absorption of , after named dayintersect",
-                                     -5.717027701406222),
-                                    ("Februaryin|during the <part-of-day>", -5.717027701406222),
-                                    ("hh:mmon <date>", -3.7021246808639567),
-                                    ("Saturdayyear (latent)", -5.717027701406222),
-                                    ("from|since|after <time>on <date>", -4.800736969532067),
+                                     -5.66988092298052),
+                                    ("dayminute", -3.144152278672264),
+                                    ("intersectSeptember", -4.165803526204246),
+                                    ("minuteday", -2.6018279878469026),
+                                    ("absorption of , after named dayintersect", -5.66988092298052),
+                                    ("Februaryin|during the <part-of-day>", -5.66988092298052),
+                                    ("hh:mmon <date>", -3.654977902438255),
+                                    ("Saturdayyear (latent)", -5.66988092298052),
+                                    ("from|since|after <time>on <date>", -4.7535901911063645),
                                     ("absorption of , after named daySeptember",
-                                     -4.800736969532067),
-                                    ("Naraka Chaturdashiyear (latent)", -5.717027701406222),
-                                    ("on <date>September", -5.311562593298057),
-                                    ("at <time-of-day>on <date>", -5.311562593298057),
-                                    ("dayweek", -5.717027701406222),
-                                    ("Easter Sundayyear (latent)", -5.311562593298057),
-                                    ("Thursday<time-of-day> am|pm", -4.800736969532067),
-                                    ("weekyear", -5.311562593298057),
+                                     -4.7535901911063645),
+                                    ("Naraka Chaturdashiyear (latent)", -5.66988092298052),
+                                    ("on <date>September", -5.264415814872355),
+                                    ("at <time-of-day>on <date>", -5.264415814872355),
+                                    ("dayweek", -5.66988092298052),
+                                    ("Easter Sundayyear (latent)", -5.264415814872355),
+                                    ("Thursday<time-of-day> am|pm", -4.976733742420574),
+                                    ("weekyear", -5.264415814872355),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.717027701406222),
+                                     -5.66988092298052),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.0238805208462765),
-                                    ("Sundayfrom|since|after <time>", -5.717027701406222),
-                                    ("absorption of , after named dayFebruary", -4.800736969532067),
+                                     -4.976733742420574),
+                                    ("Sundayfrom|since|after <time>", -5.66988092298052),
+                                    ("absorption of , after named dayFebruary",
+                                     -4.7535901911063645),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.717027701406222),
-                                    ("tomorrowat <time-of-day>", -5.717027701406222),
+                                     -5.66988092298052),
+                                    ("tomorrowat <time-of-day>", -5.66988092298052),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.717027701406222),
-                                    ("last <cycle> of <time>year (latent)", -5.311562593298057),
-                                    ("tomorrow<time-of-day> am|pm", -5.717027701406222),
+                                     -5.66988092298052),
+                                    ("last <cycle> of <time>year (latent)", -5.264415814872355),
+                                    ("tomorrow<time-of-day> am|pm", -5.66988092298052),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.0238805208462765),
-                                    ("Diwaliyear (latent)", -5.311562593298057),
+                                     -4.976733742420574),
+                                    ("Diwaliyear (latent)", -5.264415814872355),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.717027701406222),
-                                    ("Fridayyear (latent)", -5.311562593298057),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.717027701406222),
-                                    ("minuteyear", -4.464264732910854)],
-                               n = 193}}),
+                                     -5.66988092298052),
+                                    ("Fridayyear (latent)", -5.264415814872355),
+                                    ("minuteyear", -4.4171179544851515)],
+                               n = 182}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1398,20 +1382,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.1431008436406733, unseen = -5.081404364984463,
+                     ClassData{prior = -0.1383584333728385, unseen = -5.075173815233827,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -3.822121282019774e-2),
-                                    ("intersect 2 numbers", -3.6888794541139363)],
-                               n = 156},
+                                   [("integer (numeric)", -3.846628082779605e-2),
+                                    ("intersect 2 numbers", -3.6826098411003407)],
+                               n = 155},
                    koData =
-                     ClassData{prior = -2.0149030205422647, unseen = -3.367295829986474,
+                     ClassData{prior = -2.0462893343629354, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1349799328389845),
-                                    ("negative numbers", -0.6931471805599453),
-                                    ("compose by multiplication", -1.9459101490553135)],
-                               n = 24}}),
+                                   [("integer (numeric)", -1.2163953243244932),
+                                    ("negative numbers", -0.6567795363890705),
+                                    ("compose by multiplication", -1.9095425048844386)],
+                               n = 23}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1496,26 +1480,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("Labour Day",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -1641,13 +1618,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1992,19 +1969,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.587786664902119, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8109302162163288, unseen = -4.143134726391533,
+                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.959694113937206e-2),
-                                    ("integer (0..19)", -3.028522096376982)],
-                               n = 60}}),
+                                   [("integer (numeric)", -5.129329438755058e-2),
+                                    ("integer (0..19)", -2.995732273553991)],
+                               n = 58}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2027,38 +2004,38 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.13353139262452263,
-                               unseen = -5.181783550292085,
+                     ClassData{prior = -0.12210269680089984,
+                               unseen = -5.170483995038151,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5370924029585704),
-                                    ("integer (0..19)year (grain)", -2.9789251552376097),
-                                    ("integer (numeric)day (grain)", -2.6112003751122925),
-                                    ("integer (0..19)second (grain) ", -3.7898553714539385),
-                                    ("integer (0..19)hour (grain)", -3.096708190893993),
-                                    ("second", -3.3843902633457743),
-                                    ("integer (numeric)second (grain) ", -4.07753744390572),
-                                    ("integer (numeric)year (grain)", -3.3843902633457743),
-                                    ("day", -2.342936388517613), ("year", -2.5370924029585704),
-                                    ("integer (numeric)week (grain)", -3.096708190893993),
-                                    ("integer (0..19)month (grain)", -3.5667118201397288),
-                                    ("hour", -2.691243082785829), ("month", -3.230239583518516),
-                                    ("integer (numeric)minute (grain)", -3.230239583518516),
-                                    ("integer (0..19)minute (grain)", -3.096708190893993),
-                                    ("integer (numeric)month (grain)", -4.07753744390572),
-                                    ("minute", -2.5370924029585704),
-                                    ("integer (numeric)hour (grain)", -3.5667118201397288),
-                                    ("integer (0..19)day (grain)", -3.5667118201397288),
-                                    ("integer (0..19)week (grain)", -3.230239583518516)],
+                                   [("week", -2.5257286443082556),
+                                    ("integer (0..19)year (grain)", -2.967561396587295),
+                                    ("integer (numeric)day (grain)", -2.5998366164619773),
+                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
+                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
+                                    ("second", -3.373026504695459),
+                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
+                                    ("integer (numeric)year (grain)", -3.373026504695459),
+                                    ("day", -2.331572629867298), ("year", -2.5257286443082556),
+                                    ("integer (numeric)week (grain)", -3.0853444322436783),
+                                    ("integer (0..19)month (grain)", -3.5553480614894135),
+                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
+                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
+                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
+                                    ("integer (numeric)month (grain)", -4.0661736852554045),
+                                    ("minute", -2.5257286443082556),
+                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
+                                    ("integer (0..19)day (grain)", -3.5553480614894135),
+                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
                                n = 77},
                    koData =
-                     ClassData{prior = -2.0794415416798357, unseen = -3.828641396489095,
+                     ClassData{prior = -2.1633230256605382,
+                               unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -2068,7 +2045,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23841102344499823, unseen = -5.41610040220442,
+                     ClassData{prior = -0.19979618731721863, unseen = -5.41610040220442,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>", -3.8022081394209395),
@@ -2088,16 +2065,14 @@ classifiers
                                     ("minute", -1.7227665977411035)],
                                n = 104},
                    koData =
-                     ClassData{prior = -1.550597412411167, unseen = -4.290459441148391,
+                     ClassData{prior = -1.7086928705294415, unseen = -4.143134726391533,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1780538303479458),
-                                    ("from|since|after <time>", -3.1780538303479458),
-                                    ("<hour-of-day> <integer>", -2.667228206581955),
-                                    ("time-of-day (latent)", -1.2809338454620642),
-                                    ("about|exactly <time-of-day>", -3.58351893845611),
-                                    ("hour", -1.2321436812926323), ("minute", -2.0794415416798357)],
-                               n = 28}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.028522096376982),
+                                    ("from|since|after <time>", -3.028522096376982),
+                                    ("time-of-day (latent)", -1.1314021114911006),
+                                    ("hour", -1.0826119473216687), ("minute", -2.740840023925201)],
+                               n = 23}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2348,34 +2323,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("mm/dd", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("mm/dd", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -3052,11 +3023,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_GB.hs b/Duckling/Ranking/Classifiers/EN_GB.hs
index 65e9f9dc..b712ec99 100644
--- a/Duckling/Ranking/Classifiers/EN_GB.hs
+++ b/Duckling/Ranking/Classifiers/EN_GB.hs
@@ -68,11 +68,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6120216357475767, unseen = -5.736572297479192,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 308},
+                     ClassData{prior = -0.6152736711339541, unseen = -5.733341276897745,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 307},
                    koData =
-                     ClassData{prior = -0.7814397877056236, unseen = -5.568344503761097,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 260}}),
+                     ClassData{prior = -0.7776010113984579, unseen = -5.572154032177765,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 261}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -221,7 +221,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -239,40 +239,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -319,29 +320,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -395,13 +394,12 @@ classifiers
                                n = 3}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -1.2685113254635072,
-                               unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
+                     ClassData{prior = -1.3862943611198906,
+                               unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
                    koData =
-                     ClassData{prior = -0.33024168687057687,
-                               unseen = -3.2188758248682006,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 23}}),
+                     ClassData{prior = -0.2876820724517809, unseen = -3.258096538021482,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 24}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -647,7 +645,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -669,13 +667,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -802,8 +800,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -816,356 +814,344 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4837969513780713, unseen = -6.744059186311348,
+                     ClassData{prior = -0.46321310984326536,
+                               unseen = -6.734591659972948,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.049733455231958),
-                                    ("Father's Dayyear (latent)", -6.049733455231958),
-                                    ("Ramadanyear (latent)", -6.049733455231958),
+                                   [("Navaratriyear (latent)", -6.040254711277414),
+                                    ("Father's Dayyear (latent)", -6.040254711277414),
+                                    ("Ramadanyear (latent)", -6.040254711277414),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.79697048673659),
-                                    ("Bhai Doojyear (latent)", -6.049733455231958),
+                                     -4.787491742782046),
+                                    ("Bhai Doojyear (latent)", -6.040254711277414),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.79697048673659),
-                                    ("hourday", -4.344985362993532),
-                                    ("dayhour", -3.246373074325423),
-                                    ("Martin Luther King's Dayyear (latent)", -5.644268347123793),
-                                    ("Shemini Atzeretyear (latent)", -6.049733455231958),
-                                    ("daymonth", -5.133442723357803),
-                                    ("monthday", -5.644268347123793),
-                                    ("monthyear", -4.257973986003902),
-                                    ("Yom Ha'atzmautyear (latent)", -6.049733455231958),
-                                    ("Vijayadashamiyear (latent)", -6.049733455231958),
-                                    ("Thanksgiving Dayyear (latent)", -4.951121166563848),
-                                    ("Thai Pongalyear (latent)", -5.356586274672012),
-                                    ("Thiru Onamyear (latent)", -5.356586274672012),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.049733455231958),
+                                     -4.787491742782046),
+                                    ("hourday", -4.335506619038989),
+                                    ("dayhour", -3.236894330370879),
+                                    ("Martin Luther King's Dayyear (latent)", -5.634789603169249),
+                                    ("Shemini Atzeretyear (latent)", -6.040254711277414),
+                                    ("daymonth", -5.123963979403259),
+                                    ("monthday", -5.634789603169249),
+                                    ("monthyear", -4.248495242049359),
+                                    ("Yom Ha'atzmautyear (latent)", -6.040254711277414),
+                                    ("Vijayadashamiyear (latent)", -6.040254711277414),
+                                    ("Thanksgiving Dayyear (latent)", -4.941642422609305),
+                                    ("Thai Pongalyear (latent)", -5.3471075307174685),
+                                    ("Thiru Onamyear (latent)", -5.3471075307174685),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.040254711277414),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.049733455231958),
-                                    ("houryear", -5.356586274672012),
+                                     -6.040254711277414),
+                                    ("houryear", -5.3471075307174685),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.049733455231958),
-                                    ("Christmas<time-of-day> am|pm", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Christmas<time-of-day> am|pm", -6.040254711277414),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.049733455231958),
+                                     -6.040254711277414),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.356586274672012),
-                                    ("<time-of-day> am|pmintersect", -4.79697048673659),
-                                    ("Earth Houryear (latent)", -6.049733455231958),
-                                    ("Octoberyear (latent)", -4.545656058455684),
-                                    ("intersect<time-of-day> am|pm", -6.049733455231958),
-                                    ("Mattu Pongalyear (latent)", -6.049733455231958),
-                                    ("Shavuotyear (latent)", -6.049733455231958),
+                                     -5.3471075307174685),
+                                    ("<time-of-day> am|pmintersect", -4.787491742782046),
+                                    ("Earth Houryear (latent)", -6.040254711277414),
+                                    ("Octoberyear (latent)", -4.53617731450114),
+                                    ("intersect<time-of-day> am|pm", -6.040254711277414),
+                                    ("Mattu Pongalyear (latent)", -6.040254711277414),
+                                    ("Shavuotyear (latent)", -6.040254711277414),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.049733455231958),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.040254711277414),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.644268347123793),
-                                    ("Marchyear (latent)", -6.049733455231958),
-                                    ("Sukkotyear (latent)", -5.644268347123793),
+                                     -5.634789603169249),
+                                    ("Marchyear (latent)", -6.040254711277414),
+                                    ("Sukkotyear (latent)", -5.634789603169249),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.049733455231958),
-                                    ("Clean Mondayyear (latent)", -5.644268347123793),
-                                    ("monthhour", -5.644268347123793),
-                                    ("todayat <time-of-day>", -6.049733455231958),
-                                    ("Thursday<time> timezone", -4.344985362993532),
-                                    ("from|since|after <time>December", -6.049733455231958),
-                                    ("dd/mm<time-of-day> am|pm", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Clean Mondayyear (latent)", -5.634789603169249),
+                                    ("monthhour", -5.634789603169249),
+                                    ("todayat <time-of-day>", -6.040254711277414),
+                                    ("Thursday<time> timezone", -4.335506619038989),
+                                    ("from|since|after <time>December", -6.040254711277414),
+                                    ("dd/mm<time-of-day> am|pm", -6.040254711277414),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.049733455231958),
-                                    ("dayday", -4.034830434689693),
-                                    ("dd/mmat <time-of-day>", -6.049733455231958),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.049733455231958),
-                                    ("tonightat <time-of-day>", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("dayday", -4.02535169073515),
+                                    ("dd/mmat <time-of-day>", -6.040254711277414),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.040254711277414),
+                                    ("tonightat <time-of-day>", -6.040254711277414),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.356586274672012),
-                                    ("today<time-of-day> am|pm", -6.049733455231958),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.644268347123793),
-                                    ("at <time-of-day><time> <part-of-day>", -6.049733455231958),
-                                    ("hourhour", -4.79697048673659),
-                                    ("<time-of-day> am|pmon <date>", -4.034830434689693),
-                                    ("Navaratriin|during <named-month>|year", -6.049733455231958),
-                                    ("Wednesdaythis|last|next <cycle>", -6.049733455231958),
-                                    ("Lentyear (latent)", -6.049733455231958),
+                                     -5.3471075307174685),
+                                    ("today<time-of-day> am|pm", -6.040254711277414),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.634789603169249),
+                                    ("at <time-of-day><time> <part-of-day>", -6.040254711277414),
+                                    ("hourhour", -4.787491742782046),
+                                    ("<time-of-day> am|pmon <date>", -4.02535169073515),
+                                    ("Navaratriin|during <named-month>|year", -6.040254711277414),
+                                    ("Wednesdaythis|last|next <cycle>", -6.040254711277414),
+                                    ("Lentyear (latent)", -6.040254711277414),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.545656058455684),
-                                    ("Boghiyear (latent)", -6.049733455231958),
-                                    ("dayyear", -1.9637571426803737),
-                                    ("Thursdayfrom|since|after <time>", -5.644268347123793),
+                                     -4.53617731450114),
+                                    ("Boghiyear (latent)", -6.040254711277414),
+                                    ("dayyear", -1.9627172673716946),
+                                    ("Thursdayfrom|since|after <time>", -5.634789603169249),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.049733455231958),
-                                    ("Thursdayat <time-of-day>", -5.644268347123793),
-                                    ("Islamic New Yearyear (latent)", -5.644268347123793),
-                                    ("Laylat al-Qadryear (latent)", -5.133442723357803),
-                                    ("Shrove Tuesdayyear (latent)", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Thursdayat <time-of-day>", -5.634789603169249),
+                                    ("Islamic New Yearyear (latent)", -5.634789603169249),
+                                    ("Laylat al-Qadryear (latent)", -5.123963979403259),
+                                    ("Shrove Tuesdayyear (latent)", -6.040254711277414),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.356586274672012),
-                                    ("<time-of-day> am|pmtomorrow", -5.356586274672012),
-                                    ("Yom Kippuryear (latent)", -6.049733455231958),
-                                    ("<part-of-day> of <time>year (latent)", -6.049733455231958),
-                                    ("minutehour", -5.133442723357803),
-                                    ("Kaanum Pongalyear (latent)", -5.644268347123793),
-                                    ("Maha Saptamiyear (latent)", -6.049733455231958),
+                                     -5.3471075307174685),
+                                    ("<time-of-day> am|pmtomorrow", -5.3471075307174685),
+                                    ("Yom Kippuryear (latent)", -6.040254711277414),
+                                    ("<part-of-day> of <time>year (latent)", -6.040254711277414),
+                                    ("minutehour", -5.123963979403259),
+                                    ("Kaanum Pongalyear (latent)", -5.634789603169249),
+                                    ("Maha Saptamiyear (latent)", -6.040254711277414),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.644268347123793),
+                                     -5.634789603169249),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.344985362993532),
-                                    ("for <duration> from <time>December", -6.049733455231958),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.049733455231958),
+                                     -4.335506619038989),
+                                    ("for <duration> from <time>December", -6.040254711277414),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.040254711277414),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.133442723357803),
+                                     -5.123963979403259),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.644268347123793),
-                                    ("Pentecostyear (latent)", -6.049733455231958),
+                                     -5.634789603169249),
+                                    ("Pentecostyear (latent)", -6.040254711277414),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.133442723357803),
-                                    ("Eid al-Fitryear (latent)", -6.049733455231958),
+                                     -5.123963979403259),
+                                    ("Eid al-Fitryear (latent)", -6.040254711277414),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.049733455231958),
-                                    ("Mondayin|during the <part-of-day>", -6.049733455231958),
-                                    ("Chhathin|during <named-month>|year", -6.049733455231958),
-                                    ("Diwaliin|during <named-month>|year", -6.049733455231958),
-                                    ("Raksha Bandhanyear (latent)", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Mondayin|during the <part-of-day>", -6.040254711277414),
+                                    ("Chhathin|during <named-month>|year", -6.040254711277414),
+                                    ("Diwaliin|during <named-month>|year", -6.040254711277414),
+                                    ("Raksha Bandhanyear (latent)", -6.040254711277414),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.644268347123793),
-                                    ("Ashurayear (latent)", -6.049733455231958),
-                                    ("Tuesdayin|during <named-month>|year", -6.049733455231958),
-                                    ("Chinese New Yearyear (latent)", -6.049733455231958),
-                                    ("Lag BaOmeryear (latent)", -6.049733455231958),
+                                     -5.634789603169249),
+                                    ("Ashurayear (latent)", -6.040254711277414),
+                                    ("Tuesdayin|during <named-month>|year", -6.040254711277414),
+                                    ("Chinese New Yearyear (latent)", -6.040254711277414),
+                                    ("Lag BaOmeryear (latent)", -6.040254711277414),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.049733455231958),
-                                    ("Eid al-Adhayear (latent)", -5.133442723357803),
-                                    ("intersectin|during the <part-of-day>", -6.049733455231958),
-                                    ("Palm Sundayyear (latent)", -6.049733455231958),
-                                    ("Christmasat <time-of-day>", -6.049733455231958),
-                                    ("Passoveryear (latent)", -6.049733455231958),
-                                    ("Lazarus Saturdayyear (latent)", -6.049733455231958),
-                                    ("dd/mmyear (latent)", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Eid al-Adhayear (latent)", -5.123963979403259),
+                                    ("intersectin|during the <part-of-day>", -6.040254711277414),
+                                    ("Palm Sundayyear (latent)", -6.040254711277414),
+                                    ("Christmasat <time-of-day>", -6.040254711277414),
+                                    ("Passoveryear (latent)", -6.040254711277414),
+                                    ("Lazarus Saturdayyear (latent)", -6.040254711277414),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.049733455231958),
-                                    ("Yom HaShoahyear (latent)", -5.644268347123793),
+                                     -6.040254711277414),
+                                    ("Yom HaShoahyear (latent)", -5.634789603169249),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.644268347123793),
+                                     -5.634789603169249),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.049733455231958),
-                                    ("Septemberyear (latent)", -5.644268347123793),
+                                     -6.040254711277414),
+                                    ("Septemberyear (latent)", -5.634789603169249),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.79697048673659),
-                                    ("Halloweenyear (latent)", -6.049733455231958),
+                                     -4.787491742782046),
+                                    ("Halloweenyear (latent)", -6.040254711277414),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.644268347123793),
+                                     -5.634789603169249),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.356586274672012),
+                                     -5.3471075307174685),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.049733455231958),
-                                    ("at <time-of-day>intersect", -5.644268347123793),
-                                    ("Rosh Hashanahyear (latent)", -5.356586274672012),
-                                    ("Dhanterasyear (latent)", -6.049733455231958),
-                                    ("Tu BiShvatyear (latent)", -6.049733455231958),
-                                    ("Holiyear (latent)", -5.356586274672012),
+                                     -6.040254711277414),
+                                    ("at <time-of-day>intersect", -5.634789603169249),
+                                    ("Rosh Hashanahyear (latent)", -5.3471075307174685),
+                                    ("Dhanterasyear (latent)", -6.040254711277414),
+                                    ("Tu BiShvatyear (latent)", -6.040254711277414),
+                                    ("Holiyear (latent)", -5.3471075307174685),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.049733455231958),
-                                    ("Holika Dahanyear (latent)", -5.356586274672012),
+                                     -6.040254711277414),
+                                    ("Holika Dahanyear (latent)", -5.3471075307174685),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.049733455231958),
-                                    ("dayminute", -3.4106761256166993),
-                                    ("Mawlidyear (latent)", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("dayminute", -3.4011973816621555),
+                                    ("Mawlidyear (latent)", -6.040254711277414),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.644268347123793),
+                                     -5.634789603169249),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.049733455231958),
-                                    ("Jumu'atul-Widayear (latent)", -5.133442723357803),
-                                    ("minuteday", -2.412147295505572),
+                                     -6.040254711277414),
+                                    ("Jumu'atul-Widayear (latent)", -5.123963979403259),
+                                    ("minuteday", -2.402668551551028),
                                     ("absorption of , after named dayintersect",
-                                     -6.049733455231958),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.040254711277414),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.049733455231958),
+                                     -6.040254711277414),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.049733455231958),
-                                    ("Mothering Sundayyear (latent)", -5.644268347123793),
-                                    ("Boss's Dayyear (latent)", -5.644268347123793),
-                                    ("Global Youth Service Dayyear (latent)", -6.049733455231958),
-                                    ("Dhanterasin|during <named-month>|year", -6.049733455231958),
-                                    ("Tisha B'Avyear (latent)", -6.049733455231958),
-                                    ("Isra and Mi'rajyear (latent)", -5.133442723357803),
+                                     -6.040254711277414),
+                                    ("Mothering Sundayyear (latent)", -5.634789603169249),
+                                    ("Boss's Dayyear (latent)", -5.634789603169249),
+                                    ("Global Youth Service Dayyear (latent)", -6.040254711277414),
+                                    ("Dhanterasin|during <named-month>|year", -6.040254711277414),
+                                    ("Tisha B'Avyear (latent)", -6.040254711277414),
+                                    ("Isra and Mi'rajyear (latent)", -5.123963979403259),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.049733455231958),
-                                    ("Christmasyear (latent)", -5.644268347123793),
-                                    ("Naraka Chaturdashiyear (latent)", -5.644268347123793),
-                                    ("at <time-of-day>on <date>", -4.951121166563848),
-                                    ("Thai Pongalin|during <named-month>|year", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Christmasyear (latent)", -5.634789603169249),
+                                    ("Naraka Chaturdashiyear (latent)", -5.634789603169249),
+                                    ("at <time-of-day>on <date>", -4.941642422609305),
+                                    ("Thai Pongalin|during <named-month>|year", -6.040254711277414),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.440295542797857),
-                                    ("dayweek", -6.049733455231958),
-                                    ("Easter Sundayyear (latent)", -5.356586274672012),
-                                    ("weekyear", -4.951121166563848),
-                                    ("hh:mmin|during the <part-of-day>", -5.356586274672012),
+                                     -4.430816798843313),
+                                    ("dayweek", -6.040254711277414),
+                                    ("Easter Sundayyear (latent)", -5.3471075307174685),
+                                    ("weekyear", -4.941642422609305),
+                                    ("hh:mmin|during the <part-of-day>", -5.3471075307174685),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.644268347123793),
-                                    ("Hanukkahyear (latent)", -5.356586274672012),
-                                    ("February<time> <part-of-day>", -6.049733455231958),
-                                    ("Great Lentyear (latent)", -6.049733455231958),
-                                    ("tomorrowat <time-of-day>", -5.356586274672012),
-                                    ("between <time> and <time>on <date>", -4.440295542797857),
+                                     -5.634789603169249),
+                                    ("Hanukkahyear (latent)", -5.3471075307174685),
+                                    ("February<time> <part-of-day>", -6.040254711277414),
+                                    ("Great Lentyear (latent)", -6.040254711277414),
+                                    ("tomorrowat <time-of-day>", -5.3471075307174685),
+                                    ("between <time> and <time>on <date>", -4.430816798843313),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.049733455231958),
-                                    ("last <cycle> of <time>year (latent)", -5.356586274672012),
-                                    ("at <time-of-day>tomorrow", -5.644268347123793),
-                                    ("tomorrow<time-of-day> am|pm", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("last <cycle> of <time>year (latent)", -5.3471075307174685),
+                                    ("at <time-of-day>tomorrow", -5.634789603169249),
+                                    ("tomorrow<time-of-day> am|pm", -6.040254711277414),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.049733455231958),
-                                    ("Diwaliyear (latent)", -6.049733455231958),
-                                    ("Black Fridayyear (latent)", -5.644268347123793),
+                                     -6.040254711277414),
+                                    ("Diwaliyear (latent)", -6.040254711277414),
+                                    ("Black Fridayyear (latent)", -5.634789603169249),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.049733455231958),
+                                     -6.040254711277414),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.049733455231958),
-                                    ("Chhathyear (latent)", -5.644268347123793),
-                                    ("Vasant Panchamiyear (latent)", -6.049733455231958),
+                                     -6.040254711277414),
+                                    ("Chhathyear (latent)", -5.634789603169249),
+                                    ("Vasant Panchamiyear (latent)", -6.040254711277414),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.049733455231958),
-                                    ("August Bank Holidayyear (latent)", -5.356586274672012),
-                                    ("Februaryintersect", -6.049733455231958),
-                                    ("Simchat Torahyear (latent)", -6.049733455231958),
-                                    ("minuteyear", -6.049733455231958)],
-                               n = 315},
+                                     -6.040254711277414),
+                                    ("August Bank Holidayyear (latent)", -5.3471075307174685),
+                                    ("Februaryintersect", -6.040254711277414),
+                                    ("Simchat Torahyear (latent)", -6.040254711277414),
+                                    ("minuteyear", -6.040254711277414)],
+                               n = 314},
                    koData =
-                     ClassData{prior = -0.9582549309731873, unseen = -6.415096959171596,
+                     ClassData{prior = -0.9922502706731939, unseen = -6.368187186350492,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.804021044733257),
-                                    ("hourday", -4.804021044733257),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.720311776607412),
-                                    ("dayhour", -3.155362419145875),
-                                    ("Tuesdayfrom|since|after <time>", -5.720311776607412),
-                                    ("daymonth", -3.5802456131111406),
-                                    ("monthday", -5.314846668499247),
-                                    ("monthyear", -4.467548808112044),
-                                    ("<time-of-day> am|pmyear (latent)", -5.314846668499247),
-                                    ("Thai Pongalyear (latent)", -5.0271645960474665),
-                                    ("intersecthh:mm", -5.720311776607412),
+                                     -4.757032535297338),
+                                    ("hourday", -4.757032535297338),
+                                    ("dayhour", -3.1083739097099556),
+                                    ("Tuesdayfrom|since|after <time>", -5.673323267171493),
+                                    ("daymonth", -3.6584202466292277),
+                                    ("monthyear", -4.420560298676125),
+                                    ("<time-of-day> am|pmyear (latent)", -5.267858159063328),
+                                    ("Thai Pongalyear (latent)", -4.980176086611547),
+                                    ("intersecthh:mm", -5.673323267171493),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.720311776607412),
-                                    ("houryear", -4.804021044733257),
+                                     -5.673323267171493),
+                                    ("houryear", -4.757032535297338),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.720311776607412),
+                                     -5.673323267171493),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.0271645960474665),
-                                    ("<time-of-day> am|pmintersect", -4.467548808112044),
-                                    ("until <time>on <date>", -5.0271645960474665),
-                                    ("Octoberyear (latent)", -5.720311776607412),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.720311776607412),
+                                     -4.980176086611547),
+                                    ("<time-of-day> am|pmintersect", -4.420560298676125),
+                                    ("until <time>on <date>", -4.980176086611547),
+                                    ("Octoberyear (latent)", -5.673323267171493),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.467548808112044),
+                                     -4.980176086611547),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.720311776607412),
-                                    ("absorption of , after named dayJuly", -5.314846668499247),
-                                    ("from|since|after <time>July", -5.720311776607412),
+                                     -5.673323267171493),
+                                    ("absorption of , after named dayJuly", -5.267858159063328),
+                                    ("from|since|after <time>July", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.804021044733257),
-                                    ("Clean Mondayyear (latent)", -5.720311776607412),
-                                    ("monthhour", -5.720311776607412),
-                                    ("hourmonth", -4.804021044733257),
-                                    ("todayat <time-of-day>", -5.720311776607412),
-                                    ("Bank Holidayyear (latent)", -5.0271645960474665),
-                                    ("from|since|after <time>December", -5.720311776607412),
+                                     -4.757032535297338),
+                                    ("Clean Mondayyear (latent)", -5.673323267171493),
+                                    ("monthhour", -5.673323267171493),
+                                    ("hourmonth", -4.757032535297338),
+                                    ("todayat <time-of-day>", -5.673323267171493),
+                                    ("Bank Holidayyear (latent)", -4.980176086611547),
+                                    ("from|since|after <time>December", -5.673323267171493),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.720311776607412),
-                                    ("Mondayyear (latent)", -5.0271645960474665),
-                                    ("dayday", -5.314846668499247),
-                                    ("dd/mmat <time-of-day>", -5.314846668499247),
-                                    ("<time-of-day> am|pmon <date>", -4.467548808112044),
-                                    ("Thursdaydd/mm", -5.720311776607412),
-                                    ("dayyear", -2.6522588414737944),
-                                    ("New Year's Dayyear (latent)", -5.314846668499247),
-                                    ("Thursdayfrom|since|after <time>", -4.015563684368987),
-                                    ("Thursdayat <time-of-day>", -4.467548808112044),
+                                     -5.673323267171493),
+                                    ("Mondayyear (latent)", -4.980176086611547),
+                                    ("dayday", -5.267858159063328),
+                                    ("dd/mmat <time-of-day>", -5.267858159063328),
+                                    ("<time-of-day> am|pmon <date>", -4.420560298676125),
+                                    ("Thursdaydd/mm", -5.673323267171493),
+                                    ("dayyear", -2.7029088016017915),
+                                    ("New Year's Dayyear (latent)", -5.267858159063328),
+                                    ("Thursdayfrom|since|after <time>", -3.9685751749330676),
+                                    ("Thursdayat <time-of-day>", -4.420560298676125),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.720311776607412),
-                                    ("Aprilyear (latent)", -5.720311776607412),
-                                    ("this <time><time-of-day> am|pm", -5.720311776607412),
-                                    ("monthminute", -5.720311776607412),
-                                    ("<time-of-day> am|pmtomorrow", -5.720311776607412),
-                                    ("Thursdayhh:mm", -4.804021044733257),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.720311776607412),
-                                    ("minutemonth", -3.9285523073793565),
-                                    ("Augustyear (latent)", -5.314846668499247),
+                                     -5.673323267171493),
+                                    ("Aprilyear (latent)", -5.673323267171493),
+                                    ("monthminute", -5.673323267171493),
+                                    ("<time-of-day> am|pmtomorrow", -5.673323267171493),
+                                    ("Thursdayhh:mm", -4.757032535297338),
+                                    ("minutemonth", -3.8815637979434374),
+                                    ("Augustyear (latent)", -5.267858159063328),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.314846668499247),
+                                     -5.267858159063328),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.314846668499247),
-                                    ("week-endin|during <named-month>|year", -5.720311776607412),
+                                     -5.267858159063328),
+                                    ("week-endin|during <named-month>|year", -5.673323267171493),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.720311776607412),
+                                     -5.673323267171493),
                                     ("dd/mm<time-of-day> - <time-of-day> (interval)",
-                                     -5.314846668499247),
-                                    ("Sundayyear (latent)", -4.804021044733257),
-                                    ("Christmasat <time-of-day>", -5.720311776607412),
-                                    ("from|since|after <time>year (latent)", -4.467548808112044),
-                                    ("dd/mmyear (latent)", -5.720311776607412),
+                                     -5.267858159063328),
+                                    ("Sundayyear (latent)", -4.757032535297338),
+                                    ("Christmasat <time-of-day>", -5.673323267171493),
+                                    ("from|since|after <time>year (latent)", -4.574710978503383),
+                                    ("dd/mmyear (latent)", -5.673323267171493),
                                     ("<duration> after|before|from <time>December",
-                                     -5.720311776607412),
-                                    ("yesterday<time-of-day> am|pm", -5.720311776607412),
+                                     -5.673323267171493),
+                                    ("yesterday<time-of-day> am|pm", -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.720311776607412),
+                                     -5.673323267171493),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.0271645960474665),
+                                     -4.980176086611547),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.720311776607412),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.720311776607412),
-                                    ("at <time-of-day>intersect", -5.314846668499247),
-                                    ("hh:mmyear (latent)", -4.621699487939302),
-                                    ("Holiyear (latent)", -5.720311776607412),
-                                    ("until <time><time-of-day> am|pm", -5.720311776607412),
+                                     -5.673323267171493),
+                                    ("at <time-of-day>intersect", -5.267858159063328),
+                                    ("hh:mmyear (latent)", -4.574710978503383),
+                                    ("Holiyear (latent)", -5.673323267171493),
+                                    ("until <time><time-of-day> am|pm", -5.673323267171493),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.720311776607412),
-                                    ("dayminute", -3.081254446992153),
-                                    ("intersectSeptember", -4.216234379831137),
-                                    ("minuteday", -2.6522588414737944),
+                                     -5.673323267171493),
+                                    ("dayminute", -3.147594622863237),
+                                    ("intersectSeptember", -4.169245870395218),
+                                    ("minuteday", -2.6052703320378754),
                                     ("absorption of , after named dayintersect",
-                                     -5.720311776607412),
-                                    ("Februaryin|during the <part-of-day>", -5.720311776607412),
-                                    ("hh:mmon <date>", -3.7054087560651467),
-                                    ("Saturdayyear (latent)", -5.720311776607412),
-                                    ("from|since|after <time>on <date>", -4.804021044733257),
+                                     -5.673323267171493),
+                                    ("Februaryin|during the <part-of-day>", -5.673323267171493),
+                                    ("hh:mmon <date>", -3.6584202466292277),
+                                    ("Saturdayyear (latent)", -5.673323267171493),
+                                    ("from|since|after <time>on <date>", -4.757032535297338),
                                     ("absorption of , after named daySeptember",
-                                     -4.804021044733257),
-                                    ("Naraka Chaturdashiyear (latent)", -5.720311776607412),
-                                    ("on <date>September", -5.314846668499247),
-                                    ("at <time-of-day>on <date>", -5.314846668499247),
-                                    ("dayweek", -5.720311776607412),
-                                    ("Easter Sundayyear (latent)", -5.314846668499247),
-                                    ("Thursday<time-of-day> am|pm", -4.804021044733257),
-                                    ("weekyear", -5.314846668499247),
+                                     -4.757032535297338),
+                                    ("Naraka Chaturdashiyear (latent)", -5.673323267171493),
+                                    ("on <date>September", -5.267858159063328),
+                                    ("at <time-of-day>on <date>", -5.267858159063328),
+                                    ("dayweek", -5.673323267171493),
+                                    ("Easter Sundayyear (latent)", -5.267858159063328),
+                                    ("Thursday<time-of-day> am|pm", -4.980176086611547),
+                                    ("weekyear", -5.267858159063328),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.720311776607412),
+                                     -5.673323267171493),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.0271645960474665),
-                                    ("Sundayfrom|since|after <time>", -5.720311776607412),
-                                    ("absorption of , after named dayFebruary", -4.804021044733257),
+                                     -4.980176086611547),
+                                    ("Sundayfrom|since|after <time>", -5.673323267171493),
+                                    ("absorption of , after named dayFebruary", -4.757032535297338),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.720311776607412),
-                                    ("tomorrowat <time-of-day>", -5.720311776607412),
+                                     -5.673323267171493),
+                                    ("tomorrowat <time-of-day>", -5.673323267171493),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.720311776607412),
-                                    ("last <cycle> of <time>year (latent)", -5.314846668499247),
-                                    ("tomorrow<time-of-day> am|pm", -5.720311776607412),
+                                     -5.673323267171493),
+                                    ("last <cycle> of <time>year (latent)", -5.267858159063328),
+                                    ("tomorrow<time-of-day> am|pm", -5.673323267171493),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.0271645960474665),
-                                    ("Diwaliyear (latent)", -5.314846668499247),
+                                     -4.980176086611547),
+                                    ("Diwaliyear (latent)", -5.267858159063328),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.720311776607412),
-                                    ("Fridayyear (latent)", -5.314846668499247),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.720311776607412),
-                                    ("minuteyear", -4.467548808112044)],
-                               n = 196}}),
+                                     -5.673323267171493),
+                                    ("Fridayyear (latent)", -5.267858159063328),
+                                    ("minuteyear", -4.420560298676125)],
+                               n = 185}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1386,21 +1372,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15219181534192538,
-                               unseen = -5.017279836814924,
+                     ClassData{prior = -0.14723023698268448,
+                               unseen = -5.0106352940962555,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.0821994520255166e-2),
-                                    ("intersect 2 numbers", -3.624340932976365)],
-                               n = 146},
+                                   [("integer (numeric)", -4.110167568555192e-2),
+                                    ("intersect 2 numbers", -3.6176519448255684)],
+                               n = 145},
                    koData =
-                     ClassData{prior = -1.957744606702316, unseen = -3.367295829986474,
+                     ClassData{prior = -1.988469763474109, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1349799328389845),
-                                    ("negative numbers", -0.6931471805599453),
-                                    ("compose by multiplication", -1.9459101490553135)],
-                               n = 24}}),
+                                   [("integer (numeric)", -1.2163953243244932),
+                                    ("negative numbers", -0.6567795363890705),
+                                    ("compose by multiplication", -1.9095425048844386)],
+                               n = 23}}),
        ("Bank Holiday",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -1478,26 +1464,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1607,13 +1586,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1937,19 +1916,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.587786664902119, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8109302162163288, unseen = -4.143134726391533,
+                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.959694113937206e-2),
-                                    ("integer (0..19)", -3.028522096376982)],
-                               n = 60}}),
+                                   [("integer (numeric)", -5.129329438755058e-2),
+                                    ("integer (0..19)", -2.995732273553991)],
+                               n = 58}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1972,37 +1951,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -2012,7 +1991,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23841102344499823, unseen = -5.41610040220442,
+                     ClassData{prior = -0.19979618731721863, unseen = -5.41610040220442,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>", -3.8022081394209395),
@@ -2032,16 +2011,14 @@ classifiers
                                     ("minute", -1.7227665977411035)],
                                n = 104},
                    koData =
-                     ClassData{prior = -1.550597412411167, unseen = -4.290459441148391,
+                     ClassData{prior = -1.7086928705294415, unseen = -4.143134726391533,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1780538303479458),
-                                    ("from|since|after <time>", -3.1780538303479458),
-                                    ("<hour-of-day> <integer>", -2.667228206581955),
-                                    ("time-of-day (latent)", -1.2809338454620642),
-                                    ("about|exactly <time-of-day>", -3.58351893845611),
-                                    ("hour", -1.2321436812926323), ("minute", -2.0794415416798357)],
-                               n = 28}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.028522096376982),
+                                    ("from|since|after <time>", -3.028522096376982),
+                                    ("time-of-day (latent)", -1.1314021114911006),
+                                    ("hour", -1.0826119473216687), ("minute", -2.740840023925201)],
+                               n = 23}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2293,34 +2270,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2977,11 +2950,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_IE.hs b/Duckling/Ranking/Classifiers/EN_IE.hs
index 1f431291..7d527dfa 100644
--- a/Duckling/Ranking/Classifiers/EN_IE.hs
+++ b/Duckling/Ranking/Classifiers/EN_IE.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_IN.hs b/Duckling/Ranking/Classifiers/EN_IN.hs
index ec6b13a3..847fe47c 100644
--- a/Duckling/Ranking/Classifiers/EN_IN.hs
+++ b/Duckling/Ranking/Classifiers/EN_IN.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_JM.hs b/Duckling/Ranking/Classifiers/EN_JM.hs
index 05c70e7f..904e94d5 100644
--- a/Duckling/Ranking/Classifiers/EN_JM.hs
+++ b/Duckling/Ranking/Classifiers/EN_JM.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_NZ.hs b/Duckling/Ranking/Classifiers/EN_NZ.hs
index d00f06fd..5887267d 100644
--- a/Duckling/Ranking/Classifiers/EN_NZ.hs
+++ b/Duckling/Ranking/Classifiers/EN_NZ.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_PH.hs b/Duckling/Ranking/Classifiers/EN_PH.hs
index 055030fa..b8070d75 100644
--- a/Duckling/Ranking/Classifiers/EN_PH.hs
+++ b/Duckling/Ranking/Classifiers/EN_PH.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("dayyear", -2.70805020110221),
-                                    ("Thursdaymm/dd", -5.678464666671911),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("Thursdaymm/dd", -5.629418059367339),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("mm/dd", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("mm/dd", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_TT.hs b/Duckling/Ranking/Classifiers/EN_TT.hs
index b847ac4c..108fe470 100644
--- a/Duckling/Ranking/Classifiers/EN_TT.hs
+++ b/Duckling/Ranking/Classifiers/EN_TT.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("Thursdaydd/mm", -5.678464666671911),
-                                    ("dayyear", -2.70805020110221),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("Thursdaydd/mm", -5.629418059367339),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd/mm", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("dd/mm", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_US.hs b/Duckling/Ranking/Classifiers/EN_US.hs
index 57315d5b..862cbe1d 100644
--- a/Duckling/Ranking/Classifiers/EN_US.hs
+++ b/Duckling/Ranking/Classifiers/EN_US.hs
@@ -75,11 +75,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5751735779663486, unseen = -5.799092654460526,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 328},
+                     ClassData{prior = -0.578227015453239, unseen = -5.796057750765372,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 327},
                    koData =
-                     ClassData{prior = -0.8269236411920662, unseen = -5.54907608489522,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 255}}),
+                     ClassData{prior = -0.8230097418709299, unseen = -5.552959584921617,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 256}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -228,7 +228,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -246,40 +246,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -326,29 +327,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -416,12 +415,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("mm/dd",
         Classifier{okData =
-                     ClassData{prior = -1.2729656758128873,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = -1.4271163556401458,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -0.3285040669720361, unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18}}),
+                     ClassData{prior = -0.2744368457017603, unseen = -3.044522437723423,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 19}}),
        ("at <time-of-day>",
         Classifier{okData =
                      ClassData{prior = -8.223809823697212e-2,
@@ -660,7 +659,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.12516314295400605,
+                     ClassData{prior = -0.10536051565782628,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -682,14 +681,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.1400661634962708,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.3025850929940455), ("year", -1.791759469228055),
-                                    ("<integer> <unit-of-duration>", -1.791759469228055),
-                                    ("a <unit-of-duration>", -2.3025850929940455)],
-                               n = 6}}),
+                                   [("quarter", -2.639057329615259), ("year", -1.7227665977411035),
+                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
+                                    ("a <unit-of-duration>", -2.2335922215070942)],
+                               n = 5}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -817,8 +815,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -831,366 +829,355 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4598474388815989, unseen = -6.79794041297493,
+                     ClassData{prior = -0.43990038452798524, unseen = -6.78897174299217,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.10367653771491),
-                                    ("Father's Dayyear (latent)", -6.10367653771491),
-                                    ("Ramadanyear (latent)", -6.10367653771491),
+                                   [("Navaratriyear (latent)", -6.094697801749634),
+                                    ("Father's Dayyear (latent)", -6.094697801749634),
+                                    ("Ramadanyear (latent)", -6.094697801749634),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.850913569219542),
-                                    ("Military Spouse Dayyear (latent)", -6.10367653771491),
-                                    ("Bhai Doojyear (latent)", -6.10367653771491),
+                                     -4.841934833254267),
+                                    ("Military Spouse Dayyear (latent)", -6.094697801749634),
+                                    ("Bhai Doojyear (latent)", -6.094697801749634),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.850913569219542),
-                                    ("hourday", -4.398928445476485),
-                                    ("dayhour", -3.300316156808375),
-                                    ("Martin Luther King's Dayyear (latent)", -5.698211429606745),
-                                    ("Shemini Atzeretyear (latent)", -6.10367653771491),
-                                    ("daymonth", -5.187385805840755),
-                                    ("monthday", -5.698211429606745),
-                                    ("monthyear", -4.3119170684868555),
-                                    ("Yom Ha'atzmautyear (latent)", -6.10367653771491),
-                                    ("Vijayadashamiyear (latent)", -6.10367653771491),
+                                     -4.841934833254267),
+                                    ("hourday", -4.3899497095112086),
+                                    ("dayhour", -3.291337420843099),
+                                    ("Martin Luther King's Dayyear (latent)", -5.68923269364147),
+                                    ("Shemini Atzeretyear (latent)", -6.094697801749634),
+                                    ("daymonth", -5.178407069875479),
+                                    ("monthday", -5.68923269364147),
+                                    ("monthyear", -4.302938332521579),
+                                    ("Yom Ha'atzmautyear (latent)", -6.094697801749634),
+                                    ("Vijayadashamiyear (latent)", -6.094697801749634),
                                     ("Administrative Professionals' Dayyear (latent)",
-                                     -4.717382176595019),
-                                    ("Thanksgiving Dayyear (latent)", -5.0050642490468),
-                                    ("Thai Pongalyear (latent)", -5.410529357154965),
-                                    ("Thiru Onamyear (latent)", -5.410529357154965),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.10367653771491),
+                                     -4.708403440629744),
+                                    ("Thanksgiving Dayyear (latent)", -4.996085513081525),
+                                    ("Thai Pongalyear (latent)", -5.401550621189689),
+                                    ("Thiru Onamyear (latent)", -5.401550621189689),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.094697801749634),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.10367653771491),
-                                    ("houryear", -5.410529357154965),
+                                     -6.094697801749634),
+                                    ("houryear", -5.401550621189689),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.10367653771491),
-                                    ("Christmas<time-of-day> am|pm", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Christmas<time-of-day> am|pm", -6.094697801749634),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.10367653771491),
+                                     -6.094697801749634),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.410529357154965),
-                                    ("<time-of-day> am|pmintersect", -4.850913569219542),
-                                    ("Earth Houryear (latent)", -6.10367653771491),
-                                    ("Octoberyear (latent)", -4.599599140938636),
-                                    ("intersect<time-of-day> am|pm", -6.10367653771491),
-                                    ("Mattu Pongalyear (latent)", -6.10367653771491),
-                                    ("Shavuotyear (latent)", -6.10367653771491),
+                                     -5.401550621189689),
+                                    ("<time-of-day> am|pmintersect", -4.841934833254267),
+                                    ("Earth Houryear (latent)", -6.094697801749634),
+                                    ("Octoberyear (latent)", -4.59062040497336),
+                                    ("intersect<time-of-day> am|pm", -6.094697801749634),
+                                    ("Mattu Pongalyear (latent)", -6.094697801749634),
+                                    ("Shavuotyear (latent)", -6.094697801749634),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.10367653771491),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.094697801749634),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.698211429606745),
-                                    ("Marchyear (latent)", -6.10367653771491),
-                                    ("Sukkotyear (latent)", -5.698211429606745),
+                                     -5.68923269364147),
+                                    ("Marchyear (latent)", -6.094697801749634),
+                                    ("Sukkotyear (latent)", -5.68923269364147),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.10367653771491),
-                                    ("Clean Mondayyear (latent)", -5.698211429606745),
-                                    ("monthhour", -5.698211429606745),
-                                    ("todayat <time-of-day>", -6.10367653771491),
-                                    ("Thursday<time> timezone", -4.398928445476485),
-                                    ("from|since|after <time>December", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Clean Mondayyear (latent)", -5.68923269364147),
+                                    ("monthhour", -5.68923269364147),
+                                    ("todayat <time-of-day>", -6.094697801749634),
+                                    ("Thursday<time> timezone", -4.3899497095112086),
+                                    ("from|since|after <time>December", -6.094697801749634),
                                     ("Emergency Medical Services for Children Dayyear (latent)",
-                                     -6.10367653771491),
-                                    ("this <time>hh(:mm) - <time-of-day> am|pm", -6.10367653771491),
-                                    ("Tax Daythis|last|next <cycle>", -6.10367653771491),
-                                    ("dayday", -4.088773517172645),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.10367653771491),
-                                    ("mm/ddat <time-of-day>", -6.10367653771491),
-                                    ("tonightat <time-of-day>", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("this <time>hh(:mm) - <time-of-day> am|pm",
+                                     -6.094697801749634),
+                                    ("Tax Daythis|last|next <cycle>", -6.094697801749634),
+                                    ("dayday", -4.07979478120737),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.094697801749634),
+                                    ("mm/ddat <time-of-day>", -6.094697801749634),
+                                    ("tonightat <time-of-day>", -6.094697801749634),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.410529357154965),
-                                    ("today<time-of-day> am|pm", -6.10367653771491),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.698211429606745),
-                                    ("at <time-of-day><time> <part-of-day>", -6.10367653771491),
-                                    ("mm/dd<time-of-day> am|pm", -6.10367653771491),
-                                    ("hourhour", -4.850913569219542),
-                                    ("<time-of-day> am|pmon <date>", -4.088773517172645),
-                                    ("Navaratriin|during <named-month>|year", -6.10367653771491),
-                                    ("Wednesdaythis|last|next <cycle>", -6.10367653771491),
-                                    ("Lentyear (latent)", -6.10367653771491),
+                                     -5.401550621189689),
+                                    ("today<time-of-day> am|pm", -6.094697801749634),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.68923269364147),
+                                    ("at <time-of-day><time> <part-of-day>", -6.094697801749634),
+                                    ("mm/dd<time-of-day> am|pm", -6.094697801749634),
+                                    ("hourhour", -4.841934833254267),
+                                    ("<time-of-day> am|pmon <date>", -4.07979478120737),
+                                    ("Navaratriin|during <named-month>|year", -6.094697801749634),
+                                    ("Wednesdaythis|last|next <cycle>", -6.094697801749634),
+                                    ("Lentyear (latent)", -6.094697801749634),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.599599140938636),
-                                    ("Boghiyear (latent)", -6.10367653771491),
-                                    ("dayyear", -1.8695700331176506),
-                                    ("Thursdayfrom|since|after <time>", -5.698211429606745),
+                                     -4.59062040497336),
+                                    ("Boghiyear (latent)", -6.094697801749634),
+                                    ("dayyear", -1.8678640564814546),
+                                    ("Thursdayfrom|since|after <time>", -5.68923269364147),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.10367653771491),
-                                    ("Thursdayat <time-of-day>", -5.698211429606745),
-                                    ("Islamic New Yearyear (latent)", -5.698211429606745),
-                                    ("Laylat al-Qadryear (latent)", -5.187385805840755),
-                                    ("Shrove Tuesdayyear (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Thursdayat <time-of-day>", -5.68923269364147),
+                                    ("Islamic New Yearyear (latent)", -5.68923269364147),
+                                    ("Laylat al-Qadryear (latent)", -5.178407069875479),
+                                    ("Shrove Tuesdayyear (latent)", -6.094697801749634),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.410529357154965),
-                                    ("<time-of-day> am|pmtomorrow", -5.410529357154965),
-                                    ("Yom Kippuryear (latent)", -6.10367653771491),
-                                    ("<part-of-day> of <time>year (latent)", -6.10367653771491),
-                                    ("minutehour", -5.187385805840755),
-                                    ("Kaanum Pongalyear (latent)", -5.698211429606745),
-                                    ("Maha Saptamiyear (latent)", -6.10367653771491),
+                                     -5.401550621189689),
+                                    ("<time-of-day> am|pmtomorrow", -5.401550621189689),
+                                    ("Yom Kippuryear (latent)", -6.094697801749634),
+                                    ("<part-of-day> of <time>year (latent)", -6.094697801749634),
+                                    ("minutehour", -5.178407069875479),
+                                    ("Kaanum Pongalyear (latent)", -5.68923269364147),
+                                    ("Maha Saptamiyear (latent)", -6.094697801749634),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.698211429606745),
+                                     -5.68923269364147),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.398928445476485),
-                                    ("for <duration> from <time>December", -6.10367653771491),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.10367653771491),
+                                     -4.3899497095112086),
+                                    ("for <duration> from <time>December", -6.094697801749634),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.094697801749634),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.187385805840755),
+                                     -5.178407069875479),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.698211429606745),
-                                    ("Pentecostyear (latent)", -6.10367653771491),
+                                     -5.68923269364147),
+                                    ("Pentecostyear (latent)", -6.094697801749634),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.187385805840755),
-                                    ("Eid al-Fitryear (latent)", -6.10367653771491),
+                                     -5.178407069875479),
+                                    ("Eid al-Fitryear (latent)", -6.094697801749634),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.10367653771491),
-                                    ("Mondayin|during the <part-of-day>", -6.10367653771491),
-                                    ("Chhathin|during <named-month>|year", -6.10367653771491),
-                                    ("Diwaliin|during <named-month>|year", -6.10367653771491),
-                                    ("Raksha Bandhanyear (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Mondayin|during the <part-of-day>", -6.094697801749634),
+                                    ("Chhathin|during <named-month>|year", -6.094697801749634),
+                                    ("Diwaliin|during <named-month>|year", -6.094697801749634),
+                                    ("Raksha Bandhanyear (latent)", -6.094697801749634),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.698211429606745),
-                                    ("Emancipation Dayyear (latent)", -5.410529357154965),
-                                    ("Ashurayear (latent)", -6.10367653771491),
-                                    ("Tuesdayin|during <named-month>|year", -6.10367653771491),
-                                    ("Chinese New Yearyear (latent)", -6.10367653771491),
-                                    ("Lag BaOmeryear (latent)", -6.10367653771491),
+                                     -5.68923269364147),
+                                    ("Emancipation Dayyear (latent)", -5.401550621189689),
+                                    ("Ashurayear (latent)", -6.094697801749634),
+                                    ("Tuesdayin|during <named-month>|year", -6.094697801749634),
+                                    ("Chinese New Yearyear (latent)", -6.094697801749634),
+                                    ("Lag BaOmeryear (latent)", -6.094697801749634),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.10367653771491),
-                                    ("Eid al-Adhayear (latent)", -5.187385805840755),
-                                    ("intersectin|during the <part-of-day>", -6.10367653771491),
-                                    ("Palm Sundayyear (latent)", -6.10367653771491),
-                                    ("Christmasat <time-of-day>", -6.10367653771491),
-                                    ("Passoveryear (latent)", -6.10367653771491),
-                                    ("Lazarus Saturdayyear (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Eid al-Adhayear (latent)", -5.178407069875479),
+                                    ("intersectin|during the <part-of-day>", -6.094697801749634),
+                                    ("Palm Sundayyear (latent)", -6.094697801749634),
+                                    ("Christmasat <time-of-day>", -6.094697801749634),
+                                    ("Passoveryear (latent)", -6.094697801749634),
+                                    ("Lazarus Saturdayyear (latent)", -6.094697801749634),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.10367653771491),
-                                    ("Cyber Mondayyear (latent)", -5.698211429606745),
-                                    ("Yom HaShoahyear (latent)", -5.698211429606745),
+                                     -6.094697801749634),
+                                    ("Cyber Mondayyear (latent)", -5.68923269364147),
+                                    ("Yom HaShoahyear (latent)", -5.68923269364147),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.698211429606745),
+                                     -5.68923269364147),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.10367653771491),
-                                    ("Septemberyear (latent)", -5.698211429606745),
-                                    ("mm/ddyear (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Septemberyear (latent)", -5.68923269364147),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.850913569219542),
-                                    ("Halloweenyear (latent)", -6.10367653771491),
+                                     -4.841934833254267),
+                                    ("Halloweenyear (latent)", -6.094697801749634),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.698211429606745),
+                                     -5.68923269364147),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.410529357154965),
+                                     -5.401550621189689),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.10367653771491),
-                                    ("at <time-of-day>intersect", -5.698211429606745),
-                                    ("Rosh Hashanahyear (latent)", -5.410529357154965),
-                                    ("Dhanterasyear (latent)", -6.10367653771491),
-                                    ("Tu BiShvatyear (latent)", -6.10367653771491),
-                                    ("Holiyear (latent)", -5.410529357154965),
+                                     -6.094697801749634),
+                                    ("at <time-of-day>intersect", -5.68923269364147),
+                                    ("Rosh Hashanahyear (latent)", -5.401550621189689),
+                                    ("Dhanterasyear (latent)", -6.094697801749634),
+                                    ("Tu BiShvatyear (latent)", -6.094697801749634),
+                                    ("Holiyear (latent)", -5.401550621189689),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.10367653771491),
-                                    ("Holika Dahanyear (latent)", -5.410529357154965),
+                                     -6.094697801749634),
+                                    ("Holika Dahanyear (latent)", -5.401550621189689),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.10367653771491),
-                                    ("dayminute", -3.464619208099651),
-                                    ("Mawlidyear (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("dayminute", -3.4556404721343754),
+                                    ("Mawlidyear (latent)", -6.094697801749634),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.698211429606745),
+                                     -5.68923269364147),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.10367653771491),
-                                    ("Jumu'atul-Widayear (latent)", -5.187385805840755),
-                                    ("minuteday", -2.4660903779885244),
-                                    ("absorption of , after named dayintersect", -6.10367653771491),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.10367653771491),
-                                    ("<ordinal> <cycle> of <time>year (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Jumu'atul-Widayear (latent)", -5.178407069875479),
+                                    ("minuteday", -2.4571116420232486),
+                                    ("absorption of , after named dayintersect",
+                                     -6.094697801749634),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.094697801749634),
+                                    ("<ordinal> <cycle> of <time>year (latent)",
+                                     -6.094697801749634),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.10367653771491),
-                                    ("Boss's Dayyear (latent)", -5.698211429606745),
-                                    ("Global Youth Service Dayyear (latent)", -6.10367653771491),
-                                    ("Dhanterasin|during <named-month>|year", -6.10367653771491),
-                                    ("Tisha B'Avyear (latent)", -6.10367653771491),
-                                    ("Isra and Mi'rajyear (latent)", -5.187385805840755),
+                                     -6.094697801749634),
+                                    ("Boss's Dayyear (latent)", -5.68923269364147),
+                                    ("Global Youth Service Dayyear (latent)", -6.094697801749634),
+                                    ("Dhanterasin|during <named-month>|year", -6.094697801749634),
+                                    ("Tisha B'Avyear (latent)", -6.094697801749634),
+                                    ("Isra and Mi'rajyear (latent)", -5.178407069875479),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.10367653771491),
-                                    ("Christmasyear (latent)", -5.698211429606745),
-                                    ("Naraka Chaturdashiyear (latent)", -5.698211429606745),
-                                    ("at <time-of-day>on <date>", -5.0050642490468),
-                                    ("Thai Pongalin|during <named-month>|year", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("Christmasyear (latent)", -5.68923269364147),
+                                    ("Naraka Chaturdashiyear (latent)", -5.68923269364147),
+                                    ("at <time-of-day>on <date>", -4.996085513081525),
+                                    ("Thai Pongalin|during <named-month>|year", -6.094697801749634),
                                     ("Emergency Medical Services Weekyear (latent)",
-                                     -6.10367653771491),
+                                     -6.094697801749634),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.4942386252808095),
-                                    ("dayweek", -6.10367653771491),
-                                    ("Easter Sundayyear (latent)", -5.410529357154965),
-                                    ("weekyear", -5.0050642490468),
-                                    ("hh:mmin|during the <part-of-day>", -5.410529357154965),
+                                     -4.485259889315534),
+                                    ("dayweek", -6.094697801749634),
+                                    ("Easter Sundayyear (latent)", -5.401550621189689),
+                                    ("weekyear", -4.996085513081525),
+                                    ("hh:mmin|during the <part-of-day>", -5.401550621189689),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.698211429606745),
-                                    ("Hanukkahyear (latent)", -5.410529357154965),
-                                    ("February<time> <part-of-day>", -6.10367653771491),
-                                    ("National Grandparents Dayyear (latent)", -6.10367653771491),
-                                    ("Great Lentyear (latent)", -6.10367653771491),
-                                    ("tomorrowat <time-of-day>", -5.410529357154965),
-                                    ("Labor Dayyear (latent)", -6.10367653771491),
-                                    ("between <time> and <time>on <date>", -4.4942386252808095),
+                                     -5.68923269364147),
+                                    ("Hanukkahyear (latent)", -5.401550621189689),
+                                    ("February<time> <part-of-day>", -6.094697801749634),
+                                    ("National Grandparents Dayyear (latent)", -6.094697801749634),
+                                    ("Great Lentyear (latent)", -6.094697801749634),
+                                    ("tomorrowat <time-of-day>", -5.401550621189689),
+                                    ("Labor Dayyear (latent)", -6.094697801749634),
+                                    ("between <time> and <time>on <date>", -4.485259889315534),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.10367653771491),
-                                    ("last <cycle> of <time>year (latent)", -5.410529357154965),
-                                    ("at <time-of-day>tomorrow", -5.698211429606745),
-                                    ("tomorrow<time-of-day> am|pm", -6.10367653771491),
-                                    ("President's Dayyear (latent)", -6.10367653771491),
+                                     -6.094697801749634),
+                                    ("last <cycle> of <time>year (latent)", -5.401550621189689),
+                                    ("at <time-of-day>tomorrow", -5.68923269364147),
+                                    ("tomorrow<time-of-day> am|pm", -6.094697801749634),
+                                    ("President's Dayyear (latent)", -6.094697801749634),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.10367653771491),
-                                    ("Diwaliyear (latent)", -6.10367653771491),
-                                    ("Black Fridayyear (latent)", -5.698211429606745),
+                                     -6.094697801749634),
+                                    ("Diwaliyear (latent)", -6.094697801749634),
+                                    ("Black Fridayyear (latent)", -5.68923269364147),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.10367653771491),
+                                     -6.094697801749634),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.10367653771491),
-                                    ("Chhathyear (latent)", -5.698211429606745),
-                                    ("Vasant Panchamiyear (latent)", -6.10367653771491),
-                                    ("Tax Dayyear (latent)", -5.187385805840755),
+                                     -6.094697801749634),
+                                    ("Chhathyear (latent)", -5.68923269364147),
+                                    ("Vasant Panchamiyear (latent)", -6.094697801749634),
+                                    ("Tax Dayyear (latent)", -5.178407069875479),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.10367653771491),
-                                    ("Februaryintersect", -6.10367653771491),
-                                    ("Mother's Dayyear (latent)", -6.10367653771491),
-                                    ("Simchat Torahyear (latent)", -6.10367653771491),
-                                    ("minuteyear", -6.10367653771491)],
-                               n = 334},
+                                     -6.094697801749634),
+                                    ("Februaryintersect", -6.094697801749634),
+                                    ("Mother's Dayyear (latent)", -6.094697801749634),
+                                    ("Simchat Torahyear (latent)", -6.094697801749634),
+                                    ("minuteyear", -6.094697801749634)],
+                               n = 333},
                    koData =
-                     ClassData{prior = -0.9979888732945525, unseen = -6.42648845745769,
+                     ClassData{prior = -1.0331071168994435, unseen = -6.380122536899766,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.8154311114712876),
-                                    ("hourday", -4.8154311114712876),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.731721843345443),
-                                    ("dayhour", -3.166772485883906),
-                                    ("Tuesdayfrom|since|after <time>", -5.731721843345443),
-                                    ("daymonth", -3.591655679849172),
-                                    ("monthday", -5.326256735237278),
-                                    ("monthyear", -4.478958874850075),
-                                    ("<time-of-day> am|pmyear (latent)", -5.326256735237278),
-                                    ("Thai Pongalyear (latent)", -5.038574662785497),
-                                    ("intersecthh:mm", -5.731721843345443),
+                                     -4.768988271217486),
+                                    ("hourday", -4.768988271217486),
+                                    ("dayhour", -3.120329645630105),
+                                    ("Tuesdayfrom|since|after <time>", -5.685279003091641),
+                                    ("daymonth", -3.6703759825493765),
+                                    ("monthyear", -4.432516034596273),
+                                    ("<time-of-day> am|pmyear (latent)", -5.2798138949834765),
+                                    ("Thai Pongalyear (latent)", -4.992131822531696),
+                                    ("intersecthh:mm", -5.685279003091641),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.731721843345443),
-                                    ("houryear", -4.8154311114712876),
+                                     -5.685279003091641),
+                                    ("houryear", -4.768988271217486),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.731721843345443),
+                                     -5.685279003091641),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.038574662785497),
-                                    ("<time-of-day> am|pmintersect", -4.478958874850075),
-                                    ("until <time>on <date>", -5.038574662785497),
-                                    ("Octoberyear (latent)", -5.731721843345443),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.731721843345443),
+                                     -4.992131822531696),
+                                    ("<time-of-day> am|pmintersect", -4.432516034596273),
+                                    ("until <time>on <date>", -4.992131822531696),
+                                    ("Octoberyear (latent)", -5.685279003091641),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.478958874850075),
+                                     -4.992131822531696),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.731721843345443),
-                                    ("absorption of , after named dayJuly", -5.326256735237278),
-                                    ("from|since|after <time>July", -5.731721843345443),
+                                     -5.685279003091641),
+                                    ("absorption of , after named dayJuly", -5.2798138949834765),
+                                    ("from|since|after <time>July", -5.685279003091641),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.8154311114712876),
-                                    ("Clean Mondayyear (latent)", -5.731721843345443),
-                                    ("monthhour", -5.731721843345443),
-                                    ("hourmonth", -4.8154311114712876),
-                                    ("todayat <time-of-day>", -5.731721843345443),
-                                    ("from|since|after <time>December", -5.731721843345443),
+                                     -4.768988271217486),
+                                    ("Clean Mondayyear (latent)", -5.685279003091641),
+                                    ("monthhour", -5.685279003091641),
+                                    ("hourmonth", -4.768988271217486),
+                                    ("todayat <time-of-day>", -5.685279003091641),
+                                    ("from|since|after <time>December", -5.685279003091641),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.731721843345443),
-                                    ("Mondayyear (latent)", -4.633109554677333),
-                                    ("dayday", -5.326256735237278),
-                                    ("mm/ddat <time-of-day>", -5.326256735237278),
-                                    ("<time-of-day> am|pmon <date>", -4.478958874850075),
-                                    ("dayyear", -2.6871994056220196),
-                                    ("Thursdaymm/dd", -5.731721843345443),
-                                    ("New Year's Dayyear (latent)", -5.326256735237278),
-                                    ("Thursdayfrom|since|after <time>", -4.026973751107017),
-                                    ("Thursdayat <time-of-day>", -4.478958874850075),
+                                     -5.685279003091641),
+                                    ("Mondayyear (latent)", -4.586666714423532),
+                                    ("dayday", -5.2798138949834765),
+                                    ("mm/ddat <time-of-day>", -5.2798138949834765),
+                                    ("<time-of-day> am|pmon <date>", -4.432516034596273),
+                                    ("dayyear", -2.740840023925201),
+                                    ("Thursdaymm/dd", -5.685279003091641),
+                                    ("New Year's Dayyear (latent)", -5.2798138949834765),
+                                    ("Thursdayfrom|since|after <time>", -3.9805309108532163),
+                                    ("Thursdayat <time-of-day>", -4.432516034596273),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.731721843345443),
-                                    ("Aprilyear (latent)", -5.731721843345443),
-                                    ("this <time><time-of-day> am|pm", -5.731721843345443),
-                                    ("monthminute", -5.731721843345443),
-                                    ("<time-of-day> am|pmtomorrow", -5.731721843345443),
-                                    ("Thursdayhh:mm", -4.8154311114712876),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.731721843345443),
-                                    ("minutemonth", -3.9399623741173873),
-                                    ("Augustyear (latent)", -5.326256735237278),
+                                     -5.685279003091641),
+                                    ("Aprilyear (latent)", -5.685279003091641),
+                                    ("monthminute", -5.685279003091641),
+                                    ("<time-of-day> am|pmtomorrow", -5.685279003091641),
+                                    ("Thursdayhh:mm", -4.768988271217486),
+                                    ("minutemonth", -3.893519533863586),
+                                    ("Augustyear (latent)", -5.2798138949834765),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.326256735237278),
+                                     -5.2798138949834765),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.326256735237278),
-                                    ("week-endin|during <named-month>|year", -5.731721843345443),
+                                     -5.2798138949834765),
+                                    ("week-endin|during <named-month>|year", -5.685279003091641),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.326256735237278),
+                                     -5.2798138949834765),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.731721843345443),
-                                    ("Sundayyear (latent)", -4.8154311114712876),
-                                    ("Christmasat <time-of-day>", -5.731721843345443),
-                                    ("from|since|after <time>year (latent)", -4.478958874850075),
+                                     -5.685279003091641),
+                                    ("Sundayyear (latent)", -4.768988271217486),
+                                    ("Christmasat <time-of-day>", -5.685279003091641),
+                                    ("from|since|after <time>year (latent)", -4.586666714423532),
                                     ("<duration> after|before|from <time>December",
-                                     -5.731721843345443),
-                                    ("yesterday<time-of-day> am|pm", -5.731721843345443),
+                                     -5.685279003091641),
+                                    ("yesterday<time-of-day> am|pm", -5.685279003091641),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.731721843345443),
-                                    ("mm/ddyear (latent)", -5.731721843345443),
+                                     -5.685279003091641),
+                                    ("mm/ddyear (latent)", -5.685279003091641),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.038574662785497),
+                                     -4.992131822531696),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.731721843345443),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.731721843345443),
-                                    ("at <time-of-day>intersect", -5.326256735237278),
-                                    ("hh:mmyear (latent)", -4.633109554677333),
-                                    ("Holiyear (latent)", -5.731721843345443),
-                                    ("until <time><time-of-day> am|pm", -5.731721843345443),
+                                     -5.685279003091641),
+                                    ("at <time-of-day>intersect", -5.2798138949834765),
+                                    ("hh:mmyear (latent)", -4.586666714423532),
+                                    ("Holiyear (latent)", -5.685279003091641),
+                                    ("until <time><time-of-day> am|pm", -5.685279003091641),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.731721843345443),
-                                    ("dayminute", -3.092664513730184),
-                                    ("intersectSeptember", -4.227644446569168),
-                                    ("minuteday", -2.6636689082118252),
+                                     -5.685279003091641),
+                                    ("dayminute", -3.159550358783386),
+                                    ("intersectSeptember", -4.181201606315367),
+                                    ("minuteday", -2.617226067958024),
                                     ("absorption of , after named dayintersect",
-                                     -5.731721843345443),
-                                    ("Februaryin|during the <part-of-day>", -5.731721843345443),
-                                    ("hh:mmon <date>", -3.7168188228031775),
-                                    ("Saturdayyear (latent)", -5.731721843345443),
-                                    ("from|since|after <time>on <date>", -4.8154311114712876),
+                                     -5.685279003091641),
+                                    ("Februaryin|during the <part-of-day>", -5.685279003091641),
+                                    ("hh:mmon <date>", -3.6703759825493765),
+                                    ("Saturdayyear (latent)", -5.685279003091641),
+                                    ("from|since|after <time>on <date>", -4.768988271217486),
                                     ("absorption of , after named daySeptember",
-                                     -4.8154311114712876),
-                                    ("Naraka Chaturdashiyear (latent)", -5.731721843345443),
-                                    ("on <date>September", -5.326256735237278),
-                                    ("at <time-of-day>on <date>", -5.326256735237278),
-                                    ("dayweek", -5.731721843345443),
-                                    ("Easter Sundayyear (latent)", -5.326256735237278),
-                                    ("Thursday<time-of-day> am|pm", -4.8154311114712876),
-                                    ("weekyear", -5.326256735237278),
+                                     -4.768988271217486),
+                                    ("Naraka Chaturdashiyear (latent)", -5.685279003091641),
+                                    ("on <date>September", -5.2798138949834765),
+                                    ("at <time-of-day>on <date>", -5.2798138949834765),
+                                    ("dayweek", -5.685279003091641),
+                                    ("Easter Sundayyear (latent)", -5.2798138949834765),
+                                    ("Thursday<time-of-day> am|pm", -4.992131822531696),
+                                    ("weekyear", -5.2798138949834765),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.731721843345443),
+                                     -5.685279003091641),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.038574662785497),
-                                    ("Sundayfrom|since|after <time>", -5.731721843345443),
-                                    ("absorption of , after named dayFebruary",
-                                     -4.8154311114712876),
+                                     -4.992131822531696),
+                                    ("Sundayfrom|since|after <time>", -5.685279003091641),
+                                    ("absorption of , after named dayFebruary", -4.768988271217486),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.731721843345443),
-                                    ("tomorrowat <time-of-day>", -5.731721843345443),
+                                     -5.685279003091641),
+                                    ("tomorrowat <time-of-day>", -5.685279003091641),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.731721843345443),
-                                    ("last <cycle> of <time>year (latent)", -5.326256735237278),
-                                    ("tomorrow<time-of-day> am|pm", -5.731721843345443),
+                                     -5.685279003091641),
+                                    ("last <cycle> of <time>year (latent)", -5.2798138949834765),
+                                    ("tomorrow<time-of-day> am|pm", -5.685279003091641),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.038574662785497),
-                                    ("Diwaliyear (latent)", -5.326256735237278),
+                                     -4.992131822531696),
+                                    ("Diwaliyear (latent)", -5.2798138949834765),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.731721843345443),
-                                    ("Fridayyear (latent)", -5.326256735237278),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.731721843345443),
-                                    ("minuteyear", -4.478958874850075)],
-                               n = 195}}),
+                                     -5.685279003091641),
+                                    ("Fridayyear (latent)", -5.2798138949834765),
+                                    ("minuteyear", -4.432516034596273)],
+                               n = 184}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1404,21 +1391,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.13580154115906176,
-                               unseen = -5.135798437050262,
+                     ClassData{prior = -0.13124218903038826,
+                               unseen = -5.1298987149230735,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -3.614851411631109e-2),
-                                    ("intersect 2 numbers", -3.7436043538031827)],
-                               n = 165},
+                                   [("integer (numeric)", -3.636764417087483e-2),
+                                    ("intersect 2 numbers", -3.7376696182833684)],
+                               n = 164},
                    koData =
-                     ClassData{prior = -2.063693184711697, unseen = -3.367295829986474,
+                     ClassData{prior = -2.0956144009254367, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1349799328389845),
-                                    ("negative numbers", -0.6931471805599453),
-                                    ("compose by multiplication", -1.9459101490553135)],
-                               n = 24}}),
+                                   [("integer (numeric)", -1.2163953243244932),
+                                    ("negative numbers", -0.6567795363890705),
+                                    ("compose by multiplication", -1.9095425048844386)],
+                               n = 23}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1517,26 +1504,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1653,13 +1633,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -2011,19 +1991,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.587786664902119, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8109302162163288, unseen = -4.143134726391533,
+                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.959694113937206e-2),
-                                    ("integer (0..19)", -3.028522096376982)],
-                               n = 60}}),
+                                   [("integer (numeric)", -5.129329438755058e-2),
+                                    ("integer (0..19)", -2.995732273553991)],
+                               n = 58}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -2046,37 +2026,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.13192754304254806, unseen = -5.19295685089021,
+                     ClassData{prior = -0.12062798778861475,
+                               unseen = -5.181783550292085,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5483284762254965),
-                                    ("integer (0..19)year (grain)", -2.9901612285045354),
-                                    ("integer (numeric)day (grain)", -2.622436448379218),
-                                    ("integer (0..19)second (grain) ", -3.801091444720864),
-                                    ("integer (0..19)hour (grain)", -3.107944264160919),
-                                    ("second", -3.3956263366127),
-                                    ("integer (numeric)second (grain) ", -4.088773517172645),
-                                    ("integer (numeric)year (grain)", -3.2414756567854415),
-                                    ("day", -2.3541724617845388), ("year", -2.479335604738545),
-                                    ("integer (numeric)week (grain)", -3.107944264160919),
-                                    ("integer (0..19)month (grain)", -3.577947893406655),
-                                    ("hour", -2.7024791560527546), ("month", -3.2414756567854415),
-                                    ("integer (numeric)minute (grain)", -3.2414756567854415),
-                                    ("integer (0..19)minute (grain)", -3.107944264160919),
-                                    ("integer (numeric)month (grain)", -4.088773517172645),
-                                    ("minute", -2.5483284762254965),
-                                    ("integer (numeric)hour (grain)", -3.577947893406655),
-                                    ("integer (0..19)day (grain)", -3.577947893406655),
-                                    ("integer (0..19)week (grain)", -3.2414756567854415)],
+                                   [("week", -2.5370924029585704),
+                                    ("integer (0..19)year (grain)", -2.9789251552376097),
+                                    ("integer (numeric)day (grain)", -2.6112003751122925),
+                                    ("integer (0..19)second (grain) ", -3.7898553714539385),
+                                    ("integer (0..19)hour (grain)", -3.096708190893993),
+                                    ("second", -3.3843902633457743),
+                                    ("integer (numeric)second (grain) ", -4.07753744390572),
+                                    ("integer (numeric)year (grain)", -3.230239583518516),
+                                    ("day", -2.342936388517613), ("year", -2.468099531471619),
+                                    ("integer (numeric)week (grain)", -3.096708190893993),
+                                    ("integer (0..19)month (grain)", -3.5667118201397288),
+                                    ("hour", -2.691243082785829), ("month", -3.230239583518516),
+                                    ("integer (numeric)minute (grain)", -3.230239583518516),
+                                    ("integer (0..19)minute (grain)", -3.096708190893993),
+                                    ("integer (numeric)month (grain)", -4.07753744390572),
+                                    ("minute", -2.5370924029585704),
+                                    ("integer (numeric)hour (grain)", -3.5667118201397288),
+                                    ("integer (0..19)day (grain)", -3.5667118201397288),
+                                    ("integer (0..19)week (grain)", -3.230239583518516)],
                                n = 78},
                    koData =
-                     ClassData{prior = -2.0907410969337694, unseen = -3.828641396489095,
+                     ClassData{prior = -2.174751721484161, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -2086,7 +2066,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23841102344499823, unseen = -5.41610040220442,
+                     ClassData{prior = -0.19979618731721863, unseen = -5.41610040220442,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>", -3.8022081394209395),
@@ -2106,16 +2086,14 @@ classifiers
                                     ("minute", -1.7227665977411035)],
                                n = 104},
                    koData =
-                     ClassData{prior = -1.550597412411167, unseen = -4.290459441148391,
+                     ClassData{prior = -1.7086928705294415, unseen = -4.143134726391533,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1780538303479458),
-                                    ("from|since|after <time>", -3.1780538303479458),
-                                    ("<hour-of-day> <integer>", -2.667228206581955),
-                                    ("time-of-day (latent)", -1.2809338454620642),
-                                    ("about|exactly <time-of-day>", -3.58351893845611),
-                                    ("hour", -1.2321436812926323), ("minute", -2.0794415416798357)],
-                               n = 28}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.028522096376982),
+                                    ("from|since|after <time>", -3.028522096376982),
+                                    ("time-of-day (latent)", -1.1314021114911006),
+                                    ("hour", -1.0826119473216687), ("minute", -2.740840023925201)],
+                               n = 23}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2366,34 +2344,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("mm/dd", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("mm/dd", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -3100,11 +3074,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_XX.hs b/Duckling/Ranking/Classifiers/EN_XX.hs
index 6d7a57af..3871fc28 100644
--- a/Duckling/Ranking/Classifiers/EN_XX.hs
+++ b/Duckling/Ranking/Classifiers/EN_XX.hs
@@ -68,11 +68,11 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5999383512419448, unseen = -5.739792912179234,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 309},
+                     ClassData{prior = -0.603179845166116, unseen = -5.736572297479192,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 308},
                    koData =
-                     ClassData{prior = -0.7959453611211539, unseen = -5.545177444479562,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 254}}),
+                     ClassData{prior = -0.7920160829812642, unseen = -5.54907608489522,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 255}}),
        ("<year> (bc|ad)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.5522794985941517, unseen = -4.248495242049359,
+                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,41 +232,40 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.23795863709935042,
-                               unseen = -5.123963979403259,
+                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.019381523748645),
-                                    ("week", -4.42484663185681),
+                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
+                                    ("week", -4.412798293340635),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.42484663185681),
-                                    ("today", -4.42484663185681),
-                                    ("intersect", -2.5530444549552183),
-                                    ("<time> for <duration>", -4.42484663185681),
-                                    ("second", -4.42484663185681), ("now", -3.508555899982655),
-                                    ("tomorrow", -4.019381523748645),
-                                    ("this|last|next <cycle>", -4.42484663185681),
-                                    ("day", -1.9399399820688095),
-                                    ("time-of-day (latent)", -2.6330871626287546),
-                                    ("<time-of-day> am|pm", -4.019381523748645),
-                                    ("nograin", -3.508555899982655),
+                                     -4.412798293340635),
+                                    ("today", -4.412798293340635),
+                                    ("intersect", -2.6210388241125804),
+                                    ("<time> for <duration>", -4.412798293340635),
+                                    ("second", -4.412798293340635), ("now", -3.4965075614664802),
+                                    ("tomorrow", -4.007333185232471),
+                                    ("this|last|next <cycle>", -4.412798293340635),
+                                    ("day", -1.9704512579714308),
+                                    ("time-of-day (latent)", -2.6210388241125804),
+                                    ("<time-of-day> am|pm", -4.007333185232471),
+                                    ("nograin", -3.4965075614664802),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.42484663185681),
-                                    ("<day-of-month> (ordinal)", -4.019381523748645),
-                                    ("Easter Sunday", -4.42484663185681),
-                                    ("Christmas", -3.7316994512968646),
-                                    ("hour", -2.409943611314545), ("month", -4.42484663185681),
-                                    ("<datetime> - <datetime> (interval)", -3.172083663361442),
+                                     -4.412798293340635),
+                                    ("<day-of-month> (ordinal)", -4.007333185232471),
+                                    ("Easter Sunday", -4.412798293340635),
+                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
+                                    ("month", -4.412798293340635),
+                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.920769235080536),
+                                     -2.908720896564361),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.019381523748645),
-                                    ("minute", -1.9399399820688095),
-                                    ("right now", -4.42484663185681),
-                                    ("<month> dd-dd (interval)", -3.7316994512968646),
-                                    ("part of days", -4.42484663185681),
-                                    ("dd-dd <month> (interval)", -4.019381523748645)],
-                               n = 67}}),
+                                     -4.007333185232471),
+                                    ("minute", -1.927891643552635),
+                                    ("right now", -4.412798293340635),
+                                    ("<month> dd-dd (interval)", -3.71965111278069),
+                                    ("part of days", -4.412798293340635),
+                                    ("dd-dd <month> (interval)", -4.007333185232471)],
+                               n = 66}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -313,29 +312,29 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -0.916290731874155, unseen = -3.1780538303479458,
+                     ClassData{prior = -0.7731898882334817,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.4423470353692043),
-                                    ("ordinal (digits)December", -1.749199854809259),
-                                    ("ordinal (digits)February", -2.4423470353692043),
-                                    ("integer (numeric)April", -2.4423470353692043),
-                                    ("month", -1.1895840668738362)],
+                                   [("ordinal (digits)October", -2.3978952727983707),
+                                    ("ordinal (digits)December", -1.7047480922384253),
+                                    ("ordinal (digits)February", -2.3978952727983707),
+                                    ("integer (numeric)April", -2.3978952727983707),
+                                    ("month", -1.1451323043030026)],
                                n = 6},
                    koData =
-                     ClassData{prior = -0.5108256237659907,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.6190392084062235,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -396,12 +395,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("mm/dd",
         Classifier{okData =
-                     ClassData{prior = -1.2729656758128873,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7},
+                     ClassData{prior = -1.4271163556401458,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -0.3285040669720361, unseen = -2.995732273553991,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 18}}),
+                     ClassData{prior = -0.2744368457017603, unseen = -3.044522437723423,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 19}}),
        ("at <time-of-day>",
         Classifier{okData =
                      ClassData{prior = -8.223809823697212e-2,
@@ -640,7 +639,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.16362942378180204,
+                     ClassData{prior = -0.14458122881110755,
                                unseen = -4.700480365792417,
                                likelihoods =
                                  HashMap.fromList
@@ -662,14 +661,14 @@ classifiers
                                     ("minute", -1.2901505005669882)],
                                n = 45},
                    koData =
-                     ClassData{prior = -1.890850371872286, unseen = -3.58351893845611,
+                     ClassData{prior = -2.005333569526114, unseen = -3.5263605246161616,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.456735772821304), ("year", -1.7635885922613588),
-                                    ("<integer> <unit-of-duration>", -1.7635885922613588),
-                                    ("a <unit-of-duration>", -2.169053700369523),
-                                    ("month", -2.8622008809294686)],
-                               n = 8}}),
+                                   [("quarter", -2.803360380906535), ("year", -1.7047480922384253),
+                                    ("<integer> <unit-of-duration>", -1.8870696490323797),
+                                    ("a <unit-of-duration>", -2.1102132003465894),
+                                    ("month", -2.803360380906535)],
+                               n = 7}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -799,8 +798,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -813,353 +812,340 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.48600397059217665,
-                               unseen = -6.727431724850855,
+                     ClassData{prior = -0.46513743959456266,
+                               unseen = -6.717804695023691,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.0330862217988015),
-                                    ("Ramadanyear (latent)", -6.0330862217988015),
+                                   [("Navaratriyear (latent)", -6.023447592961032),
+                                    ("Ramadanyear (latent)", -6.023447592961032),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.780323253303433),
-                                    ("Bhai Doojyear (latent)", -6.0330862217988015),
+                                     -4.770684624465665),
+                                    ("Bhai Doojyear (latent)", -6.023447592961032),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.780323253303433),
-                                    ("hourday", -4.328338129560376),
-                                    ("dayhour", -3.2297258408922667),
-                                    ("Martin Luther King's Dayyear (latent)", -5.627621113690637),
-                                    ("Shemini Atzeretyear (latent)", -6.0330862217988015),
-                                    ("daymonth", -5.116795489924646),
-                                    ("monthday", -5.627621113690637),
-                                    ("monthyear", -4.241326752570746),
-                                    ("Yom Ha'atzmautyear (latent)", -6.0330862217988015),
-                                    ("Vijayadashamiyear (latent)", -6.0330862217988015),
-                                    ("Thanksgiving Dayyear (latent)", -4.9344739331306915),
-                                    ("Thai Pongalyear (latent)", -5.339939041238856),
-                                    ("Thiru Onamyear (latent)", -5.339939041238856),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.0330862217988015),
+                                     -4.770684624465665),
+                                    ("hourday", -4.318699500722608),
+                                    ("dayhour", -3.220087212054498),
+                                    ("Martin Luther King's Dayyear (latent)", -5.6179824848528686),
+                                    ("Shemini Atzeretyear (latent)", -6.023447592961032),
+                                    ("daymonth", -5.107156861086878),
+                                    ("monthday", -5.6179824848528686),
+                                    ("monthyear", -4.231688123732978),
+                                    ("Yom Ha'atzmautyear (latent)", -6.023447592961032),
+                                    ("Vijayadashamiyear (latent)", -6.023447592961032),
+                                    ("Thanksgiving Dayyear (latent)", -4.924835304292923),
+                                    ("Thai Pongalyear (latent)", -5.330300412401088),
+                                    ("Thiru Onamyear (latent)", -5.330300412401088),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.023447592961032),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.0330862217988015),
-                                    ("houryear", -5.339939041238856),
+                                     -6.023447592961032),
+                                    ("houryear", -5.330300412401088),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.0330862217988015),
-                                    ("Christmas<time-of-day> am|pm", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Christmas<time-of-day> am|pm", -6.023447592961032),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.0330862217988015),
+                                     -6.023447592961032),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.339939041238856),
-                                    ("<time-of-day> am|pmintersect", -4.780323253303433),
-                                    ("Earth Houryear (latent)", -6.0330862217988015),
-                                    ("Octoberyear (latent)", -4.529008825022527),
-                                    ("intersect<time-of-day> am|pm", -6.0330862217988015),
-                                    ("Mattu Pongalyear (latent)", -6.0330862217988015),
-                                    ("Shavuotyear (latent)", -6.0330862217988015),
+                                     -5.330300412401088),
+                                    ("<time-of-day> am|pmintersect", -4.770684624465665),
+                                    ("Earth Houryear (latent)", -6.023447592961032),
+                                    ("Octoberyear (latent)", -4.5193701961847585),
+                                    ("intersect<time-of-day> am|pm", -6.023447592961032),
+                                    ("Mattu Pongalyear (latent)", -6.023447592961032),
+                                    ("Shavuotyear (latent)", -6.023447592961032),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.0330862217988015),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.023447592961032),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.627621113690637),
-                                    ("Marchyear (latent)", -6.0330862217988015),
-                                    ("Sukkotyear (latent)", -5.627621113690637),
+                                     -5.6179824848528686),
+                                    ("Marchyear (latent)", -6.023447592961032),
+                                    ("Sukkotyear (latent)", -5.6179824848528686),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.0330862217988015),
-                                    ("Clean Mondayyear (latent)", -5.627621113690637),
-                                    ("monthhour", -5.627621113690637),
-                                    ("todayat <time-of-day>", -6.0330862217988015),
-                                    ("Thursday<time> timezone", -4.328338129560376),
-                                    ("from|since|after <time>December", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Clean Mondayyear (latent)", -5.6179824848528686),
+                                    ("monthhour", -5.6179824848528686),
+                                    ("todayat <time-of-day>", -6.023447592961032),
+                                    ("Thursday<time> timezone", -4.318699500722608),
+                                    ("from|since|after <time>December", -6.023447592961032),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.0330862217988015),
-                                    ("dayday", -4.018183201256536),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.0330862217988015),
-                                    ("mm/ddat <time-of-day>", -6.0330862217988015),
-                                    ("tonightat <time-of-day>", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("dayday", -4.008544572418768),
+                                    ("<time> <part-of-day>at <time-of-day>", -6.023447592961032),
+                                    ("mm/ddat <time-of-day>", -6.023447592961032),
+                                    ("tonightat <time-of-day>", -6.023447592961032),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.339939041238856),
-                                    ("today<time-of-day> am|pm", -6.0330862217988015),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.627621113690637),
-                                    ("at <time-of-day><time> <part-of-day>", -6.0330862217988015),
-                                    ("mm/dd<time-of-day> am|pm", -6.0330862217988015),
-                                    ("hourhour", -4.780323253303433),
-                                    ("<time-of-day> am|pmon <date>", -4.018183201256536),
-                                    ("Navaratriin|during <named-month>|year", -6.0330862217988015),
-                                    ("Wednesdaythis|last|next <cycle>", -6.0330862217988015),
-                                    ("Lentyear (latent)", -6.0330862217988015),
+                                     -5.330300412401088),
+                                    ("today<time-of-day> am|pm", -6.023447592961032),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.6179824848528686),
+                                    ("at <time-of-day><time> <part-of-day>", -6.023447592961032),
+                                    ("mm/dd<time-of-day> am|pm", -6.023447592961032),
+                                    ("hourhour", -4.770684624465665),
+                                    ("<time-of-day> am|pmon <date>", -4.008544572418768),
+                                    ("Navaratriin|during <named-month>|year", -6.023447592961032),
+                                    ("Wednesdaythis|last|next <cycle>", -6.023447592961032),
+                                    ("Lentyear (latent)", -6.023447592961032),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.529008825022527),
-                                    ("Boghiyear (latent)", -6.0330862217988015),
-                                    ("dayyear", -1.9900349539642512),
-                                    ("Thursdayfrom|since|after <time>", -5.627621113690637),
+                                     -4.5193701961847585),
+                                    ("Boghiyear (latent)", -6.023447592961032),
+                                    ("dayyear", -1.9892069548086375),
+                                    ("Thursdayfrom|since|after <time>", -5.6179824848528686),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.0330862217988015),
-                                    ("Thursdayat <time-of-day>", -5.627621113690637),
-                                    ("Islamic New Yearyear (latent)", -5.627621113690637),
-                                    ("Laylat al-Qadryear (latent)", -5.116795489924646),
-                                    ("Shrove Tuesdayyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Thursdayat <time-of-day>", -5.6179824848528686),
+                                    ("Islamic New Yearyear (latent)", -5.6179824848528686),
+                                    ("Laylat al-Qadryear (latent)", -5.107156861086878),
+                                    ("Shrove Tuesdayyear (latent)", -6.023447592961032),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.339939041238856),
-                                    ("<time-of-day> am|pmtomorrow", -5.339939041238856),
-                                    ("Yom Kippuryear (latent)", -6.0330862217988015),
-                                    ("<part-of-day> of <time>year (latent)", -6.0330862217988015),
-                                    ("minutehour", -5.116795489924646),
-                                    ("Kaanum Pongalyear (latent)", -5.627621113690637),
-                                    ("Maha Saptamiyear (latent)", -6.0330862217988015),
+                                     -5.330300412401088),
+                                    ("<time-of-day> am|pmtomorrow", -5.330300412401088),
+                                    ("Yom Kippuryear (latent)", -6.023447592961032),
+                                    ("<part-of-day> of <time>year (latent)", -6.023447592961032),
+                                    ("minutehour", -5.107156861086878),
+                                    ("Kaanum Pongalyear (latent)", -5.6179824848528686),
+                                    ("Maha Saptamiyear (latent)", -6.023447592961032),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.627621113690637),
+                                     -5.6179824848528686),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.328338129560376),
-                                    ("for <duration> from <time>December", -6.0330862217988015),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.0330862217988015),
+                                     -4.318699500722608),
+                                    ("for <duration> from <time>December", -6.023447592961032),
+                                    ("tomorrow<time-of-day> sharp|exactly", -6.023447592961032),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.116795489924646),
+                                     -5.107156861086878),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.627621113690637),
-                                    ("Pentecostyear (latent)", -6.0330862217988015),
+                                     -5.6179824848528686),
+                                    ("Pentecostyear (latent)", -6.023447592961032),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.116795489924646),
-                                    ("Eid al-Fitryear (latent)", -6.0330862217988015),
+                                     -5.107156861086878),
+                                    ("Eid al-Fitryear (latent)", -6.023447592961032),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.0330862217988015),
-                                    ("Mondayin|during the <part-of-day>", -6.0330862217988015),
-                                    ("Chhathin|during <named-month>|year", -6.0330862217988015),
-                                    ("Diwaliin|during <named-month>|year", -6.0330862217988015),
-                                    ("Raksha Bandhanyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Mondayin|during the <part-of-day>", -6.023447592961032),
+                                    ("Chhathin|during <named-month>|year", -6.023447592961032),
+                                    ("Diwaliin|during <named-month>|year", -6.023447592961032),
+                                    ("Raksha Bandhanyear (latent)", -6.023447592961032),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.627621113690637),
-                                    ("Ashurayear (latent)", -6.0330862217988015),
-                                    ("Tuesdayin|during <named-month>|year", -6.0330862217988015),
-                                    ("Chinese New Yearyear (latent)", -6.0330862217988015),
-                                    ("Lag BaOmeryear (latent)", -6.0330862217988015),
+                                     -5.6179824848528686),
+                                    ("Ashurayear (latent)", -6.023447592961032),
+                                    ("Tuesdayin|during <named-month>|year", -6.023447592961032),
+                                    ("Chinese New Yearyear (latent)", -6.023447592961032),
+                                    ("Lag BaOmeryear (latent)", -6.023447592961032),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.0330862217988015),
-                                    ("Eid al-Adhayear (latent)", -5.116795489924646),
-                                    ("intersectin|during the <part-of-day>", -6.0330862217988015),
-                                    ("Palm Sundayyear (latent)", -6.0330862217988015),
-                                    ("Christmasat <time-of-day>", -6.0330862217988015),
-                                    ("Passoveryear (latent)", -6.0330862217988015),
-                                    ("Lazarus Saturdayyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Eid al-Adhayear (latent)", -5.107156861086878),
+                                    ("intersectin|during the <part-of-day>", -6.023447592961032),
+                                    ("Palm Sundayyear (latent)", -6.023447592961032),
+                                    ("Christmasat <time-of-day>", -6.023447592961032),
+                                    ("Passoveryear (latent)", -6.023447592961032),
+                                    ("Lazarus Saturdayyear (latent)", -6.023447592961032),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -5.627621113690637),
-                                    ("Yom HaShoahyear (latent)", -5.627621113690637),
+                                     -5.6179824848528686),
+                                    ("Yom HaShoahyear (latent)", -5.6179824848528686),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.627621113690637),
+                                     -5.6179824848528686),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.0330862217988015),
-                                    ("Septemberyear (latent)", -5.627621113690637),
-                                    ("mm/ddyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Septemberyear (latent)", -5.6179824848528686),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.780323253303433),
-                                    ("Halloweenyear (latent)", -6.0330862217988015),
+                                     -4.770684624465665),
+                                    ("Halloweenyear (latent)", -6.023447592961032),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.627621113690637),
+                                     -5.6179824848528686),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.339939041238856),
+                                     -5.330300412401088),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.0330862217988015),
-                                    ("at <time-of-day>intersect", -5.627621113690637),
-                                    ("Rosh Hashanahyear (latent)", -5.339939041238856),
-                                    ("Dhanterasyear (latent)", -6.0330862217988015),
-                                    ("Tu BiShvatyear (latent)", -6.0330862217988015),
-                                    ("Holiyear (latent)", -5.339939041238856),
+                                     -6.023447592961032),
+                                    ("at <time-of-day>intersect", -5.6179824848528686),
+                                    ("Rosh Hashanahyear (latent)", -5.330300412401088),
+                                    ("Dhanterasyear (latent)", -6.023447592961032),
+                                    ("Tu BiShvatyear (latent)", -6.023447592961032),
+                                    ("Holiyear (latent)", -5.330300412401088),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.0330862217988015),
-                                    ("Holika Dahanyear (latent)", -5.339939041238856),
+                                     -6.023447592961032),
+                                    ("Holika Dahanyear (latent)", -5.330300412401088),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.0330862217988015),
-                                    ("dayminute", -3.3940288921835426),
-                                    ("Mawlidyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("dayminute", -3.3843902633457743),
+                                    ("Mawlidyear (latent)", -6.023447592961032),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.627621113690637),
+                                     -5.6179824848528686),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.0330862217988015),
-                                    ("Jumu'atul-Widayear (latent)", -5.116795489924646),
-                                    ("minuteday", -2.395500062072416),
+                                     -6.023447592961032),
+                                    ("Jumu'atul-Widayear (latent)", -5.107156861086878),
+                                    ("minuteday", -2.385861433234647),
                                     ("absorption of , after named dayintersect",
-                                     -6.0330862217988015),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Orthodox Easter Sundayyear (latent)", -6.023447592961032),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.0330862217988015),
+                                     -6.023447592961032),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.0330862217988015),
-                                    ("Boss's Dayyear (latent)", -5.627621113690637),
-                                    ("Global Youth Service Dayyear (latent)", -6.0330862217988015),
-                                    ("Dhanterasin|during <named-month>|year", -6.0330862217988015),
-                                    ("Tisha B'Avyear (latent)", -6.0330862217988015),
-                                    ("Isra and Mi'rajyear (latent)", -5.116795489924646),
+                                     -6.023447592961032),
+                                    ("Boss's Dayyear (latent)", -5.6179824848528686),
+                                    ("Global Youth Service Dayyear (latent)", -6.023447592961032),
+                                    ("Dhanterasin|during <named-month>|year", -6.023447592961032),
+                                    ("Tisha B'Avyear (latent)", -6.023447592961032),
+                                    ("Isra and Mi'rajyear (latent)", -5.107156861086878),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.0330862217988015),
-                                    ("Christmasyear (latent)", -5.627621113690637),
-                                    ("Naraka Chaturdashiyear (latent)", -5.627621113690637),
-                                    ("at <time-of-day>on <date>", -4.9344739331306915),
-                                    ("Thai Pongalin|during <named-month>|year",
-                                     -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Christmasyear (latent)", -5.6179824848528686),
+                                    ("Naraka Chaturdashiyear (latent)", -5.6179824848528686),
+                                    ("at <time-of-day>on <date>", -4.924835304292923),
+                                    ("Thai Pongalin|during <named-month>|year", -6.023447592961032),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.423648309364701),
-                                    ("dayweek", -6.0330862217988015),
-                                    ("Easter Sundayyear (latent)", -5.339939041238856),
-                                    ("weekyear", -4.9344739331306915),
-                                    ("hh:mmin|during the <part-of-day>", -5.339939041238856),
+                                     -4.414009680526933),
+                                    ("dayweek", -6.023447592961032),
+                                    ("Easter Sundayyear (latent)", -5.330300412401088),
+                                    ("weekyear", -4.924835304292923),
+                                    ("hh:mmin|during the <part-of-day>", -5.330300412401088),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.627621113690637),
-                                    ("Hanukkahyear (latent)", -5.339939041238856),
-                                    ("February<time> <part-of-day>", -6.0330862217988015),
-                                    ("Great Lentyear (latent)", -6.0330862217988015),
-                                    ("tomorrowat <time-of-day>", -5.339939041238856),
-                                    ("between <time> and <time>on <date>", -4.423648309364701),
+                                     -5.6179824848528686),
+                                    ("Hanukkahyear (latent)", -5.330300412401088),
+                                    ("February<time> <part-of-day>", -6.023447592961032),
+                                    ("Great Lentyear (latent)", -6.023447592961032),
+                                    ("tomorrowat <time-of-day>", -5.330300412401088),
+                                    ("between <time> and <time>on <date>", -4.414009680526933),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.0330862217988015),
-                                    ("last <cycle> of <time>year (latent)", -5.339939041238856),
-                                    ("at <time-of-day>tomorrow", -5.627621113690637),
-                                    ("tomorrow<time-of-day> am|pm", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("last <cycle> of <time>year (latent)", -5.330300412401088),
+                                    ("at <time-of-day>tomorrow", -5.6179824848528686),
+                                    ("tomorrow<time-of-day> am|pm", -6.023447592961032),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.0330862217988015),
-                                    ("Diwaliyear (latent)", -6.0330862217988015),
-                                    ("Black Fridayyear (latent)", -5.627621113690637),
+                                     -6.023447592961032),
+                                    ("Diwaliyear (latent)", -6.023447592961032),
+                                    ("Black Fridayyear (latent)", -5.6179824848528686),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.0330862217988015),
+                                     -6.023447592961032),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.0330862217988015),
-                                    ("Chhathyear (latent)", -5.627621113690637),
-                                    ("Vasant Panchamiyear (latent)", -6.0330862217988015),
+                                     -6.023447592961032),
+                                    ("Chhathyear (latent)", -5.6179824848528686),
+                                    ("Vasant Panchamiyear (latent)", -6.023447592961032),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.0330862217988015),
-                                    ("Februaryintersect", -6.0330862217988015),
-                                    ("Simchat Torahyear (latent)", -6.0330862217988015),
-                                    ("minuteyear", -6.0330862217988015)],
-                               n = 310},
+                                     -6.023447592961032),
+                                    ("Februaryintersect", -6.023447592961032),
+                                    ("Simchat Torahyear (latent)", -6.023447592961032),
+                                    ("minuteyear", -6.023447592961032)],
+                               n = 309},
                    koData =
-                     ClassData{prior = -0.9547181090080404, unseen = -6.401917196727186,
+                     ClassData{prior = -0.9889925636508872, unseen = -6.354370040797351,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.79081953287472),
-                                    ("hourday", -4.79081953287472),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.707110264748875),
-                                    ("dayhour", -3.142160907287339),
-                                    ("Tuesdayfrom|since|after <time>", -5.707110264748875),
-                                    ("daymonth", -3.567044101252605),
-                                    ("monthday", -5.301645156640712),
-                                    ("monthyear", -4.3208159036289855),
-                                    ("<time-of-day> am|pmyear (latent)", -5.301645156640712),
-                                    ("Thai Pongalyear (latent)", -5.01396308418893),
-                                    ("intersecthh:mm", -5.707110264748875),
+                                     -4.743191483885466),
+                                    ("hourday", -4.743191483885466),
+                                    ("dayhour", -3.094532858298084),
+                                    ("Tuesdayfrom|since|after <time>", -5.659482215759621),
+                                    ("daymonth", -3.6445791952173563),
+                                    ("monthyear", -4.273187854639731),
+                                    ("<time-of-day> am|pmyear (latent)", -5.254017107651457),
+                                    ("Thai Pongalyear (latent)", -4.966335035199676),
+                                    ("intersecthh:mm", -5.659482215759621),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.707110264748875),
-                                    ("houryear", -4.79081953287472),
+                                     -5.659482215759621),
+                                    ("houryear", -4.743191483885466),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.707110264748875),
+                                     -5.659482215759621),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.01396308418893),
-                                    ("<time-of-day> am|pmintersect", -4.454347296253507),
-                                    ("until <time>on <date>", -5.01396308418893),
-                                    ("Octoberyear (latent)", -5.301645156640712),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.707110264748875),
+                                     -4.966335035199676),
+                                    ("<time-of-day> am|pmintersect", -4.406719247264253),
+                                    ("until <time>on <date>", -4.966335035199676),
+                                    ("Octoberyear (latent)", -5.254017107651457),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.454347296253507),
+                                     -4.966335035199676),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.707110264748875),
-                                    ("absorption of , after named dayJuly", -5.301645156640712),
-                                    ("from|since|after <time>July", -5.707110264748875),
+                                     -5.659482215759621),
+                                    ("absorption of , after named dayJuly", -5.254017107651457),
+                                    ("from|since|after <time>July", -5.659482215759621),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.79081953287472),
-                                    ("Clean Mondayyear (latent)", -5.707110264748875),
-                                    ("monthhour", -5.707110264748875),
-                                    ("hourmonth", -4.79081953287472),
-                                    ("todayat <time-of-day>", -5.707110264748875),
-                                    ("from|since|after <time>December", -5.707110264748875),
+                                     -4.743191483885466),
+                                    ("Clean Mondayyear (latent)", -5.659482215759621),
+                                    ("monthhour", -5.659482215759621),
+                                    ("hourmonth", -4.743191483885466),
+                                    ("todayat <time-of-day>", -5.659482215759621),
+                                    ("from|since|after <time>December", -5.659482215759621),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.707110264748875),
-                                    ("Mondayyear (latent)", -5.01396308418893),
-                                    ("dayday", -5.301645156640712),
-                                    ("mm/ddat <time-of-day>", -5.301645156640712),
-                                    ("<time-of-day> am|pmon <date>", -4.454347296253507),
-                                    ("dayyear", -2.7113779911948845),
-                                    ("Thursdaymm/dd", -5.707110264748875),
-                                    ("New Year's Dayyear (latent)", -5.301645156640712),
-                                    ("Thursdayfrom|since|after <time>", -4.00236217251045),
-                                    ("Thursdayat <time-of-day>", -4.454347296253507),
+                                     -5.659482215759621),
+                                    ("Mondayyear (latent)", -4.966335035199676),
+                                    ("dayday", -5.254017107651457),
+                                    ("mm/ddat <time-of-day>", -5.254017107651457),
+                                    ("<time-of-day> am|pmon <date>", -4.406719247264253),
+                                    ("dayyear", -2.7691104578634564),
+                                    ("Thursdaymm/dd", -5.659482215759621),
+                                    ("New Year's Dayyear (latent)", -5.254017107651457),
+                                    ("Thursdayfrom|since|after <time>", -3.954734123521196),
+                                    ("Thursdayat <time-of-day>", -4.406719247264253),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.707110264748875),
-                                    ("Aprilyear (latent)", -5.707110264748875),
-                                    ("this <time><time-of-day> am|pm", -5.707110264748875),
-                                    ("monthminute", -5.707110264748875),
-                                    ("<time-of-day> am|pmtomorrow", -5.707110264748875),
-                                    ("Thursdayhh:mm", -4.79081953287472),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.707110264748875),
-                                    ("minutemonth", -3.915350795520821),
-                                    ("Augustyear (latent)", -5.301645156640712),
+                                     -5.659482215759621),
+                                    ("Aprilyear (latent)", -5.659482215759621),
+                                    ("monthminute", -5.659482215759621),
+                                    ("<time-of-day> am|pmtomorrow", -5.659482215759621),
+                                    ("Thursdayhh:mm", -4.743191483885466),
+                                    ("minutemonth", -3.867722746531566),
+                                    ("Augustyear (latent)", -5.254017107651457),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.301645156640712),
+                                     -5.254017107651457),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.301645156640712),
-                                    ("week-endin|during <named-month>|year", -5.707110264748875),
+                                     -5.254017107651457),
+                                    ("week-endin|during <named-month>|year", -5.659482215759621),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -5.301645156640712),
+                                     -5.254017107651457),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.707110264748875),
-                                    ("Sundayyear (latent)", -4.79081953287472),
-                                    ("Christmasat <time-of-day>", -5.707110264748875),
-                                    ("from|since|after <time>year (latent)", -4.454347296253507),
+                                     -5.659482215759621),
+                                    ("Sundayyear (latent)", -4.743191483885466),
+                                    ("Christmasat <time-of-day>", -5.659482215759621),
+                                    ("from|since|after <time>year (latent)", -4.560869927091511),
                                     ("<duration> after|before|from <time>December",
-                                     -5.707110264748875),
-                                    ("yesterday<time-of-day> am|pm", -5.707110264748875),
+                                     -5.659482215759621),
+                                    ("yesterday<time-of-day> am|pm", -5.659482215759621),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.707110264748875),
-                                    ("mm/ddyear (latent)", -5.707110264748875),
+                                     -5.659482215759621),
+                                    ("mm/ddyear (latent)", -5.659482215759621),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.01396308418893),
+                                     -4.966335035199676),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.707110264748875),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.707110264748875),
-                                    ("at <time-of-day>intersect", -5.301645156640712),
-                                    ("hh:mmyear (latent)", -4.608497976080766),
-                                    ("Holiyear (latent)", -5.707110264748875),
-                                    ("until <time><time-of-day> am|pm", -5.707110264748875),
+                                     -5.659482215759621),
+                                    ("at <time-of-day>intersect", -5.254017107651457),
+                                    ("hh:mmyear (latent)", -4.560869927091511),
+                                    ("Holiyear (latent)", -5.659482215759621),
+                                    ("until <time><time-of-day> am|pm", -5.659482215759621),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.707110264748875),
-                                    ("dayminute", -3.068052935133617),
-                                    ("intersectSeptember", -4.203032867972602),
-                                    ("minuteday", -2.639057329615259),
+                                     -5.659482215759621),
+                                    ("dayminute", -3.133753571451366),
+                                    ("intersectSeptember", -4.155404818983347),
+                                    ("minuteday", -2.591429280626004),
                                     ("absorption of , after named dayintersect",
-                                     -5.707110264748875),
-                                    ("Februaryin|during the <part-of-day>", -5.707110264748875),
-                                    ("hh:mmon <date>", -3.692207244206611),
-                                    ("Saturdayyear (latent)", -5.707110264748875),
-                                    ("from|since|after <time>on <date>", -4.79081953287472),
-                                    ("absorption of , after named daySeptember", -4.79081953287472),
-                                    ("Naraka Chaturdashiyear (latent)", -5.707110264748875),
-                                    ("on <date>September", -5.301645156640712),
-                                    ("at <time-of-day>on <date>", -5.301645156640712),
-                                    ("dayweek", -5.707110264748875),
-                                    ("Easter Sundayyear (latent)", -5.301645156640712),
-                                    ("Thursday<time-of-day> am|pm", -4.79081953287472),
-                                    ("weekyear", -5.301645156640712),
+                                     -5.659482215759621),
+                                    ("Februaryin|during the <part-of-day>", -5.659482215759621),
+                                    ("hh:mmon <date>", -3.6445791952173563),
+                                    ("Saturdayyear (latent)", -5.659482215759621),
+                                    ("from|since|after <time>on <date>", -4.743191483885466),
+                                    ("absorption of , after named daySeptember",
+                                     -4.743191483885466),
+                                    ("Naraka Chaturdashiyear (latent)", -5.659482215759621),
+                                    ("on <date>September", -5.254017107651457),
+                                    ("at <time-of-day>on <date>", -5.254017107651457),
+                                    ("dayweek", -5.659482215759621),
+                                    ("Easter Sundayyear (latent)", -5.254017107651457),
+                                    ("Thursday<time-of-day> am|pm", -4.966335035199676),
+                                    ("weekyear", -5.254017107651457),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.707110264748875),
+                                     -5.659482215759621),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -5.01396308418893),
-                                    ("Sundayfrom|since|after <time>", -5.707110264748875),
-                                    ("absorption of , after named dayFebruary", -4.79081953287472),
+                                     -4.966335035199676),
+                                    ("Sundayfrom|since|after <time>", -5.659482215759621),
+                                    ("absorption of , after named dayFebruary", -4.743191483885466),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.707110264748875),
-                                    ("tomorrowat <time-of-day>", -5.707110264748875),
+                                     -5.659482215759621),
+                                    ("tomorrowat <time-of-day>", -5.659482215759621),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.707110264748875),
-                                    ("last <cycle> of <time>year (latent)", -5.301645156640712),
-                                    ("tomorrow<time-of-day> am|pm", -5.707110264748875),
+                                     -5.659482215759621),
+                                    ("last <cycle> of <time>year (latent)", -5.254017107651457),
+                                    ("tomorrow<time-of-day> am|pm", -5.659482215759621),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -5.01396308418893),
-                                    ("Diwaliyear (latent)", -5.301645156640712),
+                                     -4.966335035199676),
+                                    ("Diwaliyear (latent)", -5.254017107651457),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.707110264748875),
-                                    ("Fridayyear (latent)", -5.301645156640712),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.707110264748875),
-                                    ("minuteyear", -4.454347296253507)],
-                               n = 194}}),
+                                     -5.659482215759621),
+                                    ("Fridayyear (latent)", -5.254017107651457),
+                                    ("minuteyear", -4.406719247264253)],
+                               n = 183}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1372,21 +1358,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15718558352241238,
-                               unseen = -4.983606621708336,
+                     ClassData{prior = -0.152107778197458, unseen = -4.976733742420574,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.225980928988261e-2),
-                                    ("intersect 2 numbers", -3.590439381300684)],
-                               n = 141},
+                                   [("integer (numeric)", -4.255961441879589e-2),
+                                    ("intersect 2 numbers", -3.58351893845611)],
+                               n = 140},
                    koData =
-                     ClassData{prior = -1.927891643552635, unseen = -3.367295829986474,
+                     ClassData{prior = -1.9582559848776127, unseen = -3.332204510175204,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.1349799328389845),
-                                    ("negative numbers", -0.6931471805599453),
-                                    ("compose by multiplication", -1.9459101490553135)],
-                               n = 24}}),
+                                   [("integer (numeric)", -1.2163953243244932),
+                                    ("negative numbers", -0.6567795363890705),
+                                    ("compose by multiplication", -1.9095425048844386)],
+                               n = 23}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -1457,26 +1442,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1586,13 +1564,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1909,19 +1887,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.587786664902119, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8109302162163288, unseen = -4.143134726391533,
+                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -4.959694113937206e-2),
-                                    ("integer (0..19)", -3.028522096376982)],
-                               n = 60}}),
+                                   [("integer (numeric)", -5.129329438755058e-2),
+                                    ("integer (0..19)", -2.995732273553991)],
+                               n = 58}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1944,37 +1922,38 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1273394223766015, unseen = -5.225746673713201,
+                     ClassData{prior = -0.11641035184441134,
+                               unseen = -5.214935757608986,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.581298495463066),
-                                    ("integer (0..19)year (grain)", -3.1409142833984887),
-                                    ("integer (numeric)day (grain)", -2.655406467616788),
-                                    ("integer (0..19)second (grain) ", -3.834061463958434),
-                                    ("integer (0..19)hour (grain)", -3.1409142833984887),
-                                    ("second", -3.42859635585027),
-                                    ("integer (numeric)second (grain) ", -4.121743536410215),
-                                    ("integer (numeric)year (grain)", -3.1409142833984887),
-                                    ("day", -2.3871424810221087), ("year", -2.512305623976115),
-                                    ("integer (numeric)week (grain)", -3.1409142833984887),
-                                    ("integer (0..19)month (grain)", -3.6109179126442243),
-                                    ("hour", -2.7354491752903245), ("month", -2.917770732084279),
-                                    ("integer (numeric)minute (grain)", -3.2744456760230114),
-                                    ("integer (0..19)minute (grain)", -3.1409142833984887),
-                                    ("integer (numeric)month (grain)", -3.42859635585027),
-                                    ("minute", -2.581298495463066),
-                                    ("integer (numeric)hour (grain)", -3.6109179126442243),
-                                    ("integer (0..19)day (grain)", -3.6109179126442243),
-                                    ("integer (0..19)week (grain)", -3.2744456760230114)],
+                                   [("week", -2.5704288232261625),
+                                    ("integer (0..19)year (grain)", -3.130044611161585),
+                                    ("integer (numeric)day (grain)", -2.644536795379884),
+                                    ("integer (0..19)second (grain) ", -3.82319179172153),
+                                    ("integer (0..19)hour (grain)", -3.130044611161585),
+                                    ("second", -3.417726683613366),
+                                    ("integer (numeric)second (grain) ", -4.110873864173311),
+                                    ("integer (numeric)year (grain)", -3.130044611161585),
+                                    ("day", -2.3762728087852047), ("year", -2.501435951739211),
+                                    ("integer (numeric)week (grain)", -3.130044611161585),
+                                    ("integer (0..19)month (grain)", -3.6000482404073204),
+                                    ("hour", -2.7245795030534206), ("month", -2.9069010598473755),
+                                    ("integer (numeric)minute (grain)", -3.2635760037861075),
+                                    ("integer (0..19)minute (grain)", -3.130044611161585),
+                                    ("integer (numeric)month (grain)", -3.417726683613366),
+                                    ("minute", -2.5704288232261625),
+                                    ("integer (numeric)hour (grain)", -3.6000482404073204),
+                                    ("integer (0..19)day (grain)", -3.6000482404073204),
+                                    ("integer (0..19)week (grain)", -3.2635760037861075)],
                                n = 81},
                    koData =
-                     ClassData{prior = -2.12389330425067, unseen = -3.828641396489095,
+                     ClassData{prior = -2.2082744135228043,
+                               unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1984,7 +1963,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23841102344499823, unseen = -5.41610040220442,
+                     ClassData{prior = -0.19979618731721863, unseen = -5.41610040220442,
                                likelihoods =
                                  HashMap.fromList
                                    [("from|since|after <time>", -3.8022081394209395),
@@ -2004,16 +1983,14 @@ classifiers
                                     ("minute", -1.7227665977411035)],
                                n = 104},
                    koData =
-                     ClassData{prior = -1.550597412411167, unseen = -4.290459441148391,
+                     ClassData{prior = -1.7086928705294415, unseen = -4.143134726391533,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1780538303479458),
-                                    ("from|since|after <time>", -3.1780538303479458),
-                                    ("<hour-of-day> <integer>", -2.667228206581955),
-                                    ("time-of-day (latent)", -1.2809338454620642),
-                                    ("about|exactly <time-of-day>", -3.58351893845611),
-                                    ("hour", -1.2321436812926323), ("minute", -2.0794415416798357)],
-                               n = 28}}),
+                                   [("<integer> to|till|before <hour-of-day>", -3.028522096376982),
+                                    ("from|since|after <time>", -3.028522096376982),
+                                    ("time-of-day (latent)", -1.1314021114911006),
+                                    ("hour", -1.0826119473216687), ("minute", -2.740840023925201)],
+                               n = 23}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2257,34 +2234,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("mm/dd", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("mm/dd", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2955,11 +2928,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/EN_ZA.hs b/Duckling/Ranking/Classifiers/EN_ZA.hs
index d1eb7dab..46b42678 100644
--- a/Duckling/Ranking/Classifiers/EN_ZA.hs
+++ b/Duckling/Ranking/Classifiers/EN_ZA.hs
@@ -214,7 +214,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("from|since|after <time>",
         Classifier{okData =
-                     ClassData{prior = -1.540445040947149, unseen = -4.248495242049359,
+                     ClassData{prior = -1.5284688499004333, unseen = -4.248495242049359,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal or number) <named-month>",
@@ -232,40 +232,41 @@ classifiers
                                     ("August", -3.5409593240373143)],
                                n = 18},
                    koData =
-                     ClassData{prior = -0.2411620568168881, unseen = -5.111987788356543,
+                     ClassData{prior = -0.24445333790096085,
+                               unseen = -5.099866427824199,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -4.007333185232471),
-                                    ("week", -4.412798293340635),
+                                   [("<integer> to|till|before <hour-of-day>", -3.9951379121386528),
+                                    ("week", -4.400603020246817),
                                     ("<day-of-month> (ordinal or number) <named-month>",
-                                     -4.412798293340635),
-                                    ("today", -4.412798293340635),
-                                    ("intersect", -2.540996116439044),
-                                    ("<time> for <duration>", -4.412798293340635),
-                                    ("second", -4.412798293340635), ("now", -3.71965111278069),
-                                    ("tomorrow", -4.007333185232471),
-                                    ("this|last|next <cycle>", -4.412798293340635),
-                                    ("day", -1.927891643552635),
-                                    ("time-of-day (latent)", -2.6210388241125804),
-                                    ("<time-of-day> am|pm", -4.007333185232471),
-                                    ("nograin", -3.71965111278069),
+                                     -4.400603020246817),
+                                    ("today", -4.400603020246817),
+                                    ("intersect", -2.608843551018762),
+                                    ("<time> for <duration>", -4.400603020246817),
+                                    ("second", -4.400603020246817), ("now", -3.7074558396868715),
+                                    ("tomorrow", -3.9951379121386528),
+                                    ("this|last|next <cycle>", -4.400603020246817),
+                                    ("day", -1.9582559848776127),
+                                    ("time-of-day (latent)", -2.608843551018762),
+                                    ("<time-of-day> am|pm", -3.9951379121386528),
+                                    ("nograin", -3.7074558396868715),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)", -4.007333185232471),
-                                    ("Easter Sunday", -4.412798293340635),
-                                    ("Christmas", -3.71965111278069), ("hour", -2.3978952727983707),
-                                    ("month", -4.412798293340635),
-                                    ("<datetime> - <datetime> (interval)", -3.1600353248452673),
+                                     -4.400603020246817),
+                                    ("<day-of-month> (ordinal)", -3.9951379121386528),
+                                    ("Easter Sunday", -4.400603020246817),
+                                    ("Christmas", -3.7074558396868715),
+                                    ("hour", -2.3856999997045523), ("month", -4.400603020246817),
+                                    ("<datetime> - <datetime> (interval)", -3.147840051751449),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.908720896564361),
+                                     -2.8965256234705428),
                                     ("<named-month> <day-of-month> (non ordinal)",
-                                     -4.007333185232471),
-                                    ("minute", -1.927891643552635),
-                                    ("right now", -4.412798293340635),
-                                    ("<month> dd-dd (interval)", -3.71965111278069),
-                                    ("part of days", -4.412798293340635),
-                                    ("dd-dd <month> (interval)", -4.007333185232471)],
-                               n = 66}}),
+                                     -3.9951379121386528),
+                                    ("minute", -1.9156963704588166),
+                                    ("right now", -4.400603020246817),
+                                    ("<month> dd-dd (interval)", -3.7074558396868715),
+                                    ("part of days", -4.400603020246817),
+                                    ("dd-dd <month> (interval)", -3.9951379121386528)],
+                               n = 65}}),
        ("integer after|past <hour-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -312,29 +313,27 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0296194171811581,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -0.8754687373538999, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)December", -1.6582280766035324),
-                                    ("ordinal (digits)February", -2.3513752571634776),
-                                    ("integer (numeric)April", -2.3513752571634776),
-                                    ("month", -1.252762968495368)],
+                                   [("ordinal (digits)December", -1.6094379124341003),
+                                    ("ordinal (digits)February", -2.3025850929940455),
+                                    ("integer (numeric)April", -2.3025850929940455),
+                                    ("month", -1.2039728043259361)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.4011973816621555,
+                     ClassData{prior = -0.5389965007326869,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)October", -2.6741486494265287),
-                                    ("ordinal (digits)July", -2.6741486494265287),
-                                    ("integer (numeric)September", -2.268683541318364),
-                                    ("ordinal (digits)August", -2.6741486494265287),
-                                    ("integer (numeric)August", -2.6741486494265287),
-                                    ("ordinal (digits)April", -2.6741486494265287),
-                                    ("month", -1.0647107369924282),
-                                    ("integer (numeric)July", -2.268683541318364)],
-                               n = 9}}),
+                                   [("ordinal (digits)October", -2.4849066497880004),
+                                    ("ordinal (digits)July", -2.4849066497880004),
+                                    ("integer (numeric)September", -2.0794415416798357),
+                                    ("ordinal (digits)August", -2.4849066497880004),
+                                    ("ordinal (digits)April", -2.4849066497880004),
+                                    ("month", -1.0986122886681098),
+                                    ("integer (numeric)July", -2.4849066497880004)],
+                               n = 7}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = -9.237332013101517e-2,
@@ -637,7 +636,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in|within|after <duration>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
+                     ClassData{prior = -8.515780834030683e-2,
                                unseen = -4.6913478822291435,
                                likelihoods =
                                  HashMap.fromList
@@ -659,13 +658,13 @@ classifiers
                                     ("minute", -1.2809338454620642)],
                                n = 45},
                    koData =
-                     ClassData{prior = -2.3025850929940455, unseen = -3.367295829986474,
+                     ClassData{prior = -2.505525936990736, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -2.2335922215070942), ("year", -1.9459101490553135),
-                                    ("<integer> <unit-of-duration>", -1.9459101490553135),
-                                    ("a <unit-of-duration>", -2.2335922215070942)],
-                               n = 5}}),
+                                   [("quarter", -2.5649493574615367), ("year", -1.8718021769015913),
+                                    ("<integer> <unit-of-duration>", -2.159484249353372),
+                                    ("a <unit-of-duration>", -2.159484249353372)],
+                               n = 4}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -792,8 +791,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("one twenty two",
         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}}),
@@ -806,344 +805,332 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4852522247259964, unseen = -6.699500340161678,
+                     ClassData{prior = -0.4625004677425803, unseen = -6.692083742506628,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Navaratriyear (latent)", -6.005120873555468),
-                                    ("Ramadanyear (latent)", -6.005120873555468),
+                                   [("Navaratriyear (latent)", -5.997695096858618),
+                                    ("Ramadanyear (latent)", -5.997695096858618),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("Bhai Doojyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Bhai Doojyear (latent)", -5.997695096858618),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.7523579050601),
-                                    ("hourday", -4.3003727813170425),
-                                    ("dayhour", -3.2017604926489325),
-                                    ("Martin Luther King's Dayyear (latent)", -5.599655765447303),
-                                    ("Shemini Atzeretyear (latent)", -6.005120873555468),
-                                    ("daymonth", -5.088830141681313),
-                                    ("monthday", -5.599655765447303),
-                                    ("monthyear", -4.213361404327412),
-                                    ("Yom Ha'atzmautyear (latent)", -6.005120873555468),
-                                    ("Vijayadashamiyear (latent)", -6.005120873555468),
-                                    ("Thai Pongalyear (latent)", -5.311973692995522),
-                                    ("Thiru Onamyear (latent)", -5.311973692995522),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("hourday", -4.292947004620193),
+                                    ("dayhour", -3.194334715952083),
+                                    ("Martin Luther King's Dayyear (latent)", -5.592229988750454),
+                                    ("Shemini Atzeretyear (latent)", -5.997695096858618),
+                                    ("daymonth", -5.081404364984463),
+                                    ("monthday", -5.592229988750454),
+                                    ("monthyear", -4.205935627630563),
+                                    ("Yom Ha'atzmautyear (latent)", -5.997695096858618),
+                                    ("Vijayadashamiyear (latent)", -5.997695096858618),
+                                    ("Thai Pongalyear (latent)", -5.304547916298673),
+                                    ("Thiru Onamyear (latent)", -5.304547916298673),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -6.005120873555468),
-                                    ("houryear", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("houryear", -5.304547916298673),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("Christmas<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmas<time-of-day> am|pm", -5.997695096858618),
                                     ("last <day-of-week> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmintersect", -4.7523579050601),
-                                    ("Earth Houryear (latent)", -6.005120873555468),
-                                    ("Octoberyear (latent)", -4.501043476779194),
-                                    ("intersect<time-of-day> am|pm", -6.005120873555468),
-                                    ("Mattu Pongalyear (latent)", -6.005120873555468),
-                                    ("Shavuotyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmintersect", -4.74493212836325),
+                                    ("Earth Houryear (latent)", -5.997695096858618),
+                                    ("Octoberyear (latent)", -4.493617700082344),
+                                    ("intersect<time-of-day> am|pm", -5.997695096858618),
+                                    ("Mattu Pongalyear (latent)", -5.997695096858618),
+                                    ("Shavuotyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|within|after <duration>",
-                                     -6.005120873555468),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -5.599655765447303),
-                                    ("Marchyear (latent)", -6.005120873555468),
-                                    ("Sukkotyear (latent)", -5.599655765447303),
+                                     -5.592229988750454),
+                                    ("Marchyear (latent)", -5.997695096858618),
+                                    ("Sukkotyear (latent)", -5.592229988750454),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -6.005120873555468),
-                                    ("Clean Mondayyear (latent)", -5.599655765447303),
-                                    ("monthhour", -5.599655765447303),
-                                    ("todayat <time-of-day>", -6.005120873555468),
-                                    ("Thursday<time> timezone", -4.3003727813170425),
-                                    ("from|since|after <time>December", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Clean Mondayyear (latent)", -5.592229988750454),
+                                    ("monthhour", -5.592229988750454),
+                                    ("todayat <time-of-day>", -5.997695096858618),
+                                    ("Thursday<time> timezone", -4.292947004620193),
+                                    ("from|since|after <time>December", -5.997695096858618),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("dayday", -3.9902178530132026),
-                                    ("<time> <part-of-day>at <time-of-day>", -6.005120873555468),
-                                    ("tonightat <time-of-day>", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayday", -3.982792076316353),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.997695096858618),
+                                    ("tonightat <time-of-day>", -5.997695096858618),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.311973692995522),
-                                    ("today<time-of-day> am|pm", -6.005120873555468),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.599655765447303),
-                                    ("at <time-of-day><time> <part-of-day>", -6.005120873555468),
-                                    ("hourhour", -4.7523579050601),
-                                    ("<time-of-day> am|pmon <date>", -3.9902178530132026),
-                                    ("Navaratriin|during <named-month>|year", -6.005120873555468),
-                                    ("Wednesdaythis|last|next <cycle>", -6.005120873555468),
-                                    ("Lentyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("today<time-of-day> am|pm", -5.997695096858618),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.592229988750454),
+                                    ("at <time-of-day><time> <part-of-day>", -5.997695096858618),
+                                    ("hourhour", -4.74493212836325),
+                                    ("<time-of-day> am|pmon <date>", -3.982792076316353),
+                                    ("Navaratriin|during <named-month>|year", -5.997695096858618),
+                                    ("Wednesdaythis|last|next <cycle>", -5.997695096858618),
+                                    ("Lentyear (latent)", -5.997695096858618),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.501043476779194),
-                                    ("Boghiyear (latent)", -6.005120873555468),
-                                    ("dayyear", -2.025439219653507),
-                                    ("Thursdayfrom|since|after <time>", -5.599655765447303),
+                                     -4.493617700082344),
+                                    ("Boghiyear (latent)", -5.997695096858618),
+                                    ("dayyear", -2.0180134429566574),
+                                    ("Thursdayfrom|since|after <time>", -5.592229988750454),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Thursdayat <time-of-day>", -5.599655765447303),
-                                    ("Islamic New Yearyear (latent)", -5.599655765447303),
-                                    ("Laylat al-Qadryear (latent)", -5.088830141681313),
-                                    ("Shrove Tuesdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Thursdayat <time-of-day>", -5.592229988750454),
+                                    ("Islamic New Yearyear (latent)", -5.592229988750454),
+                                    ("Laylat al-Qadryear (latent)", -5.081404364984463),
+                                    ("Shrove Tuesdayyear (latent)", -5.997695096858618),
                                     ("intersect by \",\", \"of\", \"from\" for year<time-of-day> am|pm",
-                                     -5.311973692995522),
-                                    ("<time-of-day> am|pmtomorrow", -5.311973692995522),
-                                    ("Yom Kippuryear (latent)", -6.005120873555468),
-                                    ("<part-of-day> of <time>year (latent)", -6.005120873555468),
-                                    ("minutehour", -5.088830141681313),
-                                    ("Kaanum Pongalyear (latent)", -5.599655765447303),
-                                    ("Maha Saptamiyear (latent)", -6.005120873555468),
+                                     -5.304547916298673),
+                                    ("<time-of-day> am|pmtomorrow", -5.304547916298673),
+                                    ("Yom Kippuryear (latent)", -5.997695096858618),
+                                    ("<part-of-day> of <time>year (latent)", -5.997695096858618),
+                                    ("minutehour", -5.081404364984463),
+                                    ("Kaanum Pongalyear (latent)", -5.592229988750454),
+                                    ("Maha Saptamiyear (latent)", -5.997695096858618),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.3003727813170425),
-                                    ("for <duration> from <time>December", -6.005120873555468),
-                                    ("tomorrow<time-of-day> sharp|exactly", -6.005120873555468),
+                                     -4.292947004620193),
+                                    ("for <duration> from <time>December", -5.997695096858618),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.997695096858618),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.088830141681313),
+                                     -5.081404364984463),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.599655765447303),
-                                    ("Pentecostyear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Pentecostyear (latent)", -5.997695096858618),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.088830141681313),
-                                    ("Eid al-Fitryear (latent)", -6.005120873555468),
+                                     -5.081404364984463),
+                                    ("Eid al-Fitryear (latent)", -5.997695096858618),
                                     ("Vasant Panchamiin|during <named-month>|year",
-                                     -6.005120873555468),
-                                    ("Mondayin|during the <part-of-day>", -6.005120873555468),
-                                    ("Chhathin|during <named-month>|year", -6.005120873555468),
-                                    ("Diwaliin|during <named-month>|year", -6.005120873555468),
-                                    ("Raksha Bandhanyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Mondayin|during the <part-of-day>", -5.997695096858618),
+                                    ("Chhathin|during <named-month>|year", -5.997695096858618),
+                                    ("Diwaliin|during <named-month>|year", -5.997695096858618),
+                                    ("Raksha Bandhanyear (latent)", -5.997695096858618),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.599655765447303),
-                                    ("Ashurayear (latent)", -6.005120873555468),
-                                    ("Tuesdayin|during <named-month>|year", -6.005120873555468),
-                                    ("Chinese New Yearyear (latent)", -6.005120873555468),
-                                    ("Lag BaOmeryear (latent)", -6.005120873555468),
+                                     -5.592229988750454),
+                                    ("Ashurayear (latent)", -5.997695096858618),
+                                    ("Tuesdayin|during <named-month>|year", -5.997695096858618),
+                                    ("Chinese New Yearyear (latent)", -5.997695096858618),
+                                    ("Lag BaOmeryear (latent)", -5.997695096858618),
                                     ("last weekend of <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Eid al-Adhayear (latent)", -5.088830141681313),
-                                    ("intersectin|during the <part-of-day>", -6.005120873555468),
-                                    ("Palm Sundayyear (latent)", -6.005120873555468),
-                                    ("Christmasat <time-of-day>", -6.005120873555468),
-                                    ("Passoveryear (latent)", -6.005120873555468),
-                                    ("Lazarus Saturdayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Eid al-Adhayear (latent)", -5.081404364984463),
+                                    ("intersectin|during the <part-of-day>", -5.997695096858618),
+                                    ("Palm Sundayyear (latent)", -5.997695096858618),
+                                    ("Christmasat <time-of-day>", -5.997695096858618),
+                                    ("Passoveryear (latent)", -5.997695096858618),
+                                    ("Lazarus Saturdayyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) <named-month>year (latent)",
-                                     -6.005120873555468),
-                                    ("Yom HaShoahyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Yom HaShoahyear (latent)", -5.592229988750454),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Septemberyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Septemberyear (latent)", -5.592229988750454),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.7523579050601),
-                                    ("Halloweenyear (latent)", -6.005120873555468),
+                                     -4.74493212836325),
+                                    ("Halloweenyear (latent)", -5.997695096858618),
                                     ("<ordinal> last <cycle> of <time>year (latent)",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.311973692995522),
+                                     -5.304547916298673),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -6.005120873555468),
-                                    ("at <time-of-day>intersect", -5.599655765447303),
-                                    ("Rosh Hashanahyear (latent)", -5.311973692995522),
-                                    ("Dhanterasyear (latent)", -6.005120873555468),
-                                    ("Tu BiShvatyear (latent)", -6.005120873555468),
-                                    ("Holiyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("at <time-of-day>intersect", -5.592229988750454),
+                                    ("Rosh Hashanahyear (latent)", -5.304547916298673),
+                                    ("Dhanterasyear (latent)", -5.997695096858618),
+                                    ("Tu BiShvatyear (latent)", -5.997695096858618),
+                                    ("Holiyear (latent)", -5.304547916298673),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Holika Dahanyear (latent)", -5.311973692995522),
+                                     -5.997695096858618),
+                                    ("Holika Dahanyear (latent)", -5.304547916298673),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -6.005120873555468),
-                                    ("dayminute", -3.440171516093931),
-                                    ("Mawlidyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("dayminute", -3.4327457393970815),
+                                    ("Mawlidyear (latent)", -5.997695096858618),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.599655765447303),
+                                     -5.592229988750454),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -6.005120873555468),
-                                    ("Jumu'atul-Widayear (latent)", -5.088830141681313),
-                                    ("minuteday", -2.3675347138290816),
+                                     -5.997695096858618),
+                                    ("Jumu'atul-Widayear (latent)", -5.081404364984463),
+                                    ("minuteday", -2.360108937132232),
                                     ("absorption of , after named dayintersect",
-                                     -6.005120873555468),
-                                    ("Orthodox Easter Sundayyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Orthodox Easter Sundayyear (latent)", -5.997695096858618),
                                     ("<ordinal> <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Boss's Dayyear (latent)", -5.599655765447303),
-                                    ("Global Youth Service Dayyear (latent)", -6.005120873555468),
-                                    ("Dhanterasin|during <named-month>|year", -6.005120873555468),
-                                    ("Tisha B'Avyear (latent)", -6.005120873555468),
-                                    ("Isra and Mi'rajyear (latent)", -5.088830141681313),
+                                     -5.997695096858618),
+                                    ("Boss's Dayyear (latent)", -5.592229988750454),
+                                    ("Global Youth Service Dayyear (latent)", -5.997695096858618),
+                                    ("Dhanterasin|during <named-month>|year", -5.997695096858618),
+                                    ("Tisha B'Avyear (latent)", -5.997695096858618),
+                                    ("Isra and Mi'rajyear (latent)", -5.081404364984463),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -6.005120873555468),
-                                    ("Christmasyear (latent)", -5.599655765447303),
-                                    ("Naraka Chaturdashiyear (latent)", -5.599655765447303),
-                                    ("at <time-of-day>on <date>", -4.906508584887358),
-                                    ("Thai Pongalin|during <named-month>|year", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Christmasyear (latent)", -5.592229988750454),
+                                    ("Naraka Chaturdashiyear (latent)", -5.592229988750454),
+                                    ("at <time-of-day>on <date>", -4.899082808190508),
+                                    ("Thai Pongalin|during <named-month>|year", -5.997695096858618),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.395682961121367),
-                                    ("dayweek", -6.005120873555468),
-                                    ("Easter Sundayyear (latent)", -5.311973692995522),
-                                    ("weekyear", -4.906508584887358),
-                                    ("hh:mmin|during the <part-of-day>", -5.311973692995522),
+                                     -4.388257184424518),
+                                    ("dayweek", -5.997695096858618),
+                                    ("Easter Sundayyear (latent)", -5.304547916298673),
+                                    ("weekyear", -4.899082808190508),
+                                    ("hh:mmin|during the <part-of-day>", -5.304547916298673),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.599655765447303),
-                                    ("Hanukkahyear (latent)", -5.311973692995522),
-                                    ("February<time> <part-of-day>", -6.005120873555468),
-                                    ("Great Lentyear (latent)", -6.005120873555468),
-                                    ("tomorrowat <time-of-day>", -5.311973692995522),
-                                    ("between <time> and <time>on <date>", -4.395682961121367),
+                                     -5.592229988750454),
+                                    ("Hanukkahyear (latent)", -5.304547916298673),
+                                    ("February<time> <part-of-day>", -5.997695096858618),
+                                    ("Great Lentyear (latent)", -5.997695096858618),
+                                    ("tomorrowat <time-of-day>", -5.304547916298673),
+                                    ("between <time> and <time>on <date>", -4.388257184424518),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\" for year",
-                                     -6.005120873555468),
-                                    ("last <cycle> of <time>year (latent)", -5.311973692995522),
-                                    ("at <time-of-day>tomorrow", -5.599655765447303),
-                                    ("tomorrow<time-of-day> am|pm", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("last <cycle> of <time>year (latent)", -5.304547916298673),
+                                    ("at <time-of-day>tomorrow", -5.592229988750454),
+                                    ("tomorrow<time-of-day> am|pm", -5.997695096858618),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -6.005120873555468),
-                                    ("Diwaliyear (latent)", -6.005120873555468),
-                                    ("Black Fridayyear (latent)", -5.599655765447303),
+                                     -5.997695096858618),
+                                    ("Diwaliyear (latent)", -5.997695096858618),
+                                    ("Black Fridayyear (latent)", -5.592229988750454),
                                     ("the <ordinal> last <cycle> of <time>year (latent)",
-                                     -6.005120873555468),
+                                     -5.997695096858618),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -6.005120873555468),
-                                    ("Chhathyear (latent)", -5.599655765447303),
-                                    ("Vasant Panchamiyear (latent)", -6.005120873555468),
+                                     -5.997695096858618),
+                                    ("Chhathyear (latent)", -5.592229988750454),
+                                    ("Vasant Panchamiyear (latent)", -5.997695096858618),
                                     ("<day-of-month> (ordinal or number) of <month>in|during the <part-of-day>",
-                                     -6.005120873555468),
-                                    ("Februaryintersect", -6.005120873555468),
-                                    ("Simchat Torahyear (latent)", -6.005120873555468),
-                                    ("minuteyear", -6.005120873555468)],
+                                     -5.997695096858618),
+                                    ("Februaryintersect", -5.997695096858618),
+                                    ("Simchat Torahyear (latent)", -5.997695096858618),
+                                    ("minuteyear", -5.997695096858618)],
                                n = 301},
                    koData =
-                     ClassData{prior = -0.9559205266449229, unseen = -6.373319789577012,
+                     ClassData{prior = -0.9934609999176268, unseen = -6.324358962381311,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.762173934797756),
-                                    ("hourday", -4.762173934797756),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.678464666671911),
-                                    ("dayhour", -3.2361176313027067),
-                                    ("Tuesdayfrom|since|after <time>", -5.678464666671911),
-                                    ("daymonth", -3.53839850317564),
-                                    ("monthday", -5.272999558563747),
-                                    ("monthyear", -4.425701698176543),
-                                    ("<time-of-day> am|pmyear (latent)", -5.272999558563747),
-                                    ("Thai Pongalyear (latent)", -4.985317486111966),
-                                    ("intersecthh:mm", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("hourday", -4.713127327493184),
+                                    ("dayhour", -3.187071023998134),
+                                    ("Tuesdayfrom|since|after <time>", -5.629418059367339),
+                                    ("daymonth", -3.614515038825074),
+                                    ("monthyear", -4.376655090871971),
+                                    ("<time-of-day> am|pmyear (latent)", -5.223952951259174),
+                                    ("Thai Pongalyear (latent)", -4.9362708788073935),
+                                    ("intersecthh:mm", -5.629418059367339),
                                     ("from <datetime> - <datetime> (interval)July",
-                                     -5.678464666671911),
-                                    ("houryear", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("houryear", -4.713127327493184),
                                     ("from <time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.985317486111966),
-                                    ("<time-of-day> am|pmintersect", -4.425701698176543),
-                                    ("until <time>on <date>", -4.985317486111966),
-                                    ("Octoberyear (latent)", -5.678464666671911),
-                                    ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
+                                     -4.9362708788073935),
+                                    ("<time-of-day> am|pmintersect", -4.376655090871971),
+                                    ("until <time>on <date>", -4.9362708788073935),
+                                    ("Octoberyear (latent)", -5.629418059367339),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year (latent)",
-                                     -4.425701698176543),
+                                     -4.9362708788073935),
                                     ("about|exactly <time-of-day>year (latent)",
-                                     -5.678464666671911),
-                                    ("absorption of , after named dayJuly", -5.272999558563747),
-                                    ("from|since|after <time>July", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("absorption of , after named dayJuly", -5.223952951259174),
+                                    ("from|since|after <time>July", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year (latent)",
-                                     -4.762173934797756),
-                                    ("Clean Mondayyear (latent)", -5.678464666671911),
-                                    ("monthhour", -5.678464666671911),
-                                    ("hourmonth", -4.762173934797756),
-                                    ("todayat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>December", -5.678464666671911),
+                                     -4.713127327493184),
+                                    ("Clean Mondayyear (latent)", -5.629418059367339),
+                                    ("monthhour", -5.629418059367339),
+                                    ("hourmonth", -4.713127327493184),
+                                    ("todayat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>December", -5.629418059367339),
                                     ("from|since|after <time><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("Mondayyear (latent)", -4.985317486111966),
-                                    ("dayday", -5.272999558563747),
-                                    ("<time-of-day> am|pmon <date>", -4.425701698176543),
-                                    ("dayyear", -2.70805020110221),
-                                    ("Thursdaymm/dd", -5.678464666671911),
-                                    ("New Year's Dayyear (latent)", -5.272999558563747),
-                                    ("Thursdayfrom|since|after <time>", -3.973716574433486),
-                                    ("Thursdayat <time-of-day>", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Mondayyear (latent)", -4.9362708788073935),
+                                    ("dayday", -5.223952951259174),
+                                    ("<time-of-day> am|pmon <date>", -4.376655090871971),
+                                    ("dayyear", -2.7672171784378703),
+                                    ("Thursdaymm/dd", -5.629418059367339),
+                                    ("New Year's Dayyear (latent)", -5.223952951259174),
+                                    ("Thursdayfrom|since|after <time>", -3.9246699671289136),
+                                    ("Thursdayat <time-of-day>", -4.376655090871971),
                                     ("<integer> to|till|before <hour-of-day>September",
-                                     -5.678464666671911),
-                                    ("Aprilyear (latent)", -5.678464666671911),
-                                    ("this <time><time-of-day> am|pm", -5.678464666671911),
-                                    ("monthminute", -5.678464666671911),
-                                    ("<time-of-day> am|pmtomorrow", -5.678464666671911),
-                                    ("Thursdayhh:mm", -4.762173934797756),
-                                    ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.678464666671911),
-                                    ("minutemonth", -3.886705197443856),
-                                    ("Augustyear (latent)", -5.272999558563747),
+                                     -5.629418059367339),
+                                    ("Aprilyear (latent)", -5.629418059367339),
+                                    ("monthminute", -5.629418059367339),
+                                    ("<time-of-day> am|pmtomorrow", -5.629418059367339),
+                                    ("Thursdayhh:mm", -4.713127327493184),
+                                    ("minutemonth", -3.8376585901392835),
+                                    ("Augustyear (latent)", -5.223952951259174),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.272999558563747),
+                                     -5.223952951259174),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("week-endin|during <named-month>|year", -5.678464666671911),
+                                     -5.223952951259174),
+                                    ("week-endin|during <named-month>|year", -5.629418059367339),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.678464666671911),
-                                    ("Sundayyear (latent)", -4.762173934797756),
-                                    ("Christmasat <time-of-day>", -5.678464666671911),
-                                    ("from|since|after <time>year (latent)", -4.425701698176543),
+                                     -5.629418059367339),
+                                    ("Sundayyear (latent)", -4.713127327493184),
+                                    ("Christmasat <time-of-day>", -5.629418059367339),
+                                    ("from|since|after <time>year (latent)", -4.530805770699229),
                                     ("<duration> after|before|from <time>December",
-                                     -5.678464666671911),
-                                    ("yesterday<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("yesterday<time-of-day> am|pm", -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.985317486111966),
+                                     -4.9362708788073935),
                                     ("in|during <named-month>|yearyear (latent)",
-                                     -5.678464666671911),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.678464666671911),
-                                    ("at <time-of-day>intersect", -5.272999558563747),
-                                    ("hh:mmyear (latent)", -4.579852378003801),
-                                    ("Holiyear (latent)", -5.678464666671911),
-                                    ("until <time><time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("at <time-of-day>intersect", -5.223952951259174),
+                                    ("hh:mmyear (latent)", -4.530805770699229),
+                                    ("Holiyear (latent)", -5.629418059367339),
+                                    ("until <time><time-of-day> am|pm", -5.629418059367339),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.678464666671911),
-                                    ("dayminute", -3.0757749812275272),
-                                    ("intersectSeptember", -4.174387269895637),
-                                    ("minuteday", -2.610411731538294),
+                                     -5.629418059367339),
+                                    ("dayminute", -3.1445114095793385),
+                                    ("intersectSeptember", -4.125340662591065),
+                                    ("minuteday", -2.5613651242337214),
                                     ("absorption of , after named dayintersect",
-                                     -5.678464666671911),
-                                    ("Februaryin|during the <part-of-day>", -5.678464666671911),
-                                    ("hh:mmon <date>", -3.6635616461296463),
-                                    ("Saturdayyear (latent)", -5.678464666671911),
-                                    ("from|since|after <time>on <date>", -4.762173934797756),
+                                     -5.629418059367339),
+                                    ("Februaryin|during the <part-of-day>", -5.629418059367339),
+                                    ("hh:mmon <date>", -3.614515038825074),
+                                    ("Saturdayyear (latent)", -5.629418059367339),
+                                    ("from|since|after <time>on <date>", -4.713127327493184),
                                     ("absorption of , after named daySeptember",
-                                     -4.762173934797756),
-                                    ("Naraka Chaturdashiyear (latent)", -5.678464666671911),
-                                    ("on <date>September", -5.272999558563747),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
-                                    ("dayweek", -5.678464666671911),
-                                    ("Easter Sundayyear (latent)", -5.272999558563747),
-                                    ("Thursday<time-of-day> am|pm", -4.762173934797756),
-                                    ("weekyear", -5.272999558563747),
+                                     -4.713127327493184),
+                                    ("Naraka Chaturdashiyear (latent)", -5.629418059367339),
+                                    ("on <date>September", -5.223952951259174),
+                                    ("at <time-of-day>on <date>", -5.223952951259174),
+                                    ("dayweek", -5.629418059367339),
+                                    ("Easter Sundayyear (latent)", -5.223952951259174),
+                                    ("Thursday<time-of-day> am|pm", -4.9362708788073935),
+                                    ("weekyear", -5.223952951259174),
                                     ("<named-month> <day-of-month> (non ordinal)until <time>",
-                                     -5.678464666671911),
+                                     -5.629418059367339),
                                     ("intersect by \",\", \"of\", \"from\" for yearhh:mm",
-                                     -4.985317486111966),
-                                    ("Sundayfrom|since|after <time>", -5.678464666671911),
-                                    ("absorption of , after named dayFebruary", -4.762173934797756),
+                                     -4.9362708788073935),
+                                    ("Sundayfrom|since|after <time>", -5.629418059367339),
+                                    ("absorption of , after named dayFebruary", -4.713127327493184),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.678464666671911),
-                                    ("tomorrowat <time-of-day>", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("tomorrowat <time-of-day>", -5.629418059367339),
                                     ("<integer> to|till|before <hour-of-day>July",
-                                     -5.678464666671911),
-                                    ("last <cycle> of <time>year (latent)", -5.272999558563747),
-                                    ("tomorrow<time-of-day> am|pm", -5.678464666671911),
+                                     -5.629418059367339),
+                                    ("last <cycle> of <time>year (latent)", -5.223952951259174),
+                                    ("tomorrow<time-of-day> am|pm", -5.629418059367339),
                                     ("<named-month> <day-of-month> (non ordinal)year (latent)",
-                                     -4.985317486111966),
-                                    ("Diwaliyear (latent)", -5.272999558563747),
+                                     -4.9362708788073935),
+                                    ("Diwaliyear (latent)", -5.223952951259174),
                                     ("<time-of-day> - <time-of-day> (interval)July",
-                                     -5.678464666671911),
-                                    ("Fridayyear (latent)", -5.272999558563747),
-                                    ("this|next <day-of-week><time-of-day> am|pm",
-                                     -5.678464666671911),
-                                    ("minuteyear", -4.425701698176543)],
-                               n = 188}}),
+                                     -5.629418059367339),
+                                    ("Fridayyear (latent)", -5.223952951259174),
+                                    ("minuteyear", -4.376655090871971)],
+                               n = 177}}),
        ("one eleven",
         Classifier{okData =
                      ClassData{prior = -1.3862943611198906,
@@ -1357,7 +1344,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("year (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.15840600539739666,
+                     ClassData{prior = -0.15201620729862575,
                                unseen = -4.9344739331306915,
                                likelihoods =
                                  HashMap.fromList
@@ -1365,13 +1352,13 @@ classifiers
                                     ("intersect 2 numbers", -3.5409593240373143)],
                                n = 134},
                    koData =
-                     ClassData{prior = -1.9207515894191585, unseen = -3.332204510175204,
+                     ClassData{prior = -1.9588135538912212, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("negative numbers", -0.7308875085427924),
-                                    ("compose by multiplication", -1.9095425048844386)],
-                               n = 23}}),
+                                   [("integer (numeric)", -1.1786549963416462),
+                                    ("negative numbers", -0.6931471805599453),
+                                    ("compose by multiplication", -1.8718021769015913)],
+                               n = 22}}),
        ("<time> for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444, unseen = -2.70805020110221,
@@ -1442,26 +1429,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = 0.0, unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>integer (20..90)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer 21..99", -2.03688192726104),
-                                    ("hour", -0.9382696385929302),
-                                    ("at <time-of-day>integer (numeric)", -2.4423470353692043),
-                                    ("time-of-day (latent)integer (20..90)", -1.749199854809259)],
+                                   [("at <time-of-day>integer (20..90)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer 21..99", -1.9924301646902063),
+                                    ("hour", -0.8938178760220964),
+                                    ("at <time-of-day>integer (numeric)", -2.3978952727983707),
+                                    ("time-of-day (latent)integer (20..90)", -1.7047480922384253)],
                                n = 8},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -2.772588722239781,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)integer (numeric)", -1.3217558399823195),
-                                    ("about|exactly <time-of-day>integer (numeric)",
-                                     -2.0149030205422647),
-                                    ("hour", -1.0986122886681098)],
-                               n = 4}}),
+                     ClassData{prior = -infinity, unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.4700036292457356, unseen = -2.833213344056216,
@@ -1571,13 +1551,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("six thirty six a.m.",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.252762968495368),
-                                    ("one twenty two", -0.8472978603872037),
-                                    ("one eleven", -1.252762968495368)],
-                               n = 4},
+                                   [("integer (numeric)", -1.0986122886681098),
+                                    ("one twenty two", -1.0986122886681098),
+                                    ("one eleven", -1.0986122886681098)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1894,19 +1874,19 @@ classifiers
                                n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.5728610146854433, unseen = -4.356708826689592,
+                     ClassData{prior = -0.5577092096648412, unseen = -4.356708826689592,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.15415067982725836),
                                     ("integer (0..19)", -1.9459101490553135)],
                                n = 75},
                    koData =
-                     ClassData{prior = -0.8299061176753345, unseen = -4.110873864173311,
+                     ClassData{prior = -0.8498456324660023, unseen = -4.07753744390572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -5.129329438755058e-2),
-                                    ("integer (0..19)", -2.995732273553991)],
-                               n = 58}}),
+                                   [("integer (numeric)", -5.310982531394841e-2),
+                                    ("integer (0..19)", -2.9618307218783095)],
+                               n = 56}}),
        ("beginning of year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -1929,37 +1909,37 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.1351747783682526, unseen = -5.170483995038151,
+                     ClassData{prior = -0.12361395596717664,
+                               unseen = -5.159055299214529,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.5257286443082556),
-                                    ("integer (0..19)year (grain)", -3.0853444322436783),
-                                    ("integer (numeric)day (grain)", -2.5998366164619773),
-                                    ("integer (0..19)second (grain) ", -3.7784916128036232),
-                                    ("integer (0..19)hour (grain)", -3.0853444322436783),
-                                    ("second", -3.373026504695459),
-                                    ("integer (numeric)second (grain) ", -4.0661736852554045),
-                                    ("integer (numeric)year (grain)", -3.373026504695459),
-                                    ("day", -2.331572629867298), ("year", -2.5998366164619773),
-                                    ("integer (numeric)week (grain)", -3.0853444322436783),
-                                    ("integer (0..19)month (grain)", -3.5553480614894135),
-                                    ("hour", -2.6798793241355137), ("month", -3.2188758248682006),
-                                    ("integer (numeric)minute (grain)", -3.2188758248682006),
-                                    ("integer (0..19)minute (grain)", -3.0853444322436783),
-                                    ("integer (numeric)month (grain)", -4.0661736852554045),
-                                    ("minute", -2.5257286443082556),
-                                    ("integer (numeric)hour (grain)", -3.5553480614894135),
-                                    ("integer (0..19)day (grain)", -3.5553480614894135),
-                                    ("integer (0..19)week (grain)", -3.2188758248682006)],
+                                   [("week", -2.5142342648825204),
+                                    ("integer (0..19)year (grain)", -3.073850052817943),
+                                    ("integer (numeric)day (grain)", -2.588342237036242),
+                                    ("integer (0..19)second (grain) ", -3.7669972333778885),
+                                    ("integer (0..19)hour (grain)", -3.073850052817943),
+                                    ("second", -3.361532125269724),
+                                    ("integer (numeric)second (grain) ", -4.054679305829669),
+                                    ("integer (numeric)year (grain)", -3.361532125269724),
+                                    ("day", -2.3200782504415627), ("year", -2.588342237036242),
+                                    ("integer (numeric)week (grain)", -3.073850052817943),
+                                    ("integer (0..19)month (grain)", -3.543853682063679),
+                                    ("hour", -2.668384944709779), ("month", -3.207381445442466),
+                                    ("integer (numeric)minute (grain)", -3.207381445442466),
+                                    ("integer (0..19)minute (grain)", -3.073850052817943),
+                                    ("integer (numeric)month (grain)", -4.054679305829669),
+                                    ("minute", -2.5142342648825204),
+                                    ("integer (numeric)hour (grain)", -3.543853682063679),
+                                    ("integer (0..19)day (grain)", -3.543853682063679),
+                                    ("integer (0..19)week (grain)", -3.207381445442466)],
                                n = 76},
                    koData =
-                     ClassData{prior = -2.068012845856213, unseen = -3.828641396489095,
+                     ClassData{prior = -2.151762203259462, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("quarter", -3.1135153092103742), ("hour", -1.4087672169719492),
-                                    ("integer (numeric)hour (grain)", -1.4087672169719492),
-                                    ("integer (0..19)quarter (grain)", -3.1135153092103742)],
-                               n = 11}}),
+                                   [("hour", -1.3156767939059373),
+                                    ("integer (numeric)hour (grain)", -1.3156767939059373)],
+                               n = 10}}),
        ("hhmm (latent)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -1969,7 +1949,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> am|pm",
         Classifier{okData =
-                     ClassData{prior = -0.23483959107740107,
+                     ClassData{prior = -0.19530875232076572,
                                unseen = -5.3981627015177525,
                                likelihoods =
                                  HashMap.fromList
@@ -1990,16 +1970,14 @@ classifiers
                                     ("minute", -1.7560413866259759)],
                                n = 102},
                    koData =
-                     ClassData{prior = -1.563975538357343, unseen = -4.2626798770413155,
+                     ClassData{prior = -1.729239112246721, unseen = -4.110873864173311,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> to|till|before <hour-of-day>", -3.1498829533812494),
-                                    ("from|since|after <time>", -3.1498829533812494),
-                                    ("<hour-of-day> <integer>", -2.639057329615259),
-                                    ("time-of-day (latent)", -1.3040562628829186),
-                                    ("about|exactly <time-of-day>", -3.5553480614894135),
-                                    ("hour", -1.252762968495368), ("minute", -2.05127066471314)],
-                               n = 27}}),
+                                   [("<integer> to|till|before <hour-of-day>", -2.995732273553991),
+                                    ("from|since|after <time>", -2.995732273553991),
+                                    ("time-of-day (latent)", -1.1499055830556604),
+                                    ("hour", -1.0986122886681098), ("minute", -2.70805020110221)],
+                               n = 22}}),
        ("Yom Ha'atzmaut",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2236,34 +2214,30 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("about|exactly <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
-                               unseen = -3.6375861597263857,
+                     ClassData{prior = -0.15415067982725836,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -1.8191584434161694),
-                                    ("hh(:mm) - <time-of-day> am|pm", -2.917770732084279),
-                                    ("this|last|next <cycle>", -1.8191584434161694),
-                                    ("day", -2.512305623976115),
-                                    ("time-of-day (latent)", -2.917770732084279),
-                                    ("hhmm (latent)", -2.512305623976115),
-                                    ("<time-of-day> am|pm", -2.917770732084279),
-                                    ("hour", -2.2246235515243336),
-                                    ("next <time>", -2.917770732084279),
-                                    ("this|next <day-of-week>", -2.917770732084279),
-                                    ("minute", -2.512305623976115)],
+                                   [("week", -1.791759469228055),
+                                    ("hh(:mm) - <time-of-day> am|pm", -2.890371757896165),
+                                    ("this|last|next <cycle>", -1.791759469228055),
+                                    ("day", -2.4849066497880004),
+                                    ("time-of-day (latent)", -2.890371757896165),
+                                    ("hhmm (latent)", -2.4849066497880004),
+                                    ("<time-of-day> am|pm", -2.890371757896165),
+                                    ("hour", -2.1972245773362196),
+                                    ("next <time>", -2.890371757896165),
+                                    ("this|next <day-of-week>", -2.890371757896165),
+                                    ("minute", -2.4849066497880004)],
                                n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -3.0910424533583156,
+                     ClassData{prior = -1.9459101490553135, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("mm/dd", -2.3513752571634776),
-                                    ("<hour-of-day> <integer>", -2.3513752571634776),
-                                    ("day", -2.3513752571634776),
-                                    ("time-of-day (latent)", -2.3513752571634776),
-                                    ("<time-of-day> am|pm", -2.3513752571634776),
-                                    ("hour", -2.3513752571634776), ("minute", -1.9459101490553135)],
-                               n = 4}}),
+                                   [("mm/dd", -2.0794415416798357), ("day", -2.0794415416798357),
+                                    ("time-of-day (latent)", -2.0794415416798357),
+                                    ("hour", -2.0794415416798357)],
+                               n = 2}}),
        ("Sukkot",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2910,11 +2884,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("quarter (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.639057329615259,
+                     ClassData{prior = -0.2231435513142097, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.3862943611198906, unseen = -1.791759469228055,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -1.6094379124341003,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("last <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/ES_XX.hs b/Duckling/Ranking/Classifiers/ES_XX.hs
index eb2d85d9..4c57af8f 100644
--- a/Duckling/Ranking/Classifiers/ES_XX.hs
+++ b/Duckling/Ranking/Classifiers/ES_XX.hs
@@ -48,11 +48,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.5839478885949533, unseen = -4.0943445622221,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 58},
+                     ClassData{prior = -0.6190392084062235, unseen = -4.060443010546419,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 56},
                    koData =
-                     ClassData{prior = -0.8157495026522777, unseen = -3.871201010907891,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 46}}),
+                     ClassData{prior = -0.7731898882334817, unseen = -3.912023005428146,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 48}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -364,61 +364,59 @@ classifiers
                                n = 4}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.2113090936672069, unseen = -4.624972813284271,
+                     ClassData{prior = -0.2231435513142097, unseen = -4.574710978503383,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> de <named-month>in the <part-of-day>",
-                                     -3.9219733362813143),
-                                    ("dayhour", -1.9760631872260008),
-                                    ("Lunesin the <part-of-day>", -3.9219733362813143),
-                                    ("tomorrowin the <part-of-day>", -3.9219733362813143),
+                                     -3.871201010907891),
+                                    ("dayhour", -1.9252908618525775),
+                                    ("Lunesin the <part-of-day>", -3.871201010907891),
+                                    ("tomorrowin the <part-of-day>", -3.871201010907891),
                                     ("el <day-of-month> de <named-month>in the <part-of-day>",
-                                     -3.9219733362813143),
-                                    ("hourhour", -3.005682604407159),
+                                     -3.871201010907891),
+                                    ("hourhour", -2.9549102790337356),
                                     ("now<hour-of-day> minus quarter (as relative minutes)",
-                                     -3.9219733362813143),
-                                    ("dayyear", -3.005682604407159),
+                                     -3.871201010907891),
+                                    ("dayyear", -3.4657359027997265),
                                     ("a las <time-of-day>in the <part-of-day>",
-                                     -2.6692103677859462),
-                                    ("intersectin the <part-of-day>", -3.9219733362813143),
-                                    ("<named-month> <day-of-month>del <year>", -3.9219733362813143),
-                                    ("minutehour", -2.312535423847214),
-                                    ("intersect by `de`in the <part-of-day>", -3.9219733362813143),
-                                    ("now<hour-of-day> and <relative minutes>",
-                                     -3.9219733362813143),
+                                     -2.6184380424125226),
+                                    ("intersectin the <part-of-day>", -3.871201010907891),
+                                    ("<named-month> <day-of-month>del <year>", -3.871201010907891),
+                                    ("minutehour", -2.2617630984737906),
+                                    ("intersect by `de`in the <part-of-day>", -3.871201010907891),
+                                    ("now<hour-of-day> and <relative minutes>", -3.871201010907891),
                                     ("<hour-of-day> and halfin the <part-of-day>",
-                                     -3.5165082281731497),
-                                    ("tomorrowa las <time-of-day>", -3.5165082281731497),
-                                    ("Miercoles<time-of-day> <part-of-day>", -3.9219733362813143),
-                                    ("Miercoles<dim time> de la manana", -3.9219733362813143),
-                                    ("dayminute", -3.005682604407159),
-                                    ("<named-month> <day-of-month>el <time>", -3.9219733362813143),
-                                    ("Miercolesa las <time-of-day>", -3.9219733362813143),
-                                    ("el <time>in the <part-of-day>", -3.9219733362813143),
-                                    ("Miercolesintersect", -3.9219733362813143),
-                                    ("dd[/-]mmyear", -3.5165082281731497),
-                                    ("nowa las <time-of-day>", -3.5165082281731497),
+                                     -3.4657359027997265),
+                                    ("tomorrowa las <time-of-day>", -3.4657359027997265),
+                                    ("Miercoles<time-of-day> <part-of-day>", -3.871201010907891),
+                                    ("Miercoles<dim time> de la manana", -3.871201010907891),
+                                    ("dayminute", -2.9549102790337356),
+                                    ("<named-month> <day-of-month>el <time>", -3.871201010907891),
+                                    ("Miercolesa las <time-of-day>", -3.871201010907891),
+                                    ("el <time>in the <part-of-day>", -3.871201010907891),
+                                    ("Miercolesintersect", -3.871201010907891),
+                                    ("nowa las <time-of-day>", -3.4657359027997265),
                                     ("<hour-of-day> and quarterin the <part-of-day>",
-                                     -3.005682604407159),
-                                    ("yesterdayin the <part-of-day>", -3.9219733362813143)],
-                               n = 34},
+                                     -2.9549102790337356),
+                                    ("yesterdayin the <part-of-day>", -3.871201010907891)],
+                               n = 32},
                    koData =
-                     ClassData{prior = -1.6582280766035324, unseen = -3.912023005428146,
+                     ClassData{prior = -1.6094379124341003, unseen = -3.891820298110627,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -3.1986731175506815),
-                                    ("dayhour", -2.505525936990736),
+                                   [("hourday", -3.1780538303479458),
+                                    ("dayhour", -2.4849066497880004),
                                     ("<day-of-month> de <named-month>a las <time-of-day>",
-                                     -3.1986731175506815),
+                                     -3.1780538303479458),
                                     ("<time-of-day> am|pm<day-of-month> de <named-month>",
-                                     -3.1986731175506815),
-                                    ("monthhour", -2.793208009442517),
+                                     -3.1780538303479458),
+                                    ("monthhour", -2.772588722239781),
                                     ("now<hour-of-day> and <relative minutes>",
-                                     -3.1986731175506815),
-                                    ("Diciembrea las <time-of-day>", -3.1986731175506815),
-                                    ("dayminute", -2.793208009442517),
-                                    ("Febreroin the <part-of-day>", -3.1986731175506815),
-                                    ("nowa las <time-of-day>", -2.505525936990736)],
+                                     -3.1780538303479458),
+                                    ("Diciembrea las <time-of-day>", -3.1780538303479458),
+                                    ("dayminute", -2.772588722239781),
+                                    ("Febreroin the <part-of-day>", -3.1780538303479458),
+                                    ("nowa las <time-of-day>", -2.4849066497880004)],
                                n = 8}}),
        ("Miercoles",
         Classifier{okData =
@@ -783,15 +781,13 @@ classifiers
                                n = 4}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.0794415416798357,
+                     ClassData{prior = -0.8109302162163288, unseen = -1.791759469228055,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 6},
+                               n = 4},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.6094379124341003,
+                     ClassData{prior = -0.587786664902119, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 3}}),
+                               n = 5}}),
        ("en <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.6635616461296463,
diff --git a/Duckling/Ranking/Classifiers/FR_XX.hs b/Duckling/Ranking/Classifiers/FR_XX.hs
index 025b9f62..7ab67012 100644
--- a/Duckling/Ranking/Classifiers/FR_XX.hs
+++ b/Duckling/Ranking/Classifiers/FR_XX.hs
@@ -653,353 +653,341 @@ classifiers
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.23601006190746, unseen = -6.981934677156389,
+                     ClassData{prior = -0.21495665270962766, unseen = -6.97354301952014,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> <named-month><dim time> <part-of-day>",
-                                     -6.2878585601617845),
-                                    ("intersect<dim time> du matin", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("intersect<dim time> du matin", -6.279459070741808),
                                     ("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -5.88239345205362),
+                                     -5.8739939626336435),
                                     ("<day-of-month> <named-month>d\233but de journ\233e",
-                                     -6.2878585601617845),
-                                    ("hourday", -4.03656676155529),
-                                    ("<day-of-month> <named-month>year", -5.594711379601839),
-                                    ("dayhour", -1.9247599353734217),
+                                     -6.279459070741808),
+                                    ("hourday", -4.028167272135313),
+                                    ("<day-of-month> <named-month>year", -5.586311890181863),
+                                    ("dayhour", -1.9163604459534453),
                                     ("<datetime> - <datetime> (interval)Juillet",
-                                     -5.1892462714936745),
-                                    ("daymonth", -2.822122657362058),
-                                    ("monthyear", -4.783781163385511),
+                                     -5.180846782073698),
+                                    ("daymonth", -2.8137231679420815),
+                                    ("monthyear", -4.7753816739655335),
                                     ("<day-of-month> <named-month>d\233but de matin\233e",
-                                     -6.2878585601617845),
-                                    ("dernier <cycle> de <time> (latent)year", -5.371567828287629),
-                                    ("aujourd'huimilieu d'apr\232s-midi", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("dernier <cycle> de <time> (latent)year", -5.363168338867653),
+                                    ("aujourd'huimilieu d'apr\232s-midi", -6.279459070741808),
                                     ("<day-of-month> <named-month>\224|vers <time-of-day>",
-                                     -4.783781163385511),
-                                    ("dd mmyear", -5.035095591666416),
-                                    ("Vendredi\224|vers <time-of-day>", -5.88239345205362),
-                                    ("Mercredidu|dans le <part-of-day>", -6.2878585601617845),
-                                    ("aujourd'huifin d'apr\232s-midi", -6.2878585601617845),
-                                    ("day of month (premier)Novembre", -5.594711379601839),
+                                     -4.7753816739655335),
+                                    ("dd mmyear", -5.02669610224644),
+                                    ("Vendredi\224|vers <time-of-day>", -5.8739939626336435),
+                                    ("Mercredidu|dans le <part-of-day>", -6.279459070741808),
+                                    ("aujourd'huifin d'apr\232s-midi", -6.279459070741808),
+                                    ("day of month (premier)Novembre", -5.586311890181863),
                                     ("le <day-of-month> (non ordinal)<dim time> du matin",
-                                     -6.2878585601617845),
-                                    ("aujourd'huimilieu de matin\233e", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("aujourd'huimilieu de matin\233e", -6.279459070741808),
                                     ("hh(:|h)mm (time-of-day)<day-of-week> <day-of-month>",
-                                     -6.2878585601617845),
-                                    ("le <day-of-month> (non ordinal)Fevrier", -4.208417018481948),
-                                    ("Mars<dim time> <part-of-day>", -6.2878585601617845),
-                                    ("Lundiday of month (premier)", -5.88239345205362),
+                                     -6.279459070741808),
+                                    ("le <day-of-month> (non ordinal)Fevrier", -4.200017529061972),
+                                    ("Mars<dim time> <part-of-day>", -6.279459070741808),
+                                    ("Lundiday of month (premier)", -5.8739939626336435),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -5.594711379601839),
+                                     -5.586311890181863),
                                     ("<hour-of-day> et quart<dim time> <part-of-day>",
-                                     -5.88239345205362),
-                                    ("le <time>du|dans le <part-of-day>", -5.594711379601839),
-                                    ("aujourd'huifin de matin\233e", -6.2878585601617845),
-                                    ("Marsyear", -5.88239345205362),
-                                    ("aujourd'huifin de soir\233e", -6.2878585601617845),
-                                    ("\224|vers <time-of-day>ce <part-of-day>", -5.594711379601839),
+                                     -5.8739939626336435),
+                                    ("le <time>du|dans le <part-of-day>", -5.586311890181863),
+                                    ("aujourd'huifin de matin\233e", -6.279459070741808),
+                                    ("Marsyear", -5.8739939626336435),
+                                    ("aujourd'huifin de soir\233e", -6.279459070741808),
+                                    ("\224|vers <time-of-day>ce <part-of-day>", -5.586311890181863),
                                     ("<day-of-month> <named-month>d\233but d'apr\232s-midi",
-                                     -6.2878585601617845),
+                                     -6.279459070741808),
                                     ("le <day-of-month> (non ordinal)<dim time> du soir",
-                                     -5.594711379601839),
-                                    ("intersectSeptembre", -5.88239345205362),
-                                    ("aujourd'huid\233but de soir\233e", -6.2878585601617845),
-                                    ("<day-of-week> <day-of-month>Fevrier", -5.88239345205362),
-                                    ("<hour-of-day> et demice <part-of-day>", -5.88239345205362),
-                                    ("apr\232s <time-of-day>Jeudi", -5.88239345205362),
-                                    ("le <time>fin de matin\233e", -6.2878585601617845),
+                                     -5.586311890181863),
+                                    ("intersectSeptembre", -5.8739939626336435),
+                                    ("aujourd'huid\233but de soir\233e", -6.279459070741808),
+                                    ("<day-of-week> <day-of-month>Fevrier", -5.8739939626336435),
+                                    ("<hour-of-day> et demice <part-of-day>", -5.8739939626336435),
+                                    ("apr\232s <time-of-day>Jeudi", -5.8739939626336435),
+                                    ("le <time>fin de matin\233e", -6.279459070741808),
                                     ("Jeudide <time-of-day> - <time-of-day> (interval)",
-                                     -5.88239345205362),
-                                    ("day of month (premier)Mars", -5.371567828287629),
-                                    ("intersectmilieu de journ\233e", -6.2878585601617845),
-                                    ("intersectfin de journ\233e", -6.2878585601617845),
+                                     -5.8739939626336435),
+                                    ("day of month (premier)Mars", -5.363168338867653),
+                                    ("intersectmilieu de journ\233e", -6.279459070741808),
+                                    ("intersectfin de journ\233e", -6.279459070741808),
                                     ("le <day-of-month> (non ordinal)<time-of-day> heures",
-                                     -6.2878585601617845),
-                                    ("Octobreyear", -5.371567828287629),
-                                    ("Fevrierd\233but de matin\233e", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("Octobreyear", -5.363168338867653),
+                                    ("Fevrierd\233but de matin\233e", -6.279459070741808),
                                     ("de <datetime> - <datetime> (interval)Juillet",
-                                     -5.88239345205362),
+                                     -5.8739939626336435),
                                     ("<hour-of-day> <integer> (as relative minutes)<day-of-week> <day-of-month>",
-                                     -6.2878585601617845),
-                                    ("monthhour", -4.090633982825565),
-                                    ("Marsintersect", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("monthhour", -4.082234493405589),
+                                    ("Marsintersect", -6.279459070741808),
                                     ("Lundile <cycle> prochain|suivant|d'apr\232s",
-                                     -6.2878585601617845),
-                                    ("le <time>fin d'apr\232s-midi", -6.2878585601617845),
-                                    ("hourmonth", -4.783781163385511),
-                                    ("<time-of-day> heuresle <time>", -4.783781163385511),
+                                     -6.279459070741808),
+                                    ("le <time>fin d'apr\232s-midi", -6.279459070741808),
+                                    ("hourmonth", -4.7753816739655335),
+                                    ("<time-of-day> heuresle <time>", -4.7753816739655335),
                                     ("entre <datetime> et <datetime> (interval)Jeudi",
-                                     -5.88239345205362),
-                                    ("dayday", -3.936483302998307),
-                                    ("Septembreyear", -5.88239345205362),
+                                     -5.8739939626336435),
+                                    ("dayday", -3.9280838135783305),
+                                    ("Septembreyear", -5.8739939626336435),
                                     ("aujourd'hui<hour-of-day> <integer> (as relative minutes)",
-                                     -5.88239345205362),
-                                    ("apr\232s <time-of-day>Novembre", -5.594711379601839),
-                                    ("hourhour", -3.762129915853529),
-                                    ("Fevrierd\233but d'apr\232s-midi", -6.2878585601617845),
+                                     -5.8739939626336435),
+                                    ("apr\232s <time-of-day>Novembre", -5.586311890181863),
+                                    ("hourhour", -3.7537304264335525),
+                                    ("Fevrierd\233but d'apr\232s-midi", -6.279459070741808),
                                     ("<day-of-week> <day-of-month>\224|vers <time-of-day>",
-                                     -5.1892462714936745),
-                                    ("<day-of-week> <day-of-month>Septembre", -6.2878585601617845),
-                                    ("le <time>intersect", -5.88239345205362),
+                                     -5.180846782073698),
+                                    ("<day-of-week> <day-of-month>Septembre", -6.279459070741808),
+                                    ("le <time>intersect", -5.8739939626336435),
                                     ("\224|vers <time-of-day><dim time> <part-of-day>",
-                                     -6.2878585601617845),
-                                    ("aujourd'huiau d\233jeuner", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("aujourd'huiau d\233jeuner", -6.279459070741808),
                                     ("du dd au dd (interval) (latent month)Juillet",
-                                     -5.594711379601839),
-                                    ("Vendrediday of month (premier)", -6.2878585601617845),
-                                    ("le <day-of-month> (non ordinal)Avril", -6.2878585601617845),
-                                    ("<time-of-day> heuresintersect", -5.371567828287629),
-                                    ("<hour-of-day> et quartce <part-of-day>", -5.88239345205362),
-                                    ("Jeudi\224|vers <time-of-day>", -6.2878585601617845),
-                                    ("dayyear", -3.889963287363414),
-                                    ("le <day-of-month> (non ordinal)Juin", -6.2878585601617845),
-                                    ("Lundice|dans le <cycle>", -6.2878585601617845),
-                                    ("apr\232s-demain\224|vers <time-of-day>", -5.88239345205362),
-                                    ("intersectfin d'apr\232s-midi", -6.2878585601617845),
-                                    ("le <ordinal> <cycle> de <time>year", -6.2878585601617845),
-                                    ("intersectmilieu d'apr\232s-midi", -6.2878585601617845),
+                                     -5.586311890181863),
+                                    ("Vendrediday of month (premier)", -6.279459070741808),
+                                    ("le <day-of-month> (non ordinal)Avril", -6.279459070741808),
+                                    ("<time-of-day> heuresintersect", -5.363168338867653),
+                                    ("<hour-of-day> et quartce <part-of-day>", -5.8739939626336435),
+                                    ("Jeudi\224|vers <time-of-day>", -6.279459070741808),
+                                    ("dayyear", -3.8815637979434374),
+                                    ("le <day-of-month> (non ordinal)Juin", -6.279459070741808),
+                                    ("Lundice|dans le <cycle>", -6.279459070741808),
+                                    ("apr\232s-demain\224|vers <time-of-day>", -5.8739939626336435),
+                                    ("intersectfin d'apr\232s-midi", -6.279459070741808),
+                                    ("le <ordinal> <cycle> de <time>year", -6.279459070741808),
+                                    ("intersectmilieu d'apr\232s-midi", -6.279459070741808),
                                     ("<hour-of-day> <integer> (as relative minutes)Jeudi",
-                                     -6.2878585601617845),
-                                    ("le <time>milieu de journ\233e", -6.2878585601617845),
-                                    ("aujourd'huid\233but de journ\233e", -6.2878585601617845),
-                                    ("demain\224|vers <time-of-day>", -5.88239345205362),
-                                    ("le <day-of-month> (non ordinal)Mars", -4.901564199041894),
+                                     -6.279459070741808),
+                                    ("le <time>milieu de journ\233e", -6.279459070741808),
+                                    ("aujourd'huid\233but de journ\233e", -6.279459070741808),
+                                    ("demain\224|vers <time-of-day>", -5.8739939626336435),
+                                    ("le <day-of-month> (non ordinal)Mars", -4.893164709621917),
                                     ("le <day-of-month> (non ordinal)intersect",
-                                     -3.802951910373784),
-                                    ("hourminute", -6.2878585601617845),
-                                    ("dd-dd <month>(interval)year", -6.2878585601617845),
-                                    ("intersect<day-of-month> <named-month>", -5.88239345205362),
+                                     -3.7945524209538077),
+                                    ("hourminute", -6.279459070741808),
+                                    ("dd-dd <month>(interval)year", -6.279459070741808),
+                                    ("intersect<day-of-month> <named-month>", -5.8739939626336435),
                                     ("<hour-of-day> <integer> (as relative minutes)Samedi",
-                                     -6.2878585601617845),
-                                    ("minutemonth", -5.88239345205362),
-                                    ("\224|vers <time-of-day>demain", -6.2878585601617845),
-                                    ("minutehour", -4.678420647727684),
-                                    ("Lundidu|dans le <part-of-day>", -6.2878585601617845),
-                                    ("aujourd'huimilieu de journ\233e", -6.2878585601617845),
-                                    ("Mars\224|vers <time-of-day>", -5.594711379601839),
-                                    ("intersectd\233but de soir\233e", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("minutemonth", -5.8739939626336435),
+                                    ("\224|vers <time-of-day>demain", -6.279459070741808),
+                                    ("minutehour", -4.670021158307708),
+                                    ("Lundidu|dans le <part-of-day>", -6.279459070741808),
+                                    ("aujourd'huimilieu de journ\233e", -6.279459070741808),
+                                    ("Mars\224|vers <time-of-day>", -5.586311890181863),
+                                    ("intersectd\233but de soir\233e", -6.279459070741808),
                                     ("Mardile <cycle> prochain|suivant|d'apr\232s",
-                                     -5.594711379601839),
-                                    ("aujourd'huifin de journ\233e", -6.2878585601617845),
-                                    ("le <day-of-month> (non ordinal)Octobre", -6.2878585601617845),
-                                    ("intersectdu|dans le <part-of-day>", -4.496099090933729),
+                                     -5.586311890181863),
+                                    ("aujourd'huifin de journ\233e", -6.279459070741808),
+                                    ("le <day-of-month> (non ordinal)Octobre", -6.279459070741808),
+                                    ("intersectdu|dans le <part-of-day>", -4.487699601513753),
                                     ("le <day-of-month> \224 <datetime>du|dans le <part-of-day>",
-                                     -5.88239345205362),
-                                    ("hh(:|h)mm (time-of-day)Jeudi", -6.2878585601617845),
+                                     -5.8739939626336435),
+                                    ("hh(:|h)mm (time-of-day)Jeudi", -6.279459070741808),
                                     ("le <day-of-month> (non ordinal)apr\232s <time-of-day>",
-                                     -6.2878585601617845),
-                                    ("le <time>Juillet", -6.2878585601617845),
-                                    ("Lundi<day-of-month> <named-month>", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("le <time>Juillet", -6.279459070741808),
+                                    ("Lundi<day-of-month> <named-month>", -6.279459070741808),
                                     ("Mercredile <cycle> prochain|suivant|d'apr\232s",
-                                     -5.594711379601839),
-                                    ("Lundifin d'apr\232s-midi", -5.88239345205362),
-                                    ("Lundile <time>", -5.88239345205362),
+                                     -5.586311890181863),
+                                    ("Lundifin d'apr\232s-midi", -5.8739939626336435),
+                                    ("Lundile <time>", -5.8739939626336435),
                                     ("le <day-of-month> (non ordinal)<dim time> <part-of-day>",
-                                     -4.147792396665514),
+                                     -4.139392907245537),
                                     ("Mardi<named-month|named-day> suivant|d'apr\232s",
-                                     -5.88239345205362),
-                                    ("apr\232s <time-of-day>le <time>", -5.371567828287629),
-                                    ("Mars<dim time> du matin", -6.2878585601617845),
-                                    ("le <time>Novembre", -5.594711379601839),
-                                    ("intersectd\233but d'apr\232s-midi", -6.2878585601617845),
-                                    ("<datetime> - <datetime> (interval)Jeudi", -5.371567828287629),
+                                     -5.8739939626336435),
+                                    ("apr\232s <time-of-day>le <time>", -5.363168338867653),
+                                    ("Mars<dim time> du matin", -6.279459070741808),
+                                    ("le <time>Novembre", -5.586311890181863),
+                                    ("intersectd\233but d'apr\232s-midi", -6.279459070741808),
+                                    ("<datetime> - <datetime> (interval)Jeudi", -5.363168338867653),
                                     ("Mercredi<named-month|named-day> suivant|d'apr\232s",
-                                     -5.88239345205362),
+                                     -5.8739939626336435),
                                     ("<time-of-day> - <time-of-day> (interval)Jeudi",
-                                     -5.035095591666416),
-                                    ("Samedi<day-of-month> <named-month>", -6.2878585601617845),
-                                    ("<hour-of-day> et quartdemain", -5.88239345205362),
-                                    ("<time-of-day> heuresce <time>", -6.2878585601617845),
-                                    ("le <time>d\233but d'apr\232s-midi", -6.2878585601617845),
-                                    ("day of month (premier)Juillet", -5.594711379601839),
+                                     -5.02669610224644),
+                                    ("Samedi<day-of-month> <named-month>", -6.279459070741808),
+                                    ("<hour-of-day> et quartdemain", -5.8739939626336435),
+                                    ("<time-of-day> heuresce <time>", -6.279459070741808),
+                                    ("le <time>d\233but d'apr\232s-midi", -6.279459070741808),
+                                    ("day of month (premier)Juillet", -5.586311890181863),
                                     ("<day-of-month> <named-month>du|dans le <part-of-day>",
-                                     -5.88239345205362),
-                                    ("Fevriermilieu d'apr\232s-midi", -6.2878585601617845),
-                                    ("Mercredi\224|vers <time-of-day>", -6.2878585601617845),
-                                    ("intersectNovembre", -5.035095591666416),
-                                    ("le <time><dim time> du matin", -6.2878585601617845),
-                                    ("Fevrierfin d'apr\232s-midi", -6.2878585601617845),
-                                    ("apr\232s <time-of-day>intersect", -5.88239345205362),
+                                     -5.8739939626336435),
+                                    ("Fevriermilieu d'apr\232s-midi", -6.279459070741808),
+                                    ("Mercredi\224|vers <time-of-day>", -6.279459070741808),
+                                    ("intersectNovembre", -5.02669610224644),
+                                    ("le <time><dim time> du matin", -6.279459070741808),
+                                    ("Fevrierfin d'apr\232s-midi", -6.279459070741808),
+                                    ("apr\232s <time-of-day>intersect", -5.8739939626336435),
                                     ("le <day-of-month> (non ordinal)\224|vers <time-of-day>",
-                                     -4.783781163385511),
+                                     -4.7753816739655335),
                                     ("<day-of-month> <named-month>d\233but de soir\233e",
-                                     -6.2878585601617845),
-                                    ("hierdu|dans le <part-of-day>", -6.2878585601617845),
-                                    ("le <time>d\233but de soir\233e", -6.2878585601617845),
-                                    ("Mercredice|dans le <cycle>", -6.2878585601617845),
-                                    ("Fevrierfin de soir\233e", -6.2878585601617845),
-                                    ("intersect<dim time> <part-of-day>", -6.2878585601617845),
-                                    ("Mardice|dans le <cycle>", -6.2878585601617845),
-                                    ("dayminute", -4.678420647727684),
-                                    ("intersectd\233but de journ\233e", -6.2878585601617845),
-                                    ("<ordinal> <cycle> de <time>year", -5.88239345205362),
-                                    ("Fevriermilieu de matin\233e", -6.2878585601617845),
-                                    ("le <time>\224|vers <time-of-day>", -5.1892462714936745),
+                                     -6.279459070741808),
+                                    ("hierdu|dans le <part-of-day>", -6.279459070741808),
+                                    ("le <time>d\233but de soir\233e", -6.279459070741808),
+                                    ("Mercredice|dans le <cycle>", -6.279459070741808),
+                                    ("Fevrierfin de soir\233e", -6.279459070741808),
+                                    ("intersect<dim time> <part-of-day>", -6.279459070741808),
+                                    ("Mardice|dans le <cycle>", -6.279459070741808),
+                                    ("dayminute", -4.670021158307708),
+                                    ("intersectd\233but de journ\233e", -6.279459070741808),
+                                    ("<ordinal> <cycle> de <time>year", -5.8739939626336435),
+                                    ("Fevriermilieu de matin\233e", -6.279459070741808),
+                                    ("le <time>\224|vers <time-of-day>", -5.180846782073698),
                                     ("<day-of-month> <named-month><dim time> du matin",
-                                     -6.2878585601617845),
-                                    ("intersectyear", -5.594711379601839),
-                                    ("Fevrierfin de matin\233e", -6.2878585601617845),
-                                    ("minuteday", -3.3434195809953438),
-                                    ("le <time>d\233but de matin\233e", -6.2878585601617845),
-                                    ("Mardile <time>", -4.901564199041894),
-                                    ("aujourd'hui\224|vers <time-of-day>", -5.371567828287629),
+                                     -6.279459070741808),
+                                    ("intersectyear", -5.586311890181863),
+                                    ("Fevrierfin de matin\233e", -6.279459070741808),
+                                    ("minuteday", -3.3350200915753674),
+                                    ("le <time>d\233but de matin\233e", -6.279459070741808),
+                                    ("Mardile <time>", -4.893164709621917),
+                                    ("aujourd'hui\224|vers <time-of-day>", -5.363168338867653),
                                     ("<day-of-month> <named-month>milieu d'apr\232s-midi",
-                                     -6.2878585601617845),
-                                    ("day of month (premier)intersect", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("day of month (premier)intersect", -6.279459070741808),
                                     ("<day-of-month> <named-month>fin d'apr\232s-midi",
-                                     -6.2878585601617845),
-                                    ("day of month (premier)Janvier", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("day of month (premier)Janvier", -6.279459070741808),
                                     ("de <datetime> - <datetime> (interval)Jeudi",
-                                     -5.88239345205362),
-                                    ("le <time>milieu de matin\233e", -6.2878585601617845),
-                                    ("aujourd'huid\233but de matin\233e", -5.1892462714936745),
-                                    ("Fevrierd\233but de soir\233e", -6.2878585601617845),
-                                    ("Jeudiapr\232s <time-of-day>", -5.371567828287629),
-                                    ("Mercredile <time>", -4.901564199041894),
+                                     -5.8739939626336435),
+                                    ("le <time>milieu de matin\233e", -6.279459070741808),
+                                    ("aujourd'huid\233but de matin\233e", -5.180846782073698),
+                                    ("Fevrierd\233but de soir\233e", -6.279459070741808),
+                                    ("Jeudiapr\232s <time-of-day>", -5.363168338867653),
+                                    ("Mercredile <time>", -4.893164709621917),
                                     ("<dim time> <part-of-day>apr\232s <time-of-day>",
-                                     -6.2878585601617845),
-                                    ("le <time>fin de soir\233e", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("le <time>fin de soir\233e", -6.279459070741808),
                                     ("de <time-of-day> - <time-of-day> (interval)Jeudi",
-                                     -5.371567828287629),
+                                     -5.363168338867653),
                                     ("<day-of-month> <named-month>milieu de matin\233e",
-                                     -6.2878585601617845),
+                                     -6.279459070741808),
                                     ("<day-of-month> <named-month>fin de soir\233e",
-                                     -6.2878585601617845),
+                                     -6.279459070741808),
                                     ("<day-of-month> <named-month>fin de matin\233e",
-                                     -6.2878585601617845),
-                                    ("<time-of-day> heuresce <part-of-day>", -5.88239345205362),
-                                    ("Mercredi<day-of-month> <named-month>", -6.2878585601617845),
-                                    ("aujourd'huid\233but d'apr\232s-midi", -6.2878585601617845),
-                                    ("le <time>milieu d'apr\232s-midi", -6.2878585601617845),
+                                     -6.279459070741808),
+                                    ("<time-of-day> heuresce <part-of-day>", -5.8739939626336435),
+                                    ("Mercredi<day-of-month> <named-month>", -6.279459070741808),
+                                    ("aujourd'huid\233but d'apr\232s-midi", -6.279459070741808),
+                                    ("le <time>milieu d'apr\232s-midi", -6.279459070741808),
                                     ("\224|vers <time-of-day>du|dans le <part-of-day>",
-                                     -5.1892462714936745),
+                                     -5.180846782073698),
                                     ("entre <time-of-day> et <time-of-day> (interval)Jeudi",
-                                     -5.88239345205362),
-                                    ("intersectintersect", -6.2878585601617845),
-                                    ("dayweek", -4.090633982825565),
+                                     -5.8739939626336435),
+                                    ("intersectintersect", -6.279459070741808),
+                                    ("dayweek", -4.082234493405589),
                                     ("entre <datetime> et <datetime> (interval)Juillet",
-                                     -5.88239345205362),
-                                    ("intersectMars", -6.2878585601617845),
-                                    ("weekyear", -4.901564199041894),
-                                    ("le <time>Mars", -5.88239345205362),
-                                    ("apr\232s le <day-of-month>Mars", -6.2878585601617845),
-                                    ("hh(:|h)mm (time-of-day)intersect", -5.88239345205362),
+                                     -5.8739939626336435),
+                                    ("intersectMars", -6.279459070741808),
+                                    ("weekyear", -4.893164709621917),
+                                    ("le <time>Mars", -5.8739939626336435),
+                                    ("apr\232s le <day-of-month>Mars", -6.279459070741808),
+                                    ("hh(:|h)mm (time-of-day)intersect", -5.8739939626336435),
                                     ("<day-of-month> <named-month>fin de journ\233e",
-                                     -6.2878585601617845),
+                                     -6.279459070741808),
                                     ("<day-of-month> <named-month>milieu de journ\233e",
-                                     -6.2878585601617845),
-                                    ("le <time>fin de journ\233e", -6.2878585601617845),
-                                    ("dd/-mm\224|vers <time-of-day>", -5.88239345205362),
-                                    ("intersectfin de matin\233e", -6.2878585601617845),
-                                    ("Fevrierd\233but de journ\233e", -6.2878585601617845),
-                                    ("Vendrediintersect", -6.2878585601617845),
-                                    ("<day-of-month> <named-month>intersect", -6.2878585601617845),
-                                    ("intersectfin de soir\233e", -6.2878585601617845),
-                                    ("intersectmilieu de matin\233e", -6.2878585601617845),
-                                    ("intersect\224|vers <time-of-day>", -5.594711379601839),
-                                    ("le <time>year", -4.783781163385511),
-                                    ("Vendrediapr\232s <time-of-day>", -6.2878585601617845),
-                                    ("hh(:|h)mm (time-of-day)Samedi", -6.2878585601617845),
-                                    ("le <time><dim time> <part-of-day>", -6.2878585601617845),
-                                    ("Fevrierfin de journ\233e", -6.2878585601617845),
-                                    ("Fevriermilieu de journ\233e", -6.2878585601617845),
-                                    ("le <time>d\233but de journ\233e", -6.2878585601617845),
-                                    ("intersectd\233but de matin\233e", -6.2878585601617845)],
+                                     -6.279459070741808),
+                                    ("le <time>fin de journ\233e", -6.279459070741808),
+                                    ("dd/-mm\224|vers <time-of-day>", -5.8739939626336435),
+                                    ("intersectfin de matin\233e", -6.279459070741808),
+                                    ("Fevrierd\233but de journ\233e", -6.279459070741808),
+                                    ("Vendrediintersect", -6.279459070741808),
+                                    ("<day-of-month> <named-month>intersect", -6.279459070741808),
+                                    ("intersectfin de soir\233e", -6.279459070741808),
+                                    ("intersectmilieu de matin\233e", -6.279459070741808),
+                                    ("intersect\224|vers <time-of-day>", -5.586311890181863),
+                                    ("le <time>year", -4.7753816739655335),
+                                    ("Vendrediapr\232s <time-of-day>", -6.279459070741808),
+                                    ("hh(:|h)mm (time-of-day)Samedi", -6.279459070741808),
+                                    ("le <time><dim time> <part-of-day>", -6.279459070741808),
+                                    ("Fevrierfin de journ\233e", -6.279459070741808),
+                                    ("Fevriermilieu de journ\233e", -6.279459070741808),
+                                    ("le <time>d\233but de journ\233e", -6.279459070741808),
+                                    ("intersectd\233but de matin\233e", -6.279459070741808)],
                                n = 417},
                    koData =
-                     ClassData{prior = -1.5595660823939272, unseen = -6.142037405587356,
+                     ClassData{prior = -1.6428726885203377, unseen = -6.073044534100405,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year<time-of-day> - <time-of-day> (interval)",
-                                     -4.7535901911063645),
-                                    ("demain<time-of-day> heures", -5.44673737166631),
-                                    ("hourday", -3.2495127943300903),
-                                    ("<day-of-month> <named-month>year", -5.44673737166631),
-                                    ("demainavant <time-of-day>", -5.44673737166631),
-                                    ("dayhour", -2.772588722239781),
+                                   [("demain<time-of-day> heures", -5.377590547442544),
+                                    ("hourday", -3.180365970106325),
+                                    ("<day-of-month> <named-month>year", -5.377590547442544),
+                                    ("demainavant <time-of-day>", -5.377590547442544),
+                                    ("dayhour", -2.851861903134289),
                                     ("<time-of-day> - <time-of-day> (interval)Juillet",
-                                     -4.530446639792155),
+                                     -4.461299815568389),
                                     ("Jeudi<time-of-day> - <time-of-day> (interval)",
-                                     -5.041272263558145),
-                                    ("daymonth", -3.8372994592322094),
-                                    ("monthday", -5.44673737166631),
-                                    ("monthyear", -4.7535901911063645),
-                                    ("yearhour", -4.7535901911063645),
-                                    ("le <cycle> de <time>Octobre", -5.041272263558145),
-                                    ("houryear", -5.041272263558145),
+                                     -4.97212543933438),
+                                    ("daymonth", -3.768152635008444),
+                                    ("monthyear", -4.684443366882599),
+                                    ("le <cycle> de <time>Octobre", -4.97212543933438),
+                                    ("houryear", -4.97212543933438),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -4.7535901911063645),
-                                    ("le <time>du|dans le <part-of-day>", -5.041272263558145),
-                                    ("Marsyear", -5.44673737166631),
-                                    ("Dimanche<day-of-month> <named-month>", -5.041272263558145),
+                                     -4.684443366882599),
+                                    ("le <time>du|dans le <part-of-day>", -4.97212543933438),
+                                    ("Marsyear", -5.377590547442544),
+                                    ("Dimanche<day-of-month> <named-month>", -4.97212543933438),
                                     ("<time-of-day> heuresle <day-of-month> (non ordinal)",
-                                     -4.530446639792155),
+                                     -4.461299815568389),
                                     ("le <day-of-month> (non ordinal)<time-of-day> heures",
-                                     -5.44673737166631),
-                                    ("aujourd'huidu|dans le <part-of-day>", -5.041272263558145),
+                                     -5.377590547442544),
+                                    ("aujourd'huidu|dans le <part-of-day>", -4.97212543933438),
                                     ("de <datetime> - <datetime> (interval)Juillet",
-                                     -4.193974403170942),
-                                    ("monthhour", -4.060443010546419),
-                                    ("hourmonth", -3.7419892794278846),
+                                     -4.124827578947176),
+                                    ("monthhour", -3.991296186322654),
+                                    ("hourmonth", -3.6728424552041194),
                                     ("Vendredi<time-of-day> - <time-of-day> (interval)",
-                                     -4.193974403170942),
-                                    ("dayday", -3.8372994592322094),
-                                    ("Septembreyear", -5.44673737166631),
-                                    ("Lundiapr\232s <time-of-day>", -5.44673737166631),
-                                    ("hourhour", -3.5749351947647185),
-                                    ("\224|vers <time-of-day>Jeudi", -4.7535901911063645),
-                                    ("dayyear", -4.193974403170942),
-                                    ("le lendemain du <time>Fevrier", -5.44673737166631),
-                                    ("demain\224|vers <time-of-day>", -5.041272263558145),
-                                    ("<time> timezoneapr\232s <time-of-day>", -5.041272263558145),
-                                    ("Mars\224|vers <time-of-day>", -4.3481250829982),
-                                    ("Lundi<datetime> - <datetime> (interval)", -5.041272263558145),
-                                    ("intersect by 'de' or ','year", -5.041272263558145),
-                                    ("hh(:|h)mm (time-of-day)Jeudi", -5.44673737166631),
-                                    ("weekmonth", -5.041272263558145),
-                                    ("le <day-of-month> (non ordinal)Juillet", -5.041272263558145),
-                                    ("le <day-of-month> (non ordinal)year", -5.041272263558145),
-                                    ("Juillet<day-of-month> <named-month>", -5.44673737166631),
+                                     -4.124827578947176),
+                                    ("dayday", -3.768152635008444),
+                                    ("Septembreyear", -5.377590547442544),
+                                    ("hourhour", -3.768152635008444),
+                                    ("\224|vers <time-of-day>Jeudi", -4.684443366882599),
+                                    ("dayyear", -4.124827578947176),
+                                    ("le lendemain du <time>Fevrier", -5.377590547442544),
+                                    ("demain\224|vers <time-of-day>", -4.97212543933438),
+                                    ("Mars\224|vers <time-of-day>", -4.278978258774435),
+                                    ("Lundi<datetime> - <datetime> (interval)", -4.97212543933438),
+                                    ("intersect by 'de' or ','year", -4.97212543933438),
+                                    ("hh(:|h)mm (time-of-day)Jeudi", -5.377590547442544),
+                                    ("weekmonth", -4.97212543933438),
+                                    ("le <day-of-month> (non ordinal)Juillet", -4.97212543933438),
+                                    ("le <day-of-month> (non ordinal)year", -4.97212543933438),
                                     ("<time-of-day> - <time-of-day> (interval)Septembre",
-                                     -5.44673737166631),
+                                     -5.377590547442544),
                                     ("Samedi<time-of-day> - <time-of-day> (interval)",
-                                     -5.041272263558145),
-                                    ("<time-of-day> heuresdd/-mm", -5.44673737166631),
+                                     -4.97212543933438),
+                                    ("<time-of-day> heuresdd/-mm", -5.377590547442544),
                                     ("<time-of-day> - <time-of-day> (interval)du|dans le <part-of-day>",
-                                     -5.041272263558145),
-                                    ("yearmonth", -5.44673737166631),
-                                    ("intersectyear", -5.44673737166631),
-                                    ("minuteday", -5.44673737166631),
-                                    ("Mardile <time>", -5.44673737166631),
-                                    ("Fevrierdu|dans le <part-of-day>", -5.041272263558145),
-                                    ("aujourd'hui\224|vers <time-of-day>", -5.041272263558145),
-                                    ("<datetime>-dd <month>(interval)year", -5.041272263558145),
-                                    ("Jeudiapr\232s <time-of-day>", -5.041272263558145),
-                                    ("Mercredile <time>", -5.44673737166631),
+                                     -4.97212543933438),
+                                    ("yearmonth", -5.377590547442544),
+                                    ("intersectyear", -5.377590547442544),
+                                    ("minuteday", -5.377590547442544),
+                                    ("Mardile <time>", -5.377590547442544),
+                                    ("Fevrierdu|dans le <part-of-day>", -4.97212543933438),
+                                    ("aujourd'hui\224|vers <time-of-day>", -4.97212543933438),
+                                    ("<datetime>-dd <month>(interval)year", -4.97212543933438),
+                                    ("Jeudiapr\232s <time-of-day>", -4.97212543933438),
+                                    ("Mercredile <time>", -5.377590547442544),
                                     ("le <day-of-month> (non ordinal)avant <time-of-day>",
-                                     -5.44673737166631),
+                                     -5.377590547442544),
                                     ("<dim time> <part-of-day>apr\232s <time-of-day>",
-                                     -5.44673737166631),
-                                    ("Mercredi<day-of-month> <named-month>", -4.7535901911063645),
-                                    ("demainapr\232s <time-of-day>", -5.44673737166631),
-                                    ("<day-of-week> <day-of-month>Juillet", -4.3481250829982),
+                                     -5.377590547442544),
+                                    ("Mercredi<day-of-month> <named-month>", -4.684443366882599),
+                                    ("<day-of-week> <day-of-month>Juillet", -4.278978258774435),
                                     ("<time-of-day> - <time-of-day> (interval)intersect",
-                                     -5.44673737166631),
-                                    ("apr\232s <time-of-day>\224|vers <time-of-day>",
-                                     -5.041272263558145),
-                                    ("\224|vers <time-of-day>apr\232s <time-of-day>",
-                                     -5.44673737166631),
-                                    ("Fevrieryear", -5.44673737166631),
-                                    ("Jeudi<time-of-day> heures", -5.041272263558145),
+                                     -5.377590547442544),
+                                    ("Fevrieryear", -5.377590547442544),
+                                    ("Jeudi<time-of-day> heures", -4.97212543933438),
                                     ("apr\232s <time-of-day>le <day-of-month> (non ordinal)",
-                                     -5.041272263558145),
-                                    ("avant <time-of-day>Jeudi", -5.44673737166631),
+                                     -4.97212543933438),
+                                    ("avant <time-of-day>Jeudi", -5.377590547442544),
                                     ("de <datetime> - <datetime> (interval)<day-of-month> <named-month>",
-                                     -5.44673737166631),
+                                     -5.377590547442544),
                                     ("<dim time> <part-of-day><time-of-day> heures",
-                                     -5.44673737166631),
-                                    ("<time-of-day> heuresJeudi", -4.3481250829982)],
-                               n = 111}}),
+                                     -5.377590547442544),
+                                    ("<time-of-day> heuresJeudi", -4.278978258774435)],
+                               n = 100}}),
        ("Janvier",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -2025,32 +2013,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("apr\232s <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.9236708391717777, unseen = -4.219507705176107,
+                     ClassData{prior = -0.3677247801253174, unseen = -4.204692619390966,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect", -1.7197859696029658),
-                                    ("hh(:|h)mm (time-of-day)", -2.8183982582710754),
-                                    ("midi", -3.5115454388310208), ("day", -2.8183982582710754),
-                                    ("time-of-day (latent)", -2.8183982582710754),
-                                    ("hour", -1.4321038971511848), ("minute", -1.9021075263969205),
-                                    ("<time-of-day> heures", -2.8183982582710754),
-                                    ("le <time>", -3.1060803307228566),
+                                   [("intersect", -1.7047480922384253),
+                                    ("hh(:|h)mm (time-of-day)", -2.803360380906535),
+                                    ("midi", -3.4965075614664802), ("day", -2.803360380906535),
+                                    ("time-of-day (latent)", -2.803360380906535),
+                                    ("hour", -1.4170660197866443), ("minute", -1.8870696490323797),
+                                    ("<time-of-day> heures", -2.803360380906535),
+                                    ("le <time>", -3.0910424533583156),
                                     ("<hour-of-day> <integer> (as relative minutes)",
-                                     -2.5952547069568657)],
+                                     -2.580216829592325)],
                                n = 27},
                    koData =
-                     ClassData{prior = -0.5059356384717989, unseen = -4.564348191467836,
+                     ClassData{prior = -1.1786549963416462,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("demain", -3.1675825304806504),
-                                    ("intersect", -2.9444389791664407),
-                                    ("le <day-of-month> (non ordinal)", -3.8607297110405954),
-                                    ("midi", -1.3350010667323402), ("day", -2.9444389791664407),
-                                    ("time-of-day (latent)", -2.9444389791664407),
-                                    ("au d\233jeuner", -3.8607297110405954),
-                                    ("hour", -0.916290731874155),
-                                    ("<time-of-day> heures", -2.9444389791664407)],
-                               n = 41}}),
+                                   [("intersect", -2.4849066497880004),
+                                    ("le <day-of-month> (non ordinal)", -2.890371757896165),
+                                    ("day", -2.890371757896165),
+                                    ("time-of-day (latent)", -1.9740810260220096),
+                                    ("au d\233jeuner", -2.890371757896165),
+                                    ("hour", -1.0986122886681098),
+                                    ("<time-of-day> heures", -1.9740810260220096)],
+                               n = 12}}),
        ("dd/-mm",
         Classifier{okData =
                      ClassData{prior = -0.7375989431307791,
@@ -2507,29 +2495,27 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 13}}),
        ("avant <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -1.4469189829363254,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -1.3862943611198906, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.791759469228055),
-                                    ("hour", -1.2809338454620642),
-                                    ("<time-of-day> heures", -1.791759469228055)],
+                                   [("time-of-day (latent)", -1.6739764335716716),
+                                    ("hour", -1.1631508098056809),
+                                    ("<time-of-day> heures", -1.6739764335716716)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.2682639865946794,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -0.2876820724517809,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect", -2.890371757896165),
-                                    ("hh(:|h)mm (time-of-day)", -2.890371757896165),
-                                    ("hier", -2.890371757896165), ("day", -2.890371757896165),
-                                    ("time-of-day (latent)", -1.9740810260220096),
-                                    ("au d\233jeuner", -2.890371757896165),
-                                    ("hour", -1.1856236656577395), ("minute", -2.4849066497880004),
-                                    ("<time-of-day> heures", -1.9740810260220096),
+                                   [("intersect", -2.772588722239781),
+                                    ("hh(:|h)mm (time-of-day)", -2.772588722239781),
+                                    ("time-of-day (latent)", -1.8562979903656263),
+                                    ("au d\233jeuner", -2.772588722239781),
+                                    ("hour", -1.067840630001356), ("minute", -2.367123614131617),
+                                    ("<time-of-day> heures", -1.8562979903656263),
                                     ("<hour-of-day> <integer> (as relative minutes)",
-                                     -2.890371757896165)],
-                               n = 13}}),
+                                     -2.772588722239781)],
+                               n = 12}}),
        ("fin d'apr\232s-midi",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
diff --git a/Duckling/Ranking/Classifiers/HE_XX.hs b/Duckling/Ranking/Classifiers/HE_XX.hs
index 3bc85a3e..b0101acb 100644
--- a/Duckling/Ranking/Classifiers/HE_XX.hs
+++ b/Duckling/Ranking/Classifiers/HE_XX.hs
@@ -230,88 +230,87 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -4.867534450455582,
+                     ClassData{prior = -0.37320424588994294,
+                               unseen = -4.859812404361672,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -2.662587827025453),
-                                    ("daymonth", -3.250374491927572),
-                                    ("monthyear", -3.7612001156935624),
+                                   [("hourday", -2.6548056865833978),
+                                    ("daymonth", -3.242592351485517),
+                                    ("monthyear", -3.7534179752515073),
                                     ("the <day-of-month> (ordinal)in <named-month>",
-                                     -3.7612001156935624),
+                                     -3.7534179752515073),
                                     ("\1488\1493\1511\1496\1493\1489\1512year",
-                                     -4.1666652238017265),
-                                    ("intersect<time-of-day> am|pm", -4.1666652238017265),
-                                    ("<time> <part-of-day>\1489 <named-day>", -3.4735180432417816),
-                                    ("intersect by \",\"<time-of-day> am|pm", -3.250374491927572),
-                                    ("last <day-of-week> of <time>year", -4.1666652238017265),
-                                    ("dayday", -2.780370862681836),
+                                     -4.1588830833596715),
+                                    ("intersect<time-of-day> am|pm", -4.1588830833596715),
+                                    ("<time> <part-of-day>\1489 <named-day>", -3.4657359027997265),
+                                    ("intersect by \",\"<time-of-day> am|pm", -3.242592351485517),
+                                    ("last <day-of-week> of <time>year", -4.1588830833596715),
+                                    ("dayday", -2.772588722239781),
                                     ("the <day-of-month> (ordinal)\1489 <date>",
-                                     -3.7612001156935624),
-                                    ("dayyear", -2.374905754573672),
+                                     -3.7534179752515073),
+                                    ("dayyear", -2.367123614131617),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -3.7612001156935624),
-                                    ("\1489 <date>\1489 <named-day>", -4.1666652238017265),
+                                     -3.7534179752515073),
+                                    ("\1489 <date>\1489 <named-day>", -4.1588830833596715),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.1666652238017265),
+                                     -4.1588830833596715),
                                     ("absorption of , after named day<day-of-month> (ordinal) of <named-month>",
-                                     -4.1666652238017265),
+                                     -4.1588830833596715),
                                     ("<day-of-month> (ordinal) of <named-month>year",
-                                     -3.4735180432417816),
-                                    ("named-daynext <cycle>", -4.1666652238017265),
-                                    ("dayminute", -2.780370862681836),
+                                     -3.4657359027997265),
+                                    ("named-daynext <cycle>", -4.1588830833596715),
+                                    ("dayminute", -2.772588722239781),
                                     ("named-day<day-of-month> (ordinal) of <named-month>",
-                                     -4.1666652238017265),
-                                    ("named-day\1489 <date>", -4.1666652238017265),
+                                     -4.1588830833596715),
+                                    ("named-day\1489 <date>", -4.1588830833596715),
                                     ("absorption of , after named dayintersect",
-                                     -4.1666652238017265),
+                                     -4.1588830833596715),
                                     ("named-day<day-of-month> (non ordinal) of <named-month>",
-                                     -4.1666652238017265),
+                                     -4.1588830833596715),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -3.7612001156935624),
-                                    ("year<time-of-day> am|pm", -4.1666652238017265),
-                                    ("\1489 <date>\1489 <date>", -4.1666652238017265),
+                                     -3.7534179752515073),
+                                    ("year<time-of-day> am|pm", -4.1588830833596715),
+                                    ("\1489 <date>\1489 <date>", -4.1588830833596715),
                                     ("<day-of-month> (non ordinal) of <named-month>year",
-                                     -3.4735180432417816),
+                                     -3.4657359027997265),
                                     ("absorption of , after named day<day-of-month> (non ordinal) of <named-month>",
-                                     -4.1666652238017265),
-                                    ("dayweek", -3.7612001156935624),
-                                    ("\1502\1512\1509year", -4.1666652238017265),
-                                    ("<time> <part-of-day>\1489 <date>", -3.4735180432417816),
-                                    ("named-daythe <day-of-month> (ordinal)", -4.1666652238017265),
+                                     -4.1588830833596715),
+                                    ("dayweek", -3.7534179752515073),
+                                    ("\1502\1512\1509year", -4.1588830833596715),
+                                    ("<time> <part-of-day>\1489 <date>", -3.4657359027997265),
+                                    ("named-daythe <day-of-month> (ordinal)", -4.1588830833596715),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -3.7612001156935624),
-                                    ("yearminute", -4.1666652238017265)],
+                                     -3.7534179752515073),
+                                    ("yearminute", -4.1588830833596715)],
                                n = 42},
                    koData =
-                     ClassData{prior = -1.0986122886681098, unseen = -4.477336814478207,
+                     ClassData{prior = -1.1664348850068706, unseen = -4.418840607796598,
                                likelihoods =
                                  HashMap.fromList
-                                   [("in <named-month>year", -3.7727609380946383),
-                                    ("dayhour", -3.367295829986474),
-                                    ("year<hour-of-day> <integer>", -3.367295829986474),
-                                    ("daymonth", -3.079613757534693),
-                                    ("monthyear", -2.6741486494265287),
-                                    ("intersecthh:mm", -3.7727609380946383),
-                                    ("dayday", -3.7727609380946383),
-                                    ("intersect by \",\"hh:mm", -2.856470206220483),
-                                    ("\1488\1508\1512\1497\1500year", -3.7727609380946383),
-                                    ("named-dayin <named-month>", -3.7727609380946383),
-                                    ("dayminute", -2.386466576974748),
-                                    ("named-day\1489 <date>", -3.7727609380946383),
+                                   [("in <named-month>year", -3.713572066704308),
+                                    ("dayhour", -3.3081069585961433),
+                                    ("daymonth", -3.0204248861443626),
+                                    ("monthyear", -2.6149597780361984),
+                                    ("intersecthh:mm", -3.713572066704308),
+                                    ("dayday", -3.713572066704308),
+                                    ("intersect by \",\"hh:mm", -2.797281334830153),
+                                    ("\1488\1508\1512\1497\1500year", -3.713572066704308),
+                                    ("named-dayin <named-month>", -3.713572066704308),
+                                    ("dayminute", -2.327277705584417),
+                                    ("named-day\1489 <date>", -3.713572066704308),
                                     ("absorption of , after named dayintersect",
-                                     -3.7727609380946383),
-                                    ("yearhh:mm", -3.7727609380946383),
+                                     -3.713572066704308),
+                                    ("yearhh:mm", -3.713572066704308),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -3.7727609380946383),
-                                    ("\1502\1512\1509year", -3.367295829986474),
-                                    ("\1489 <date>year", -3.7727609380946383),
-                                    ("named-daythe <day-of-month> (ordinal)", -3.7727609380946383),
+                                     -3.713572066704308),
+                                    ("\1502\1512\1509year", -3.3081069585961433),
+                                    ("\1489 <date>year", -3.713572066704308),
+                                    ("named-daythe <day-of-month> (ordinal)", -3.713572066704308),
                                     ("absorption of , after named day\1497\1493\1500\1497",
-                                     -3.7727609380946383),
-                                    ("tomorrownoon", -3.367295829986474),
-                                    ("yearminute", -3.079613757534693)],
-                               n = 21}}),
+                                     -3.713572066704308),
+                                    ("tomorrownoon", -3.3081069585961433),
+                                    ("yearminute", -3.713572066704308)],
+                               n = 19}}),
        ("year (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -418,16 +417,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<hour-of-day> <integer>",
         Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)integer 10", -1.7047480922384253),
-                                    ("time-of-day (latent)integer (numeric)", -1.0116009116784799),
-                                    ("hour", -0.7884573603642702)],
-                               n = 4}}),
+                                   [("time-of-day (latent)integer 10", -0.6931471805599453),
+                                    ("hour", -0.6931471805599453)],
+                               n = 1}}),
        ("ordinal 19",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -587,7 +585,7 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -1.2809338454620642,
+                     ClassData{prior = -1.0986122886681098,
                                unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
@@ -595,13 +593,14 @@ classifiers
                                     ("integer 9", -1.3862943611198906)],
                                n = 5},
                    koData =
-                     ClassData{prior = -0.325422400434628, unseen = -2.833213344056216,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.2876820724517809),
-                                    ("integer (20..90)", -2.0794415416798357),
-                                    ("integer 9", -2.0794415416798357)],
-                               n = 13}}),
+                                   [("integer (numeric)", -0.3677247801253174),
+                                    ("integer (20..90)", -1.8718021769015913),
+                                    ("integer 9", -1.8718021769015913)],
+                               n = 10}}),
        ("year",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444,
@@ -922,17 +921,6 @@ classifiers
                    koData =
                      ClassData{prior = -infinity, unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [], n = 0}}),
-       ("<datetime> - <datetime> (interval)",
-        Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0},
-                   koData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("year<hour-of-day> <integer>", -0.6931471805599453),
-                                    ("yearminute", -0.6931471805599453)],
-                               n = 2}}),
        ("in <named-month>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.5649493574615367,
diff --git a/Duckling/Ranking/Classifiers/HR_XX.hs b/Duckling/Ranking/Classifiers/HR_XX.hs
index de383d19..a90f6b1f 100644
--- a/Duckling/Ranking/Classifiers/HR_XX.hs
+++ b/Duckling/Ranking/Classifiers/HR_XX.hs
@@ -274,24 +274,24 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> o'clock",
         Classifier{okData =
-                     ClassData{prior = -0.7308875085427924,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -3.4657359027997265,
                                likelihoods =
                                  HashMap.fromList
-                                   [("at <time-of-day>", -1.8870696490323797),
-                                    ("time-of-day (latent)", -1.2992829841302609),
-                                    ("until <time-of-day>", -2.803360380906535),
-                                    ("hour", -0.8574502318512216)],
+                                   [("at <time-of-day>", -1.824549292051046),
+                                    ("time-of-day (latent)", -1.2367626271489267),
+                                    ("until <time-of-day>", -2.740840023925201),
+                                    ("hour", -0.7949298748698876)],
                                n = 13},
                    koData =
-                     ClassData{prior = -0.6567795363890705, unseen = -3.58351893845611,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -3.4657359027997265,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> quarter", -2.8622008809294686),
-                                    ("time-of-day (latent)", -0.9903987040278769),
-                                    ("hour", -0.916290731874155), ("minute", -2.8622008809294686),
-                                    ("after <time-of-day>", -2.8622008809294686)],
-                               n = 14}}),
+                                   [("time-of-day (latent)", -0.8690378470236094),
+                                    ("hour", -0.7949298748698876),
+                                    ("after <time-of-day>", -2.740840023925201)],
+                               n = 13}}),
        ("January",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -348,213 +348,206 @@ classifiers
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4969802169439377, unseen = -6.093569770045136,
+                     ClassData{prior = -0.48165424646571087,
+                               unseen = -6.0844994130751715,
                                likelihoods =
                                  HashMap.fromList
                                    [("u <named-day><day-of-month>(ordinal) <named-month>",
-                                     -5.3981627015177525),
-                                    ("hourday", -4.992697593409589),
-                                    ("dd.mm<time-of-day> o'clock", -5.3981627015177525),
-                                    ("dayhour", -2.724014052091224),
-                                    ("daymonth", -3.606403232289698),
+                                     -5.389071729816501),
+                                    ("hourday", -4.983606621708336),
+                                    ("dd.mm<time-of-day> o'clock", -5.389071729816501),
+                                    ("dayhour", -2.714923080389972),
+                                    ("daymonth", -3.597312260588446),
                                     ("u <named-day><named-month> <day-of-month> (ordinal)",
-                                     -5.3981627015177525),
-                                    ("monthyear", -3.6934146092793276),
-                                    ("Wednesdayintersect", -5.3981627015177525),
-                                    ("christmasyear", -5.3981627015177525),
-                                    ("Wednesdaynext <cycle>", -5.3981627015177525),
-                                    ("u <named-day><time-of-day> o'clock", -5.3981627015177525),
-                                    ("<time> <part-of-day>u <named-day>", -4.011868340397862),
-                                    ("intersectat <time-of-day>", -5.3981627015177525),
-                                    ("Saturday<time> <part-of-day>", -4.992697593409589),
-                                    ("day before yesterdayat <time-of-day>", -4.705015520957807),
-                                    ("Marchyear", -5.3981627015177525),
+                                     -5.389071729816501),
+                                    ("monthyear", -3.6843236375780757),
+                                    ("Wednesdayintersect", -5.389071729816501),
+                                    ("christmasyear", -5.389071729816501),
+                                    ("Wednesdaynext <cycle>", -5.389071729816501),
+                                    ("u <named-day><time-of-day> o'clock", -5.389071729816501),
+                                    ("<time> <part-of-day>u <named-day>", -4.00277736869661),
+                                    ("intersectat <time-of-day>", -5.389071729816501),
+                                    ("Saturday<time> <part-of-day>", -4.983606621708336),
+                                    ("day before yesterdayat <time-of-day>", -4.695924549256556),
+                                    ("Marchyear", -5.389071729816501),
                                     ("<named-day> <day-of-month> (ordinal)September",
-                                     -4.992697593409589),
-                                    ("Saturdayat <time-of-day>", -4.992697593409589),
+                                     -4.983606621708336),
+                                    ("Saturdayat <time-of-day>", -4.983606621708336),
                                     ("between <time-of-day> and <time-of-day> (interval)u <named-day>",
-                                     -4.705015520957807),
+                                     -4.695924549256556),
                                     ("between <datetime> and <datetime> (interval)u <named-day>",
-                                     -4.705015520957807),
-                                    ("last <cycle>u <named-day>", -5.3981627015177525),
-                                    ("<time-of-day> o'clocktonight", -5.3981627015177525),
+                                     -4.695924549256556),
+                                    ("last <cycle>u <named-day>", -5.389071729816501),
+                                    ("<time-of-day> o'clocktonight", -5.389071729816501),
                                     ("from <datetime> - <datetime> (interval)u <named-day>",
-                                     -5.3981627015177525),
-                                    ("today<time> <part-of-day>", -4.992697593409589),
-                                    ("todayat <time-of-day>", -5.3981627015177525),
-                                    ("Thursday<time> timezone", -4.992697593409589),
+                                     -5.389071729816501),
+                                    ("today<time> <part-of-day>", -4.983606621708336),
+                                    ("todayat <time-of-day>", -5.389071729816501),
+                                    ("Thursday<time> timezone", -4.983606621708336),
                                     ("from <time-of-day> - <time-of-day> (interval)u <named-day>",
-                                     -5.3981627015177525),
-                                    ("next <cycle>u <named-day>", -5.3981627015177525),
-                                    ("dayday", -3.1468709029112576),
-                                    ("hourhour", -5.3981627015177525),
+                                     -5.389071729816501),
+                                    ("next <cycle>u <named-day>", -5.389071729816501),
+                                    ("dayday", -3.1377799312100056),
+                                    ("hourhour", -5.389071729816501),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.992697593409589),
+                                     -4.983606621708336),
                                     ("Thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.705015520957807),
-                                    ("dayyear", -3.8940853047414787),
+                                     -4.695924549256556),
+                                    ("dayyear", -3.884994333040227),
                                     ("Thursdaybetween <datetime> and <datetime> (interval)",
-                                     -4.705015520957807),
-                                    ("<time-of-day> o'clocktomorrow", -5.3981627015177525),
-                                    ("Thursday<time> <part-of-day>", -4.992697593409589),
+                                     -4.695924549256556),
+                                    ("<time-of-day> o'clocktomorrow", -5.389071729816501),
+                                    ("Thursday<time> <part-of-day>", -4.983606621708336),
                                     ("<time-of-day> - <time-of-day> (interval)u <named-day>",
-                                     -4.481871969643597),
+                                     -4.472780997942346),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.992697593409589),
+                                     -4.983606621708336),
                                     ("<datetime> - <datetime> (interval)u <named-day>",
-                                     -4.481871969643597),
+                                     -4.472780997942346),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.011868340397862),
-                                    ("day after tomorrow<time> <part-of-day>", -5.3981627015177525),
-                                    ("Thursdayhh:mm", -4.992697593409589),
-                                    ("minutemonth", -4.481871969643597),
-                                    ("day after tomorrowat <time-of-day>", -4.992697593409589),
+                                     -4.00277736869661),
+                                    ("day after tomorrow<time> <part-of-day>", -5.389071729816501),
+                                    ("Thursdayhh:mm", -4.983606621708336),
+                                    ("minutemonth", -4.472780997942346),
+                                    ("day after tomorrowat <time-of-day>", -4.983606621708336),
                                     ("absorption of , after named day<named-month> <day-of-month> (ordinal)",
-                                     -4.481871969643597),
+                                     -4.472780997942346),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.992697593409589),
+                                     -4.983606621708336),
                                     ("<named-day> <day-of-month> (ordinal)February",
-                                     -4.145399733022385),
-                                    ("this <cycle>u <named-day>", -4.992697593409589),
-                                    ("last <day-of-week> <time>year", -4.992697593409589),
-                                    ("dd.mmat <time-of-day>", -4.992697593409589),
+                                     -4.136308761321133),
+                                    ("this <cycle>u <named-day>", -4.983606621708336),
+                                    ("last <day-of-week> <time>year", -4.983606621708336),
+                                    ("dd.mmat <time-of-day>", -4.983606621708336),
                                     ("intersect<day-of-month>(ordinal) <named-month>",
-                                     -4.481871969643597),
+                                     -4.472780997942346),
                                     ("intersect<named-month> <day-of-month> (ordinal)",
-                                     -4.992697593409589),
-                                    ("Saturday<time-of-day> o'clock", -5.3981627015177525),
+                                     -4.983606621708336),
+                                    ("Saturday<time-of-day> o'clock", -5.389071729816501),
                                     ("day before yesterday<time-of-day> o'clock",
-                                     -5.3981627015177525),
+                                     -5.389071729816501),
                                     ("<time> <part-of-day><named-day> <day-of-month> (ordinal)",
-                                     -4.481871969643597),
-                                    ("dayminute", -3.2009381241815333),
-                                    ("u <named-day>at <time-of-day>", -4.992697593409589),
-                                    ("<time> <part-of-day>intersect", -3.5263605246161616),
-                                    ("u <named-day><time> <part-of-day>", -4.992697593409589),
-                                    ("Tuesdayu <named-month>", -5.3981627015177525),
-                                    ("intersectyear", -5.3981627015177525),
-                                    ("intersectSeptember", -4.481871969643597),
-                                    ("<ordinal> <cycle> of <time>year", -5.3981627015177525),
-                                    ("minuteday", -2.102325835513424),
+                                     -4.472780997942346),
+                                    ("dayminute", -3.1918471524802814),
+                                    ("u <named-day>at <time-of-day>", -4.983606621708336),
+                                    ("<time> <part-of-day>intersect", -3.5172695529149096),
+                                    ("u <named-day><time> <part-of-day>", -4.983606621708336),
+                                    ("Tuesdayu <named-month>", -5.389071729816501),
+                                    ("intersectyear", -5.389071729816501),
+                                    ("intersectSeptember", -4.472780997942346),
+                                    ("<ordinal> <cycle> of <time>year", -5.389071729816501),
+                                    ("minuteday", -2.093234863812172),
                                     ("absorption of , after named dayintersect",
-                                     -5.3981627015177525),
-                                    ("<time> <part-of-day>intersect by \",\"", -4.481871969643597),
-                                    ("Octoberyear", -4.299550412849643),
-                                    ("intersect by \",\"at <time-of-day>", -4.481871969643597),
+                                     -5.389071729816501),
+                                    ("<time> <part-of-day>intersect by \",\"", -4.472780997942346),
+                                    ("Octoberyear", -4.290459441148391),
+                                    ("intersect by \",\"at <time-of-day>", -4.472780997942346),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.299550412849643),
-                                    ("yearat <time-of-day>", -5.3981627015177525),
-                                    ("Septemberyear", -4.992697593409589),
+                                     -4.290459441148391),
+                                    ("yearat <time-of-day>", -5.389071729816501),
+                                    ("Septemberyear", -4.983606621708336),
                                     ("<time> <part-of-day>absorption of , after named day",
-                                     -4.705015520957807),
-                                    ("todaytonight", -5.3981627015177525),
-                                    ("weekday", -4.481871969643597),
-                                    ("dayweek", -5.3981627015177525),
-                                    ("weekyear", -4.992697593409589),
-                                    ("Wednesdayu <named-month>", -5.3981627015177525),
+                                     -4.695924549256556),
+                                    ("todaytonight", -5.389071729816501),
+                                    ("weekday", -4.472780997942346),
+                                    ("dayweek", -5.389071729816501),
+                                    ("weekyear", -4.983606621708336),
+                                    ("Wednesdayu <named-month>", -5.389071729816501),
                                     ("u <named-day><named-month> <day-of-month> (non ordinal)",
-                                     -5.3981627015177525),
-                                    ("u <named-month>year", -4.992697593409589),
-                                    ("last <cycle> of <time>year", -4.992697593409589),
+                                     -5.389071729816501),
+                                    ("u <named-month>year", -4.983606621708336),
+                                    ("last <cycle> of <time>year", -4.983606621708336),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -5.3981627015177525),
-                                    ("yearminute", -5.3981627015177525)],
+                                     -5.389071729816501),
+                                    ("yearminute", -5.389071729816501)],
                                n = 160},
                    koData =
-                     ClassData{prior = -0.9374250439481288, unseen = -5.796057750765372,
+                     ClassData{prior = -0.9617082115649478, unseen = -5.75890177387728,
                                likelihoods =
                                  HashMap.fromList
-                                   [("since <time-of-day>by <time>", -4.406719247264253),
+                                   [("since <time-of-day>by <time>", -4.3694478524670215),
                                     ("year<time-of-day> - <time-of-day> (interval)",
-                                     -5.099866427824199),
-                                    ("hourday", -4.183575695950044),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.099866427824199),
-                                    ("dayhour", -3.228064250922607),
-                                    ("July<day-of-month> (non ordinal) <named-month>",
-                                     -5.099866427824199),
-                                    ("daymonth", -2.9598002643279275),
-                                    ("monthday", -3.713572066704308),
-                                    ("monthyear", -3.4904285153900982),
-                                    ("yearhour", -4.694401319716034),
-                                    ("Wednesdayintersect", -5.099866427824199),
-                                    ("hh:mmu <named-day>", -4.001254139156089),
-                                    ("last <time>today", -4.406719247264253),
-                                    ("intersectat <time-of-day>", -5.099866427824199),
-                                    ("Marchyear", -4.694401319716034),
-                                    ("u <named-day>September", -5.099866427824199),
+                                     -5.062595033026967),
+                                    ("hourday", -4.146304301152812),
+                                    ("dayhour", -3.1907928561253756),
+                                    ("daymonth", -3.047692012484702),
+                                    ("monthday", -3.963982744358857),
+                                    ("monthyear", -3.4531571205928664),
+                                    ("yearhour", -4.657129924918802),
+                                    ("Wednesdayintersect", -5.062595033026967),
+                                    ("hh:mmu <named-day>", -3.963982744358857),
+                                    ("last <time>today", -4.3694478524670215),
+                                    ("intersectat <time-of-day>", -5.062595033026967),
+                                    ("Marchyear", -4.657129924918802),
+                                    ("u <named-day>September", -5.062595033026967),
                                     ("<named-day> <day-of-month> (ordinal)September",
-                                     -5.099866427824199),
-                                    ("Thursdayafter <time-of-day>", -4.183575695950044),
-                                    ("until <time-of-day>u <named-day>", -5.099866427824199),
-                                    ("since <time-of-day>u <named-day>", -4.694401319716034),
-                                    ("Sundayu <named-month>", -5.099866427824199),
-                                    ("absorption of , after named dayJuly", -4.694401319716034),
-                                    ("JanuaryWednesday", -5.099866427824199),
-                                    ("Marchintersect", -5.099866427824199),
-                                    ("dayday", -4.001254139156089),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.099866427824199),
-                                    ("monthmonth", -4.183575695950044),
-                                    ("hourhour", -5.099866427824199),
-                                    ("<time> <part-of-day>Thursday", -5.099866427824199),
+                                     -5.062595033026967),
+                                    ("Thursdayafter <time-of-day>", -4.146304301152812),
+                                    ("until <time-of-day>u <named-day>", -5.062595033026967),
+                                    ("since <time-of-day>u <named-day>", -4.657129924918802),
+                                    ("Sundayu <named-month>", -5.062595033026967),
+                                    ("absorption of , after named dayJuly", -4.657129924918802),
+                                    ("JanuaryWednesday", -5.062595033026967),
+                                    ("Marchintersect", -5.062595033026967),
+                                    ("dayday", -3.963982744358857),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.062595033026967),
+                                    ("monthmonth", -4.146304301152812),
+                                    ("hourhour", -5.062595033026967),
+                                    ("<time> <part-of-day>Thursday", -5.062595033026967),
                                     ("Thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.694401319716034),
-                                    ("dayyear", -4.406719247264253),
+                                     -4.657129924918802),
+                                    ("dayyear", -4.3694478524670215),
                                     ("Thursdaybetween <datetime> and <datetime> (interval)",
-                                     -4.694401319716034),
-                                    ("Thursday<time> <part-of-day>", -4.694401319716034),
+                                     -4.657129924918802),
+                                    ("Thursday<time> <part-of-day>", -4.657129924918802),
                                     ("<time-of-day> - <time-of-day> (interval)u <named-day>",
-                                     -5.099866427824199),
-                                    ("FebruaryWednesday", -5.099866427824199),
-                                    ("monthminute", -5.099866427824199),
+                                     -5.062595033026967),
+                                    ("FebruaryWednesday", -5.062595033026967),
+                                    ("monthminute", -5.062595033026967),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -5.099866427824199),
-                                    ("minutemonth", -4.694401319716034),
-                                    ("MarchTuesday", -4.694401319716034),
+                                     -5.062595033026967),
+                                    ("minutemonth", -4.657129924918802),
+                                    ("MarchTuesday", -4.657129924918802),
                                     ("absorption of , after named day<named-month> <day-of-month> (ordinal)",
-                                     -5.099866427824199),
+                                     -5.062595033026967),
                                     ("intersect<time-of-day> - <time-of-day> (interval)",
-                                     -5.099866427824199),
+                                     -5.062595033026967),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.406719247264253),
+                                     -4.3694478524670215),
                                     ("intersect by \",\"<time-of-day> - <time-of-day> (interval)",
-                                     -4.183575695950044),
-                                    ("Aprilyear", -5.099866427824199),
+                                     -4.146304301152812),
+                                    ("Aprilyear", -5.062595033026967),
                                     ("Julynumeral to|till|before <integer> (hour-of-day)",
-                                     -5.099866427824199),
-                                    ("Thursdaysince <time-of-day>", -4.183575695950044),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.099866427824199),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -5.099866427824199),
-                                    ("dayminute", -3.0849634072819336),
-                                    ("<time> <part-of-day>intersect", -4.694401319716034),
-                                    ("Tuesdayu <named-month>", -5.099866427824199),
-                                    ("intersectyear", -4.183575695950044),
-                                    ("after <time-of-day>by <time>", -4.406719247264253),
-                                    ("intersectSeptember", -4.694401319716034),
-                                    ("minuteday", -3.0849634072819336),
+                                     -5.062595033026967),
+                                    ("Thursdaysince <time-of-day>", -4.146304301152812),
+                                    ("dayminute", -3.047692012484702),
+                                    ("<time> <part-of-day>intersect", -4.657129924918802),
+                                    ("Tuesdayu <named-month>", -5.062595033026967),
+                                    ("intersectyear", -4.146304301152812),
+                                    ("after <time-of-day>by <time>", -4.3694478524670215),
+                                    ("intersectSeptember", -4.657129924918802),
+                                    ("minuteday", -3.047692012484702),
                                     ("absorption of , after named dayintersect",
-                                     -5.099866427824199),
-                                    ("<time> <part-of-day>intersect by \",\"", -5.099866427824199),
-                                    ("intersect by \",\"at <time-of-day>", -4.183575695950044),
+                                     -5.062595033026967),
+                                    ("<time> <part-of-day>intersect by \",\"", -5.062595033026967),
+                                    ("intersect by \",\"at <time-of-day>", -4.146304301152812),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -5.099866427824199),
-                                    ("yearat <time-of-day>", -5.099866427824199),
+                                     -5.062595033026967),
+                                    ("yearat <time-of-day>", -5.062595033026967),
                                     ("absorption of , after named daySeptember",
-                                     -4.694401319716034),
-                                    ("MarchMarch", -4.406719247264253),
-                                    ("after <time-of-day>u <named-day>", -4.694401319716034),
-                                    ("Wednesdayu <named-month>", -5.099866427824199),
-                                    ("absorption of , after named dayFebruary", -5.099866427824199),
-                                    ("hh:mmby <time>", -4.406719247264253),
-                                    ("u <named-month>year", -4.001254139156089),
-                                    ("minutesecond", -3.4904285153900982),
-                                    ("Tuesdayintersect", -5.099866427824199),
-                                    ("JanuaryTuesday", -5.099866427824199),
-                                    ("Sundayintersect", -5.099866427824199),
-                                    ("Mondayu <named-month>", -5.099866427824199)],
-                               n = 103}}),
+                                     -4.657129924918802),
+                                    ("MarchMarch", -4.3694478524670215),
+                                    ("after <time-of-day>u <named-day>", -4.657129924918802),
+                                    ("Wednesdayu <named-month>", -5.062595033026967),
+                                    ("absorption of , after named dayFebruary", -5.062595033026967),
+                                    ("hh:mmby <time>", -4.3694478524670215),
+                                    ("u <named-month>year", -3.963982744358857),
+                                    ("minutesecond", -3.4531571205928664),
+                                    ("Tuesdayintersect", -5.062595033026967),
+                                    ("JanuaryTuesday", -5.062595033026967),
+                                    ("Sundayintersect", -5.062595033026967),
+                                    ("Mondayu <named-month>", -5.062595033026967)],
+                               n = 99}}),
        ("early morning",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -666,15 +659,6 @@ classifiers
                                    [("hh:mmtime-of-day (latent)", -1.0986122886681098),
                                     ("minutehour", -1.0986122886681098)],
                                n = 1}}),
-       ("integer 21..99",
-        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)integer (numeric)", 0.0)],
-                               n = 1}}),
        ("yyyy-mm-dd",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -817,17 +801,6 @@ classifiers
                                     ("ordinals (first..19th)WednesdayOctober", -1.3862943611198906),
                                     ("ordinals (first..19th)TuesdaySeptember", -1.791759469228055)],
                                n = 3}}),
-       ("<hour-of-day> quarter",
-        Classifier{okData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0},
-                   koData =
-                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("time-of-day (latent)", -0.6931471805599453),
-                                    ("hour", -0.6931471805599453)],
-                               n = 1}}),
        ("April",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -1092,22 +1065,22 @@ classifiers
                                n = 3}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -0.898999234764094, unseen = -3.713572066704308,
+                     ClassData{prior = -0.8873031950009028, unseen = -3.713572066704308,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.2231435513142097),
                                     ("integer (0..19)", -2.0794415416798357)],
                                n = 35},
                    koData =
-                     ClassData{prior = -0.5225216635291818, unseen = -4.04305126783455,
+                     ClassData{prior = -0.5306282510621704, unseen = -4.02535169073515,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.4700036292457356),
-                                    ("integer (20..90)", -2.9267394020670396),
-                                    ("few", -3.332204510175204),
-                                    ("integer (0..19)", -1.3862943611198906),
-                                    ("a pair", -3.332204510175204)],
-                               n = 51}}),
+                                   [("integer (numeric)", -0.45198512374305727),
+                                    ("integer (20..90)", -2.908720896564361),
+                                    ("few", -3.3141860046725258),
+                                    ("integer (0..19)", -1.4423838277709342),
+                                    ("a pair", -3.3141860046725258)],
+                               n = 50}}),
        ("for <duration>",
         Classifier{okData =
                      ClassData{prior = -0.11441035117774422,
@@ -1744,22 +1717,15 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.9459101490553135,
+                     ClassData{prior = 0.0, unseen = -1.6094379124341003,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)April", -1.0986122886681098),
-                                    ("month", -1.0986122886681098)],
+                                   [("integer (numeric)April", -0.6931471805599453),
+                                    ("month", -0.6931471805599453)],
                                n = 1},
                    koData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -2.1972245773362196,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (numeric)August", -1.3862943611198906),
-                                    ("month", -0.9808292530117262),
-                                    ("integer (numeric)July", -1.3862943611198906)],
-                               n = 2}}),
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|next <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1780538303479458,
diff --git a/Duckling/Ranking/Classifiers/IT_XX.hs b/Duckling/Ranking/Classifiers/IT_XX.hs
index 6673e458..1e0550b4 100644
--- a/Duckling/Ranking/Classifiers/IT_XX.hs
+++ b/Duckling/Ranking/Classifiers/IT_XX.hs
@@ -1457,195 +1457,191 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("two time tokens in a row",
         Classifier{okData =
-                     ClassData{prior = -0.3456466128972542, unseen = -6.030685260261263,
+                     ClassData{prior = -0.3364722366212129, unseen = -6.023447592961032,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Lunedi<day-of-month> <named-month>", -4.929666231562589),
+                                   [("Lunedi<day-of-month> <named-month>", -4.922411060681417),
                                     ("<datetime> - <datetime> (interval)Giovedi",
-                                     -5.3351313396707525),
+                                     -5.327876168789581),
                                     ("intersect by \"di\", \"della\", \"del\"year (1000-2100 not latent)",
-                                     -4.929666231562589),
-                                    ("dayhour", -3.3202283191284883),
-                                    ("Febbraioyear (1000-2100 not latent)", -5.3351313396707525),
-                                    ("Settembreat <time-of-day>", -4.641984159110808),
-                                    ("daymonth", -2.562542617430972),
-                                    ("<named-day> <day-of-month>Settembre", -4.236519051002643),
+                                     -4.922411060681417),
+                                    ("dayhour", -3.3129731482473166),
+                                    ("Febbraioyear (1000-2100 not latent)", -5.327876168789581),
+                                    ("Settembreat <time-of-day>", -4.634728988229636),
+                                    ("daymonth", -2.5552874465498),
+                                    ("<named-day> <day-of-month>Settembre", -4.229263880121471),
                                     ("day of month (1st)intersect by \"di\", \"della\", \"del\"",
-                                     -4.641984159110808),
-                                    ("Ottobreyear (1000-2100 not latent)", -4.082368371175385),
-                                    ("monthyear", -3.195065176174482),
+                                     -4.634728988229636),
+                                    ("Ottobreyear (1000-2100 not latent)", -4.075113200294213),
+                                    ("monthyear", -3.18781000529331),
                                     ("day of month (1st)two time tokens in a row",
-                                     -4.236519051002643),
+                                     -4.229263880121471),
                                     ("<ordinal> <cycle> of <time>year (1000-2100 not latent)",
-                                     -5.3351313396707525),
-                                    ("christmasyear (1000-2100 not latent)", -4.929666231562589),
+                                     -5.327876168789581),
+                                    ("christmasyear (1000-2100 not latent)", -4.922411060681417),
                                     ("<named-day> <day-of-month>two time tokens in a row",
-                                     -4.929666231562589),
-                                    ("tomorrowdopo <time>", -5.3351313396707525),
+                                     -4.922411060681417),
+                                    ("tomorrowdopo <time>", -5.327876168789581),
                                     ("Giovedidalle <time-of-day> alle <time-of-day> (interval)",
-                                     -4.929666231562589),
+                                     -4.922411060681417),
                                     ("intersect by \"di\", \"della\", \"del\"<day-of-month> <named-month>",
-                                     -4.641984159110808),
+                                     -4.634728988229636),
                                     ("two time tokens separated by `di`Settembre",
-                                     -4.641984159110808),
-                                    ("day of month (1st)Maggio", -5.3351313396707525),
+                                     -4.634728988229636),
+                                    ("day of month (1st)Maggio", -5.327876168789581),
                                     ("tra il <integer> e il <integer> (interval)Luglio",
-                                     -4.929666231562589),
-                                    ("day of month (1st)Mercoledi", -5.3351313396707525),
-                                    ("dayday", -2.770181982209216),
-                                    ("il <time>year (1000-2100 not latent)", -5.3351313396707525),
-                                    ("Giovediat <time-of-day>", -4.929666231562589),
-                                    ("entro il <integer>Aprile", -5.3351313396707525),
-                                    ("dayyear", -3.195065176174482),
+                                     -4.922411060681417),
+                                    ("day of month (1st)Mercoledi", -5.327876168789581),
+                                    ("dayday", -2.7629268113280445),
+                                    ("il <time>year (1000-2100 not latent)", -5.327876168789581),
+                                    ("Giovediat <time-of-day>", -4.922411060681417),
+                                    ("entro il <integer>Aprile", -5.327876168789581),
+                                    ("dayyear", -3.18781000529331),
                                     ("tomorrowdalle <time-of-day> alle <time-of-day> (interval)",
-                                     -5.3351313396707525),
+                                     -5.327876168789581),
                                     ("hh(:|h)mm (time-of-day)two time tokens in a row",
-                                     -4.929666231562589),
-                                    ("dd[/-]mmat <time-of-day>", -5.3351313396707525),
+                                     -4.922411060681417),
+                                    ("dd[/-]mmat <time-of-day>", -5.327876168789581),
                                     ("dal <integer> al <integer> (interval)Luglio",
-                                     -4.929666231562589),
-                                    ("tomorrowdopo le <time-of-day>", -4.929666231562589),
-                                    ("monthminute", -4.641984159110808),
-                                    ("minutemonth", -3.8310539428944788),
-                                    ("il <time>Marzo", -5.3351313396707525),
-                                    ("<named-day> <day-of-month>Febbraio", -4.418840607796598),
+                                     -4.922411060681417),
+                                    ("tomorrowdopo le <time-of-day>", -4.922411060681417),
+                                    ("monthminute", -4.634728988229636),
+                                    ("minutemonth", -3.823798772013307),
+                                    ("il <time>Marzo", -5.327876168789581),
+                                    ("<named-day> <day-of-month>Febbraio", -4.411585436915426),
                                     ("hh(:|h)mm (time-of-day)<named-day> <day-of-month>",
-                                     -5.3351313396707525),
-                                    ("Settembreyear (1000-2100 not latent)", -4.929666231562589),
-                                    ("Mercoledi<day-of-month> <named-month>", -5.3351313396707525),
+                                     -5.327876168789581),
+                                    ("Settembreyear (1000-2100 not latent)", -4.922411060681417),
+                                    ("Mercoledi<day-of-month> <named-month>", -5.327876168789581),
                                     ("il <day-of-month> <named-month>at <time-of-day>",
-                                     -5.3351313396707525),
-                                    ("day of month (1st)Marzo", -4.929666231562589),
-                                    ("Sabato<day-of-month> <named-month>", -5.3351313396707525),
-                                    ("il <day-of-month>Settembre", -5.3351313396707525),
-                                    ("Venerdi<day-of-month> <named-month>", -4.418840607796598),
+                                     -5.327876168789581),
+                                    ("day of month (1st)Marzo", -4.922411060681417),
+                                    ("Sabato<day-of-month> <named-month>", -5.327876168789581),
+                                    ("il <day-of-month>Settembre", -5.327876168789581),
+                                    ("Venerdi<day-of-month> <named-month>", -4.411585436915426),
                                     ("<day-of-month> <named-month>at <time-of-day>",
-                                     -4.641984159110808),
+                                     -4.634728988229636),
                                     ("il <day-of-month> <named-month>year (1000-2100 not latent)",
-                                     -5.3351313396707525),
+                                     -5.327876168789581),
                                     ("two time tokens separated by `di`year (1000-2100 not latent)",
-                                     -4.929666231562589),
+                                     -4.922411060681417),
                                     ("last <cycle> of <time>year (1000-2100 not latent)",
-                                     -4.641984159110808),
+                                     -4.634728988229636),
                                     ("day of month (1st)two time tokens separated by `di`",
-                                     -4.641984159110808),
-                                    ("il <day-of-month>Febbraio", -4.418840607796598),
-                                    ("Gennaioyear (1000-2100 not latent)", -4.641984159110808),
-                                    ("the day after tomorrowat <time-of-day>", -4.929666231562589),
+                                     -4.634728988229636),
+                                    ("il <day-of-month>Febbraio", -4.411585436915426),
+                                    ("Gennaioyear (1000-2100 not latent)", -4.634728988229636),
+                                    ("the day after tomorrowat <time-of-day>", -4.922411060681417),
                                     ("two time tokens in a rowyear (1000-2100 not latent)",
-                                     -4.641984159110808),
+                                     -4.634728988229636),
                                     ("il <day-of-month>two time tokens in a row",
-                                     -4.929666231562589),
-                                    ("Giovedientro <time>", -5.3351313396707525),
+                                     -4.922411060681417),
+                                    ("Giovedientro <time>", -5.327876168789581),
                                     ("at <time-of-day>two time tokens in a row",
-                                     -4.929666231562589),
-                                    ("dayminute", -2.8502246898827526),
-                                    ("Venerditwo time tokens in a row", -4.929666231562589),
+                                     -4.922411060681417),
+                                    ("dayminute", -2.842969519001581),
+                                    ("Venerditwo time tokens in a row", -4.922411060681417),
                                     ("two time tokens in a rowat <time-of-day>",
-                                     -4.236519051002643),
-                                    ("minuteday", -3.137906762334534),
+                                     -4.229263880121471),
+                                    ("minuteday", -3.1306515914533617),
                                     ("two time tokens separated by `di`<day-of-month> <named-month>",
-                                     -4.641984159110808),
-                                    ("il <time>at <time-of-day>", -5.3351313396707525),
-                                    ("Sabatoat <time-of-day>", -5.3351313396707525),
+                                     -4.634728988229636),
+                                    ("il <time>at <time-of-day>", -5.327876168789581),
+                                    ("Sabatoat <time-of-day>", -5.327876168789581),
                                     ("intersect by \"di\", \"della\", \"del\"Settembre",
-                                     -4.641984159110808),
-                                    ("Domenica<day-of-month> <named-month>", -5.3351313396707525),
+                                     -4.634728988229636),
+                                    ("Domenica<day-of-month> <named-month>", -5.327876168789581),
                                     ("last <day-of-week> of <time>year (1000-2100 not latent)",
-                                     -5.3351313396707525),
-                                    ("immacolata concezioneat <time-of-day>", -5.3351313396707525),
+                                     -5.327876168789581),
+                                    ("immacolata concezioneat <time-of-day>", -5.327876168789581),
                                     ("at <time-of-day><named-day> <day-of-month>",
-                                     -5.3351313396707525),
-                                    ("day of month (1st)Martedi", -4.418840607796598),
-                                    ("at <time-of-day>Venerdi", -5.3351313396707525),
-                                    ("weekyear", -4.929666231562589),
-                                    ("Giovedi<time> timezone", -4.929666231562589),
+                                     -5.327876168789581),
+                                    ("day of month (1st)Martedi", -4.411585436915426),
+                                    ("at <time-of-day>Venerdi", -5.327876168789581),
+                                    ("weekyear", -4.922411060681417),
+                                    ("Giovedi<time> timezone", -4.922411060681417),
                                     ("Gioveditra il <datetime> e il <datetime> (interval)",
-                                     -4.929666231562589),
-                                    ("two time tokens in a rowSettembre", -4.929666231562589),
-                                    ("tomorrowat <time-of-day>", -5.3351313396707525),
+                                     -4.922411060681417),
+                                    ("two time tokens in a rowSettembre", -4.922411060681417),
+                                    ("tomorrowat <time-of-day>", -5.327876168789581),
                                     ("two time tokens in a row<day-of-month> <named-month>",
-                                     -4.929666231562589),
-                                    ("Giovedientro le <time-of-day>", -5.3351313396707525),
+                                     -4.922411060681417),
+                                    ("Giovedientro le <time-of-day>", -5.327876168789581),
                                     ("two time tokens in a rowin <named-month>",
-                                     -4.641984159110808),
-                                    ("Dicembreyear (1000-2100 not latent)", -4.641984159110808),
-                                    ("Marzoyear (1000-2100 not latent)", -5.3351313396707525),
-                                    ("Martediin <named-month>", -4.641984159110808),
+                                     -4.634728988229636),
+                                    ("Dicembreyear (1000-2100 not latent)", -4.634728988229636),
+                                    ("Marzoyear (1000-2100 not latent)", -5.327876168789581),
+                                    ("Martediin <named-month>", -4.634728988229636),
                                     ("the day after tomorrowentro le <time-of-day>",
-                                     -5.3351313396707525),
+                                     -5.327876168789581),
                                     ("<day-of-month> <named-month>year (1000-2100 not latent)",
-                                     -4.929666231562589),
+                                     -4.922411060681417),
                                     ("commemorazione dei defuntiat <time-of-day>",
-                                     -5.3351313396707525),
-                                    ("il <day-of-month>Marzo", -5.3351313396707525),
-                                    ("hh(:|h)mm (time-of-day)Venerdi", -5.3351313396707525)],
+                                     -5.327876168789581),
+                                    ("il <day-of-month>Marzo", -5.327876168789581),
+                                    ("hh(:|h)mm (time-of-day)Venerdi", -5.327876168789581)],
                                n = 155},
                    koData =
-                     ClassData{prior = -1.230188646456829, unseen = -5.455321115357702,
+                     ClassData{prior = -1.252762968495368, unseen = -5.424950017481403,
                                likelihoods =
                                  HashMap.fromList
                                    [("at <time-of-day>prossimi <unit-of-duration>",
-                                     -4.352426164897591),
+                                     -4.321922710604176),
                                     ("intersect by \"di\", \"della\", \"del\"year (1000-2100 not latent)",
-                                     -4.06474409244581),
-                                    ("dayhour", -2.1929419155442185),
-                                    ("Settembreat <time-of-day>", -3.8416005411316),
-                                    ("daymonth", -4.757891273005756),
-                                    ("monthday", -4.352426164897591),
-                                    ("monthyear", -4.757891273005756),
-                                    ("Luglio<day-of-month> <named-month>", -4.757891273005756),
+                                     -4.034240638152395),
+                                    ("dayhour", -2.1624384612508036),
+                                    ("Settembreat <time-of-day>", -3.8110970868381857),
+                                    ("daymonth", -4.727387818712341),
+                                    ("monthyear", -4.727387818712341),
                                     ("<named-day> <day-of-month>two time tokens in a row",
-                                     -4.06474409244581),
+                                     -4.034240638152395),
                                     ("Giovedidalle <time-of-day> alle <time-of-day> (interval)",
-                                     -4.757891273005756),
-                                    ("monthhour", -3.6592789843376456),
-                                    ("hourmonth", -4.352426164897591),
-                                    ("dayday", -4.757891273005756),
-                                    ("Febbraiothis <part-of-day>", -4.352426164897591),
-                                    ("Giovediat <time-of-day>", -3.8416005411316),
+                                     -4.727387818712341),
+                                    ("monthhour", -3.628775530044231),
+                                    ("hourmonth", -4.321922710604176),
+                                    ("dayday", -4.727387818712341),
+                                    ("Febbraiothis <part-of-day>", -4.321922710604176),
+                                    ("Giovediat <time-of-day>", -3.8110970868381857),
                                     ("tra il <datetime> e il <datetime> (interval)Luglio",
-                                     -4.352426164897591),
-                                    ("dayyear", -3.253813876229481),
+                                     -4.321922710604176),
+                                    ("dayyear", -3.2233104219360666),
                                     ("tomorrowdalle <time-of-day> alle <time-of-day> (interval)",
-                                     -4.757891273005756),
+                                     -4.727387818712341),
                                     ("<hour-of-day> and <relative minutes>Luglio",
-                                     -4.757891273005756),
-                                    ("tomorrowstanotte", -4.757891273005756),
-                                    ("dd[/-]mmat <time-of-day>", -4.757891273005756),
-                                    ("il <day-of-month>Luglio", -4.757891273005756),
-                                    ("tomorrowdopo le <time-of-day>", -4.352426164897591),
-                                    ("monthminute", -4.757891273005756),
-                                    ("minutemonth", -4.757891273005756),
+                                     -4.727387818712341),
+                                    ("tomorrowstanotte", -4.727387818712341),
+                                    ("dd[/-]mmat <time-of-day>", -4.727387818712341),
+                                    ("il <day-of-month>Luglio", -4.727387818712341),
+                                    ("tomorrowdopo le <time-of-day>", -4.321922710604176),
+                                    ("monthminute", -4.727387818712341),
+                                    ("minutemonth", -4.727387818712341),
                                     ("il <day-of-month> <named-month>at <time-of-day>",
-                                     -4.757891273005756),
-                                    ("dopo <time>at <time-of-day>", -4.757891273005756),
+                                     -4.727387818712341),
+                                    ("dopo <time>at <time-of-day>", -4.727387818712341),
                                     ("<day-of-month> <named-month>at <time-of-day>",
-                                     -3.8416005411316),
-                                    ("weekmonth", -4.352426164897591),
+                                     -3.8110970868381857),
+                                    ("weekmonth", -4.321922710604176),
                                     ("two time tokens separated by `di`year (1000-2100 not latent)",
-                                     -4.06474409244581),
-                                    ("hourweek", -4.352426164897591),
-                                    ("the day after tomorrowat <time-of-day>", -4.757891273005756),
+                                     -4.034240638152395),
+                                    ("hourweek", -4.321922710604176),
+                                    ("the day after tomorrowat <time-of-day>", -4.727387818712341),
                                     ("il <day-of-month>two time tokens in a row",
-                                     -4.757891273005756),
-                                    ("Agosto<day-of-month> <named-month>", -4.757891273005756),
-                                    ("dayminute", -2.886089096104164),
-                                    ("Venerditwo time tokens in a row", -4.06474409244581),
-                                    ("two time tokens in a rowat <time-of-day>",
-                                     -3.371596911885865),
-                                    ("minuteday", -4.757891273005756),
-                                    ("il <time>at <time-of-day>", -4.757891273005756),
-                                    ("Giovedidopo le <time-of-day>", -4.06474409244581),
-                                    ("the <cycle> of <time>Ottobre", -4.352426164897591),
+                                     -4.727387818712341),
+                                    ("dayminute", -2.855585641810749),
+                                    ("Venerditwo time tokens in a row", -4.034240638152395),
+                                    ("two time tokens in a rowat <time-of-day>", -3.34109345759245),
+                                    ("minuteday", -4.727387818712341),
+                                    ("il <time>at <time-of-day>", -4.727387818712341),
+                                    ("Giovedidopo le <time-of-day>", -4.034240638152395),
+                                    ("the <cycle> of <time>Ottobre", -4.321922710604176),
                                     ("Gioveditra il <datetime> e il <datetime> (interval)",
-                                     -4.757891273005756),
-                                    ("tomorrowat <time-of-day>", -4.757891273005756),
-                                    ("Martedidopo <time>", -4.757891273005756),
-                                    ("dopo <time>year (1000-2100 not latent)", -4.352426164897591),
-                                    ("hh(:|h)mm (time-of-day)Giovedi", -4.757891273005756),
-                                    ("Marzoyear (1000-2100 not latent)", -4.757891273005756)],
-                               n = 64}}),
+                                     -4.727387818712341),
+                                    ("tomorrowat <time-of-day>", -4.727387818712341),
+                                    ("Martedidopo <time>", -4.727387818712341),
+                                    ("dopo <time>year (1000-2100 not latent)", -4.321922710604176),
+                                    ("hh(:|h)mm (time-of-day)Giovedi", -4.727387818712341),
+                                    ("Marzoyear (1000-2100 not latent)", -4.727387818712341)],
+                               n = 62}}),
        ("heure (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
diff --git a/Duckling/Ranking/Classifiers/KO_XX.hs b/Duckling/Ranking/Classifiers/KO_XX.hs
index 0135ff6e..3caa70e7 100644
--- a/Duckling/Ranking/Classifiers/KO_XX.hs
+++ b/Duckling/Ranking/Classifiers/KO_XX.hs
@@ -188,136 +188,134 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 32}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.45041649597043076,
-                               unseen = -5.963579343618447,
+                     ClassData{prior = -0.43936665978384565,
+                               unseen = -5.958424693029782,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect<hour-of-day> <integer> (as relative minutes)",
-                                     -5.267858159063328),
-                                    ("intersectday-of-week", -4.169245870395218),
-                                    ("year<time> \47560\51648\47561 <cycle>", -4.862393050955164),
-                                    ("next <cycle>day-of-week", -4.351567427189173),
-                                    ("dayhour", -2.0291797068989474),
-                                    ("monthday", -2.434644815007112),
-                                    ("yearhour", -3.563110066824903),
-                                    ("<time> <part-of-day>time-of-day", -4.351567427189173),
-                                    ("intersectam|pm <time-of-day>", -3.0706335817271087),
-                                    ("next <cycle><time-of-day> am|pm", -5.267858159063328),
-                                    ("next <cycle>am|pm <time-of-day>", -4.862393050955164),
-                                    ("yearintersect", -2.9652730660692823),
+                                     -5.262690188904886),
+                                    ("intersectday-of-week", -4.164077900236776),
+                                    ("year<time> \47560\51648\47561 <cycle>", -4.857225080796721),
+                                    ("next <cycle>day-of-week", -4.3463994570307305),
+                                    ("dayhour", -2.0240117367405053),
+                                    ("monthday", -2.4294768448486694),
+                                    ("yearhour", -3.5579420966664603),
+                                    ("<time> <part-of-day>time-of-day", -4.3463994570307305),
+                                    ("intersectam|pm <time-of-day>", -3.065465611568666),
+                                    ("next <cycle><time-of-day> am|pm", -5.262690188904886),
+                                    ("next <cycle>am|pm <time-of-day>", -4.857225080796721),
+                                    ("yearintersect", -2.96010509591084),
                                     ("day-of-week<datetime> - <datetime> (interval)",
-                                     -4.351567427189173),
+                                     -4.3463994570307305),
                                     ("day-of-week<time-of-day> - <time-of-day> (interval)",
-                                     -4.351567427189173),
+                                     -4.3463994570307305),
                                     ("monthday with korean number - \51068\51068..\44396\51068",
-                                     -5.267858159063328),
-                                    ("dayday-of-week", -4.351567427189173),
-                                    ("this <cycle>day-of-week", -4.862393050955164),
-                                    ("day-of-week<time> timezone", -4.862393050955164),
-                                    ("monthhour", -3.563110066824903),
-                                    ("mm/ddam|pm <time-of-day>", -4.574710978503383),
-                                    ("todayam|pm <time-of-day>", -4.574710978503383),
+                                     -5.262690188904886),
+                                    ("dayday-of-week", -4.3463994570307305),
+                                    ("this <cycle>day-of-week", -4.857225080796721),
+                                    ("day-of-week<time> timezone", -4.857225080796721),
+                                    ("monthhour", -3.5579420966664603),
+                                    ("mm/ddam|pm <time-of-day>", -4.56954300834494),
+                                    ("todayam|pm <time-of-day>", -4.56954300834494),
                                     ("the day before yesterday - \50634\44536\51228am|pm <time-of-day>",
-                                     -4.351567427189173),
-                                    ("dayday", -3.6584202466292277),
-                                    ("hourhour", -3.763780762287054),
-                                    ("year<time> <ordinal> <cycle>", -5.267858159063328),
-                                    ("month<datetime> - <datetime> (interval)", -4.862393050955164),
-                                    ("dayam|pm <time-of-day>", -5.267858159063328),
-                                    ("day-of-weekam|pm <time-of-day>", -4.574710978503383),
-                                    ("time-of-dayafter <time-of-day>", -5.267858159063328),
-                                    ("monthminute", -4.862393050955164),
-                                    ("hourminute", -4.574710978503383),
-                                    ("intersectday", -4.169245870395218),
-                                    ("am|pm <time-of-day>after <time-of-day>", -5.267858159063328),
-                                    ("last <cycle>day-of-week", -4.574710978503383),
-                                    ("month<time> <part-of-day>", -4.862393050955164),
-                                    ("yearmonth", -3.1277919955670574),
-                                    ("dayminute", -3.563110066824903),
-                                    ("today<date>\50640", -5.267858159063328),
-                                    ("mm/dd<date>\50640", -5.267858159063328),
+                                     -4.3463994570307305),
+                                    ("dayday", -3.653252276470785),
+                                    ("hourhour", -3.7586127921286114),
+                                    ("year<time> <ordinal> <cycle>", -5.262690188904886),
+                                    ("month<datetime> - <datetime> (interval)", -4.857225080796721),
+                                    ("dayam|pm <time-of-day>", -5.262690188904886),
+                                    ("day-of-weekam|pm <time-of-day>", -4.56954300834494),
+                                    ("time-of-dayafter <time-of-day>", -5.262690188904886),
+                                    ("monthminute", -4.857225080796721),
+                                    ("hourminute", -4.56954300834494),
+                                    ("intersectday", -4.164077900236776),
+                                    ("am|pm <time-of-day>after <time-of-day>", -5.262690188904886),
+                                    ("last <cycle>day-of-week", -4.56954300834494),
+                                    ("month<time> <part-of-day>", -4.857225080796721),
+                                    ("yearmonth", -3.122624025408615),
+                                    ("dayminute", -3.5579420966664603),
+                                    ("today<date>\50640", -5.262690188904886),
+                                    ("mm/dd<date>\50640", -5.262690188904886),
                                     ("<hour-of-day> <integer> (as relative minutes)seconds",
-                                     -5.267858159063328),
-                                    ("<time> <part-of-day><date>\50640", -4.862393050955164),
-                                    ("monthintersect", -3.6584202466292277),
+                                     -5.262690188904886),
+                                    ("<time> <part-of-day><date>\50640", -4.857225080796721),
+                                    ("monthintersect", -3.653252276470785),
                                     ("year<time> \47560\51648\47561 <day-of-week>",
-                                     -5.267858159063328),
-                                    ("intersectintersect", -3.4760986898352733),
-                                    ("weekday", -3.6584202466292277),
+                                     -5.262690188904886),
+                                    ("intersectintersect", -3.4709307196768306),
+                                    ("weekday", -3.653252276470785),
                                     ("intersectday with korean number - \51068\51068..\44396\51068",
-                                     -4.862393050955164),
-                                    ("yearday", -3.4760986898352733),
-                                    ("day-of-weekhh:mm", -4.862393050955164),
-                                    ("yearweek", -4.862393050955164),
-                                    ("minutesecond", -5.267858159063328),
+                                     -4.857225080796721),
+                                    ("yearday", -3.4709307196768306),
+                                    ("day-of-weekhh:mm", -4.857225080796721),
+                                    ("yearweek", -4.857225080796721),
+                                    ("minutesecond", -5.262690188904886),
                                     ("<time> <part-of-day><hour-of-day> <integer> (as relative minutes)",
-                                     -4.862393050955164),
-                                    ("tomorrow<time-of-day> am|pm", -5.267858159063328),
-                                    ("tomorrowam|pm <time-of-day>", -4.862393050955164),
-                                    ("dayintersect", -4.862393050955164),
-                                    ("day-of-weektime-of-day", -5.267858159063328)],
+                                     -4.857225080796721),
+                                    ("tomorrow<time-of-day> am|pm", -5.262690188904886),
+                                    ("tomorrowam|pm <time-of-day>", -4.857225080796721),
+                                    ("dayintersect", -4.857225080796721),
+                                    ("day-of-weektime-of-day", -5.262690188904886)],
                                n = 174},
                    koData =
-                     ClassData{prior = -1.0143519450503697, unseen = -5.602118820879701,
+                     ClassData{prior = -1.0340737675305385, unseen = -5.575949103146316,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year<time> \47560\51648\47561 <cycle>", -4.90527477843843),
-                                    ("day-of-weekintersect", -4.90527477843843),
-                                    ("dayhour", -2.2662174488231708),
-                                    ("daymonth", -4.499809670330265),
-                                    ("monthday", -3.1135153092103742),
-                                    ("yearhour", -3.200526686200004),
-                                    ("<time> <part-of-day>time-of-day", -3.8066624897703196),
-                                    ("houryear", -4.212127597878484),
-                                    ("day-of-weekafter <time-of-day>", -4.90527477843843),
+                                   [("year<time> \47560\51648\47561 <cycle>", -4.879006851617819),
+                                    ("day-of-weekintersect", -4.879006851617819),
+                                    ("dayhour", -2.2399495220025605),
+                                    ("monthday", -3.174258759379394),
+                                    ("yearhour", -3.174258759379394),
+                                    ("<time> <part-of-day>time-of-day", -3.7803945629497093),
+                                    ("houryear", -4.185859671057874),
+                                    ("day-of-weekafter <time-of-day>", -4.879006851617819),
                                     ("after <time-of-day>by <time> - \44620\51648",
-                                     -4.90527477843843),
-                                    ("intersectam|pm <time-of-day>", -4.499809670330265),
-                                    ("intersect<time> <part-of-day>", -3.9889840465642745),
-                                    ("yearintersect", -3.033472601536838),
+                                     -4.879006851617819),
+                                    ("intersectam|pm <time-of-day>", -4.473541743509655),
+                                    ("intersect<time> <part-of-day>", -3.9627161197436642),
+                                    ("yearintersect", -3.007204674716228),
                                     ("day-of-week<time-of-day> - <time-of-day> (interval)",
-                                     -3.9889840465642745),
-                                    ("intersectmonth", -4.90527477843843),
-                                    ("time-of-day<duration> ago", -4.90527477843843),
-                                    ("this <cycle>day-of-week", -4.499809670330265),
-                                    ("intersecttime-of-day", -4.499809670330265),
-                                    ("monthhour", -3.033472601536838),
-                                    ("intersectlast <time>", -4.90527477843843),
-                                    ("dayday", -3.9889840465642745),
-                                    ("hourhour", -2.959364629383116),
+                                     -3.9627161197436642),
+                                    ("time-of-day<duration> ago", -4.879006851617819),
+                                    ("this <cycle>day-of-week", -4.473541743509655),
+                                    ("intersecttime-of-day", -4.473541743509655),
+                                    ("monthhour", -3.007204674716228),
+                                    ("intersectlast <time>", -4.879006851617819),
+                                    ("dayday", -3.9627161197436642),
+                                    ("hourhour", -2.933096702562506),
                                     ("month<datetime> - <datetime> (interval)",
-                                     -3.9889840465642745),
-                                    ("dayam|pm <time-of-day>", -4.499809670330265),
-                                    ("day-of-weekam|pm <time-of-day>", -4.90527477843843),
-                                    ("hourminute", -4.212127597878484),
+                                     -3.9627161197436642),
+                                    ("dayam|pm <time-of-day>", -4.473541743509655),
+                                    ("day-of-weekam|pm <time-of-day>", -4.879006851617819),
+                                    ("hourminute", -4.185859671057874),
                                     ("<time-of-day> - <time-of-day> (interval)last <time>",
-                                     -3.9889840465642745),
-                                    ("intersectday", -4.499809670330265),
-                                    ("<datetime> - <datetime> (interval)day", -3.9889840465642745),
-                                    ("month<time> <part-of-day>", -4.499809670330265),
-                                    ("yearmonth", -4.499809670330265),
-                                    ("dayminute", -3.9889840465642745),
-                                    ("<time> <part-of-day><date>\50640", -4.90527477843843),
-                                    ("last <time>time-of-day", -4.90527477843843),
-                                    ("monthintersect", -3.295836866004329),
-                                    ("hoursecond", -4.90527477843843),
-                                    ("year<time> <part-of-day>", -4.499809670330265),
-                                    ("intersectintersect", -3.6525118099430616),
-                                    ("weekday", -4.499809670330265),
+                                     -3.9627161197436642),
+                                    ("intersectday", -4.473541743509655),
+                                    ("<datetime> - <datetime> (interval)day", -3.9627161197436642),
+                                    ("month<time> <part-of-day>", -4.473541743509655),
+                                    ("yearmonth", -4.473541743509655),
+                                    ("dayminute", -3.9627161197436642),
+                                    ("<time> <part-of-day><date>\50640", -4.879006851617819),
+                                    ("last <time>time-of-day", -4.879006851617819),
+                                    ("monthintersect", -3.374929454841545),
+                                    ("hoursecond", -4.879006851617819),
+                                    ("year<time> <part-of-day>", -4.473541743509655),
+                                    ("intersectintersect", -3.6262438831224513),
+                                    ("weekday", -4.473541743509655),
                                     ("intersectday with korean number - \51068\51068..\44396\51068",
-                                     -4.499809670330265),
-                                    ("day<time> <part-of-day>", -4.90527477843843),
-                                    ("yearday", -3.8066624897703196),
-                                    ("day-of-weekhh:mm", -4.499809670330265),
+                                     -4.473541743509655),
+                                    ("day<time> <part-of-day>", -4.879006851617819),
+                                    ("yearday", -3.7803945629497093),
+                                    ("day-of-weekhh:mm", -4.473541743509655),
                                     ("<time-of-day> - <time-of-day> (interval)time-of-day",
-                                     -4.499809670330265),
-                                    ("intersectafter <time-of-day>", -3.4011973816621555),
+                                     -4.473541743509655),
+                                    ("intersectafter <time-of-day>", -3.374929454841545),
                                     ("<time> <part-of-day><hour-of-day> <integer> (as relative minutes)",
-                                     -4.499809670330265),
-                                    ("dayintersect", -4.90527477843843),
-                                    ("mm/ddafter <time-of-day>", -4.90527477843843),
-                                    ("todayafter <time-of-day>", -4.90527477843843)],
-                               n = 99}}),
+                                     -4.473541743509655),
+                                    ("dayintersect", -4.879006851617819),
+                                    ("mm/ddafter <time-of-day>", -4.879006851617819),
+                                    ("todayafter <time-of-day>", -4.879006851617819)],
+                               n = 96}}),
        ("season",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -454,26 +452,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (21..99) - TYPE 2",
         Classifier{okData =
-                     ClassData{prior = -0.587786664902119, unseen = -2.3978952727983707,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (20..90) - TYPE 2 and ordinalsinteger (1..4) - for ordinals",
-                                     -1.6094379124341003),
-                                    ("integer - TYPE 1: powers of teninteger - TYPE 1",
-                                     -1.2039728043259361),
-                                    ("compose by multiplicationinteger - TYPE 1",
-                                     -1.2039728043259361)],
-                               n = 5},
-                   koData =
-                     ClassData{prior = -0.8109302162163288,
+                     ClassData{prior = -0.4700036292457356,
                                unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)integer (numeric)", -1.5040773967762742),
+                                   [("integer (20..90) - TYPE 2 and ordinalsinteger (1..4) - for ordinals",
+                                     -1.5040773967762742),
                                     ("integer - TYPE 1: powers of teninteger - TYPE 1",
                                      -1.0986122886681098),
-                                    ("integer (numeric)integer - TYPE 1", -1.5040773967762742)],
-                               n = 4}}),
+                                    ("compose by multiplicationinteger - TYPE 1",
+                                     -1.0986122886681098)],
+                               n = 5},
+                   koData =
+                     ClassData{prior = -0.9808292530117262,
+                               unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer - TYPE 1: powers of teninteger - TYPE 1",
+                                     -0.8472978603872037),
+                                    ("integer (numeric)integer - TYPE 1", -1.252762968495368)],
+                               n = 3}}),
        ("Independence Movement Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/NB_XX.hs b/Duckling/Ranking/Classifiers/NB_XX.hs
index dd8918c5..54e19497 100644
--- a/Duckling/Ranking/Classifiers/NB_XX.hs
+++ b/Duckling/Ranking/Classifiers/NB_XX.hs
@@ -43,12 +43,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.7754834672205811, unseen = -4.912654885736052,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 134},
+                     ClassData{prior = -0.7905213445851217, unseen = -4.897839799950911,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 132},
                    koData =
-                     ClassData{prior = -0.6170774618231845,
-                               unseen = -5.0689042022202315,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 157}}),
+                     ClassData{prior = -0.6044190649512611, unseen = -5.081404364984463,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 159}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -98,13 +97,12 @@ classifiers
                                n = 3}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097,
-                               unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -0.916290731874155, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -304,145 +302,138 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.42187813774949445,
-                               unseen = -5.905361848054571,
+                     ClassData{prior = -0.38853604600771635,
+                               unseen = -5.883322388488279,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Onsdagthis <cycle>", -5.209486152841421),
-                                    ("Torsdag<time> timezone", -3.956723184346053),
+                                   [("Onsdagthis <cycle>", -5.187385805840755),
+                                    ("Torsdag<time> timezone", -3.934622837345387),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.110873864173311),
+                                     -4.088773517172645),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.110873864173311),
-                                    ("hourday", -5.209486152841421),
-                                    ("dayhour", -2.9581943542349256),
-                                    ("daymonth", -2.9581943542349256),
-                                    ("monthyear", -3.130044611161585),
+                                     -4.088773517172645),
+                                    ("hourday", -5.187385805840755), ("dayhour", -2.93609400723426),
+                                    ("daymonth", -2.93609400723426),
+                                    ("monthyear", -3.107944264160919),
                                     ("Torsdagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.209486152841421),
-                                    ("Mandagon <date>", -4.804021044733257),
-                                    ("intersecthh:mm", -5.209486152841421),
+                                     -5.187385805840755),
+                                    ("Mandagon <date>", -4.78192069773259),
+                                    ("intersecthh:mm", -5.187385805840755),
                                     ("Torsdagbetween <datetime> and <datetime> (interval)",
-                                     -5.209486152841421),
-                                    ("Torsdagat <time-of-day>", -4.293195420967266),
-                                    ("on <date>Februar", -4.804021044733257),
-                                    ("Marsyear", -4.804021044733257),
+                                     -5.187385805840755),
+                                    ("Torsdagat <time-of-day>", -4.2710950739666),
+                                    ("on <date>Februar", -4.78192069773259),
+                                    ("Marsyear", -4.78192069773259),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.804021044733257),
-                                    ("Oktoberyear", -3.6000482404073204),
+                                     -4.78192069773259),
+                                    ("Oktoberyear", -3.577947893406655),
                                     ("Torsdagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.804021044733257),
+                                     -4.78192069773259),
                                     ("Torsdagfrom <datetime> - <datetime> (interval)",
-                                     -4.804021044733257),
-                                    ("Mandagintersect", -4.804021044733257),
-                                    ("last <day-of-week> of <time>year", -4.804021044733257),
-                                    ("intersectFebruar", -4.804021044733257),
-                                    ("todayat <time-of-day>", -4.804021044733257),
-                                    ("dayday", -3.06941998934515),
-                                    ("dd/mmat <time-of-day>", -4.293195420967266),
-                                    ("intersect by \",\"hh:mm", -4.293195420967266),
-                                    ("dayyear", -3.3376839759398296),
-                                    ("tomorrow<time-of-day> sharp", -4.804021044733257),
+                                     -4.78192069773259),
+                                    ("Mandagintersect", -4.78192069773259),
+                                    ("last <day-of-week> of <time>year", -4.78192069773259),
+                                    ("intersectFebruar", -4.78192069773259),
+                                    ("todayat <time-of-day>", -4.78192069773259),
+                                    ("dayday", -3.047319642344484),
+                                    ("dd/mmat <time-of-day>", -4.2710950739666),
+                                    ("intersect by \",\"hh:mm", -4.2710950739666),
+                                    ("dayyear", -3.4826377136023297),
+                                    ("tomorrow<time-of-day> sharp", -4.78192069773259),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.804021044733257),
+                                     -4.78192069773259),
                                     ("Onsdag<named-month> <day-of-month> (non ordinal)",
-                                     -5.209486152841421),
-                                    ("Onsdagthis <time>", -4.516338972281476),
+                                     -5.187385805840755),
+                                    ("Onsdagthis <time>", -4.4942386252808095),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.110873864173311),
-                                    ("tomorrowuntil <time-of-day>", -4.804021044733257),
+                                     -4.088773517172645),
+                                    ("tomorrowuntil <time-of-day>", -4.78192069773259),
                                     ("S\248ndag<day-of-month> (non ordinal) <named-month>",
-                                     -5.209486152841421),
+                                     -5.187385805840755),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.516338972281476),
-                                    ("the <day-of-month> (ordinal)Februar", -4.804021044733257),
-                                    ("after <time-of-day>at <time-of-day>", -4.804021044733257),
-                                    ("the <day-of-month> (ordinal)Mars", -4.293195420967266),
+                                     -4.4942386252808095),
+                                    ("the <day-of-month> (ordinal)Februar", -4.78192069773259),
+                                    ("after <time-of-day>at <time-of-day>", -4.78192069773259),
+                                    ("the <day-of-month> (ordinal)Mars", -4.2710950739666),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.804021044733257),
-                                    ("Mandagthe <day-of-month> (ordinal)", -5.209486152841421),
-                                    ("Mandagthis <cycle>", -5.209486152841421),
-                                    ("Tirsdagthis <time>", -4.804021044733257),
-                                    ("tomorrowafter <time-of-day>", -4.804021044733257),
-                                    ("Tirsdagthis <cycle>", -5.209486152841421),
+                                     -4.78192069773259),
+                                    ("Mandagthe <day-of-month> (ordinal)", -5.187385805840755),
+                                    ("Mandagthis <cycle>", -5.187385805840755),
+                                    ("Tirsdagthis <time>", -4.78192069773259),
+                                    ("tomorrowafter <time-of-day>", -4.78192069773259),
+                                    ("Tirsdagthis <cycle>", -5.187385805840755),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.293195420967266),
-                                    ("dayminute", -2.644536795379884),
+                                     -4.2710950739666),
+                                    ("dayminute", -2.622436448379218),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.516338972281476),
-                                    ("on <date>Mars", -4.293195420967266),
-                                    ("<ordinal> <cycle> of <time>year", -4.804021044733257),
-                                    ("minuteday", -2.606796467397037),
+                                     -4.4942386252808095),
+                                    ("on <date>Mars", -4.2710950739666),
+                                    ("<ordinal> <cycle> of <time>year", -4.78192069773259),
+                                    ("minuteday", -2.584696120396371),
                                     ("absorption of , after named dayintersect",
-                                     -5.209486152841421),
-                                    ("yearhh:mm", -5.209486152841421),
-                                    ("Onsdagnext <cycle>", -5.209486152841421),
+                                     -5.187385805840755),
+                                    ("yearhh:mm", -5.187385805840755),
+                                    ("Onsdagnext <cycle>", -5.187385805840755),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.804021044733257),
-                                    ("dd/mmyear", -4.804021044733257),
-                                    ("Septemberyear", -4.293195420967266),
-                                    ("at <time-of-day>on <date>", -5.209486152841421),
+                                     -4.78192069773259),
+                                    ("Septemberyear", -4.2710950739666),
+                                    ("at <time-of-day>on <date>", -5.187385805840755),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.209486152841421),
+                                     -5.187385805840755),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.209486152841421),
-                                    ("dayweek", -4.110873864173311),
-                                    ("weekyear", -4.293195420967266),
-                                    ("hh:mmtomorrow", -4.516338972281476),
-                                    ("tomorrowat <time-of-day>", -3.956723184346053),
-                                    ("at <time-of-day>tomorrow", -4.804021044733257),
-                                    ("last <cycle> of <time>year", -4.293195420967266),
+                                     -5.187385805840755),
+                                    ("dayweek", -4.088773517172645), ("weekyear", -4.2710950739666),
+                                    ("hh:mmtomorrow", -4.4942386252808095),
+                                    ("tomorrowat <time-of-day>", -3.934622837345387),
+                                    ("at <time-of-day>tomorrow", -4.78192069773259),
+                                    ("last <cycle> of <time>year", -4.2710950739666),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.804021044733257),
-                                    ("yearminute", -5.209486152841421)],
-                               n = 141},
+                                     -4.78192069773259),
+                                    ("yearminute", -5.187385805840755)],
+                               n = 139},
                    koData =
-                     ClassData{prior = -1.066572934923493, unseen = -5.4510384535657,
+                     ClassData{prior = -1.1333552371119826,
+                               unseen = -5.3612921657094255,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.0488420988679397),
-                                    ("daymonth", -2.1509005056619808),
-                                    ("monthday", -3.8372994592322094),
-                                    ("monthyear", -3.8372994592322094),
+                                   [("dayhour", -2.9586910018736416),
+                                    ("daymonth", -2.2210920587428626),
+                                    ("monthyear", -3.747148362237912),
                                     ("Torsdagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.7535901911063645),
-                                    ("Mandagon <date>", -4.7535901911063645),
+                                     -4.663439094112067),
+                                    ("Mandagon <date>", -4.663439094112067),
                                     ("Torsdagbetween <datetime> and <datetime> (interval)",
-                                     -4.7535901911063645),
-                                    ("Torsdagat <time-of-day>", -3.2495127943300903),
-                                    ("absorption of , after named dayFebruar", -4.060443010546419),
-                                    ("Marsyear", -4.060443010546419),
+                                     -4.663439094112067),
+                                    ("Torsdagat <time-of-day>", -3.159361697335793),
+                                    ("absorption of , after named dayFebruar", -3.970291913552122),
+                                    ("Marsyear", -3.970291913552122),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.5008272226109964),
+                                     -3.4106761256166993),
                                     ("Torsdagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.7535901911063645),
+                                     -4.663439094112067),
                                     ("Torsdagfrom <datetime> - <datetime> (interval)",
-                                     -4.7535901911063645),
-                                    ("OnsdagFebruar", -4.7535901911063645),
-                                    ("absorption of , after named dayJuli", -4.3481250829982),
-                                    ("dd/mmat <time-of-day>", -3.8372994592322094),
-                                    ("hourhour", -3.5008272226109964),
-                                    ("dayyear", -3.5008272226109964),
-                                    ("Onsdagthis <time>", -3.5008272226109964),
+                                     -4.663439094112067),
+                                    ("OnsdagFebruar", -4.663439094112067),
+                                    ("absorption of , after named dayJuli", -4.257973986003902),
+                                    ("dd/mmat <time-of-day>", -3.747148362237912),
+                                    ("hourhour", -3.4106761256166993),
+                                    ("dayyear", -3.4106761256166993),
+                                    ("Onsdagthis <time>", -3.4106761256166993),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.3481250829982),
-                                    ("Aprilyear", -4.7535901911063645),
-                                    ("Tirsdagthis <time>", -3.8372994592322094),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -3.8372994592322094),
-                                    ("until <time-of-day>on <date>", -4.7535901911063645),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -3.8372994592322094),
-                                    ("Torsdaghh:mm", -4.3481250829982),
-                                    ("dayminute", -3.0488420988679397),
-                                    ("minuteday", -3.2495127943300903),
-                                    ("hh:mmon <date>", -3.367295829986474),
-                                    ("this <part-of-day>until <time-of-day>", -4.3481250829982),
-                                    ("S\248ndagthis <time>", -3.8372994592322094),
-                                    ("tomorrownoon", -4.7535901911063645),
-                                    ("this <time>until <time-of-day>", -4.3481250829982),
-                                    ("Mandagthis <time>", -4.3481250829982)],
-                               n = 74}}),
+                                     -4.257973986003902),
+                                    ("Aprilyear", -4.663439094112067),
+                                    ("Tirsdagthis <time>", -3.747148362237912),
+                                    ("until <time-of-day>on <date>", -4.663439094112067),
+                                    ("Torsdaghh:mm", -4.257973986003902),
+                                    ("dayminute", -2.9586910018736416),
+                                    ("minuteday", -3.159361697335793),
+                                    ("hh:mmon <date>", -3.2771447329921766),
+                                    ("this <part-of-day>until <time-of-day>", -4.257973986003902),
+                                    ("S\248ndagthis <time>", -3.747148362237912),
+                                    ("tomorrownoon", -4.663439094112067),
+                                    ("this <time>until <time-of-day>", -4.257973986003902),
+                                    ("Mandagthis <time>", -4.257973986003902)],
+                               n = 66}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.890371757896165,
@@ -926,13 +917,14 @@ classifiers
                                n = 58}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.1431008436406733, unseen = -3.332204510175204,
+                     ClassData{prior = -0.2231435513142097, unseen = -3.258096538021482,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 26},
+                               n = 24},
                    koData =
-                     ClassData{prior = -2.0149030205422647, unseen = -1.791759469228055,
+                     ClassData{prior = -1.6094379124341003,
+                               unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 6}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.833213344056216,
@@ -1479,23 +1471,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -0.10536051565782628,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Februarinteger (numeric)", -1.3437347467010947),
-                                    ("Aprilinteger (numeric)", -2.4423470353692043),
-                                    ("month", -0.832909122935104),
-                                    ("Juliinteger (numeric)", -1.749199854809259)],
+                                   [("Februarinteger (numeric)", -1.2992829841302609),
+                                    ("Aprilinteger (numeric)", -2.3978952727983707),
+                                    ("month", -0.7884573603642702),
+                                    ("Juliinteger (numeric)", -1.7047480922384253)],
                                n = 9},
                    koData =
-                     ClassData{prior = -1.0296194171811581, unseen = -2.772588722239781,
+                     ClassData{prior = -2.3025850929940455,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Augustinteger (numeric)", -1.0986122886681098),
-                                    ("Aprilinteger (numeric)", -2.0149030205422647),
-                                    ("month", -0.916290731874155)],
-                               n = 5}}),
+                                   [("Aprilinteger (numeric)", -1.0986122886681098),
+                                    ("month", -1.0986122886681098)],
+                               n = 1}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
diff --git a/Duckling/Ranking/Classifiers/NL_BE.hs b/Duckling/Ranking/Classifiers/NL_BE.hs
index 384af325..c815f67f 100644
--- a/Duckling/Ranking/Classifiers/NL_BE.hs
+++ b/Duckling/Ranking/Classifiers/NL_BE.hs
@@ -42,11 +42,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.7090205297162354, unseen = -4.844187086458591,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 125},
+                     ClassData{prior = -0.7170527014134996, unseen = -4.836281906951478,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 124},
                    koData =
-                     ClassData{prior = -0.6775218626568645, unseen = -4.875197323201151,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 129}}),
+                     ClassData{prior = -0.6697998165629542, unseen = -4.882801922586371,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 130}}),
        ("exactly <time-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -139,12 +139,11 @@ classifiers
                                n = 10}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.4307829160924542, unseen = -2.70805020110221,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
+                     ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.0498221244986778,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
+                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -389,258 +388,247 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.29944691403136736,
-                               unseen = -6.180016653652572,
+                     ClassData{prior = -0.2832077920568599, unseen = -6.163314804034641,
                                likelihoods =
                                  HashMap.fromList
-                                   [("last <cycle>sunday", -5.484796933490655),
-                                    ("Koningsdagyear", -5.484796933490655),
-                                    ("hourday", -4.386184644822546),
+                                   [("last <cycle>sunday", -5.4680601411351315),
+                                    ("Koningsdagyear", -5.4680601411351315),
+                                    ("hourday", -4.3694478524670215),
                                     ("on a named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month><time-of-day>  o'clock",
-                                     -5.484796933490655),
-                                    ("dayhour", -2.3493027175615055),
-                                    ("daymonth", -4.5685062016165),
-                                    ("next <cycle>friday", -5.484796933490655),
-                                    ("monthyear", -3.8753590210565547),
+                                     -5.4680601411351315),
+                                    ("dayhour", -2.3325659252059814),
+                                    ("daymonth", -4.551769409260976),
+                                    ("next <cycle>friday", -5.4680601411351315),
+                                    ("monthyear", -3.858622228701031),
                                     ("friday<day-of-month> (non ordinal) <named-month>",
-                                     -5.079331825382491),
-                                    ("yearhour", -5.484796933490655),
-                                    ("intersect<time-of-day>  o'clock", -4.791649752930709),
-                                    ("tuesdaythis <cycle>", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("yearhour", -5.4680601411351315),
+                                    ("intersect<time-of-day>  o'clock", -4.774912960575186),
+                                    ("tuesdaythis <cycle>", -5.4680601411351315),
                                     ("on a named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
-                                    ("saturday<time-of-day>  o'clock", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("saturday<time-of-day>  o'clock", -5.4680601411351315),
                                     ("absorption of , after named daydd/mm/yyyy",
-                                     -5.079331825382491),
-                                    ("<time-of-day> am|pmintersect", -5.484796933490655),
-                                    ("intersect<time> <part-of-day>", -4.791649752930709),
-                                    ("Marchyear", -5.484796933490655),
-                                    ("saturdayat <time-of-day>", -5.079331825382491),
-                                    ("saturday<time> <part-of-day>", -5.079331825382491),
-                                    ("dd/mm<time-of-day>  o'clock", -5.484796933490655),
-                                    ("on a named-dayat <time-of-day>", -4.791649752930709),
-                                    ("today<time-of-day>  o'clock", -5.484796933490655),
-                                    ("at <time-of-day>on a named-day", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("<time-of-day> am|pmintersect", -5.4680601411351315),
+                                    ("intersect<time> <part-of-day>", -4.774912960575186),
+                                    ("Marchyear", -5.4680601411351315),
+                                    ("saturdayat <time-of-day>", -5.062595033026967),
+                                    ("saturday<time> <part-of-day>", -5.062595033026967),
+                                    ("dd/mm<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("on a named-dayat <time-of-day>", -4.774912960575186),
+                                    ("today<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("at <time-of-day>on a named-day", -5.4680601411351315),
                                     ("on a named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("intersect by ','year", -5.484796933490655),
-                                    ("on <date><time-of-day>  o'clock", -4.791649752930709),
-                                    ("next <cycle>monday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("intersect by ','year", -5.4680601411351315),
+                                    ("on <date><time-of-day>  o'clock", -4.774912960575186),
+                                    ("next <cycle>monday", -5.4680601411351315),
                                     ("on a named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("exactly <time-of-day>tomorrow", -5.484796933490655),
-                                    ("on a named-day<time> <part-of-day>", -5.079331825382491),
-                                    ("monthhour", -4.5685062016165),
+                                     -5.4680601411351315),
+                                    ("exactly <time-of-day>tomorrow", -5.4680601411351315),
+                                    ("on a named-day<time> <part-of-day>", -5.062595033026967),
+                                    ("monthhour", -4.551769409260976),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("last <day-of-week> of <time>year", -5.484796933490655),
-                                    ("on a named-day<time-of-day>  o'clock", -5.484796933490655),
-                                    ("next <cycle>March", -5.484796933490655),
-                                    ("todayat <time-of-day>", -4.791649752930709),
+                                     -5.4680601411351315),
+                                    ("last <day-of-week> of <time>year", -5.4680601411351315),
+                                    ("on a named-day<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("next <cycle>March", -5.4680601411351315),
+                                    ("todayat <time-of-day>", -4.774912960575186),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("on <date>at <time-of-day>", -4.791649752930709),
-                                    ("thursday<time> timezone", -5.079331825382491),
-                                    ("on <date>about <time-of-day>", -4.791649752930709),
-                                    ("dayday", -3.1822118404966093),
-                                    ("on <date><time> <part-of-day>", -4.5685062016165),
-                                    ("dd/mmabout <time-of-day>", -5.079331825382491),
-                                    ("<day-of-month> (ordinal)intersect", -5.484796933490655),
-                                    ("hourhour", -4.386184644822546),
+                                     -5.4680601411351315),
+                                    ("on <date>at <time-of-day>", -4.774912960575186),
+                                    ("thursday<time> timezone", -5.062595033026967),
+                                    ("on <date>about <time-of-day>", -4.774912960575186),
+                                    ("dayday", -3.1654750481410856),
+                                    ("on <date><time> <part-of-day>", -4.551769409260976),
+                                    ("dd/mmabout <time-of-day>", -5.062595033026967),
+                                    ("<day-of-month> (ordinal)intersect", -5.4680601411351315),
+                                    ("hourhour", -4.3694478524670215),
                                     ("saturday<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("thursdayat <time-of-day>", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("thursdayat <time-of-day>", -5.4680601411351315),
                                     ("today/tomorrow/yesterday afternoon<hour-of-day> <integer> (as relative minutes)",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.386184644822546),
-                                    ("dayyear", -3.405355391810819),
-                                    ("tuesdayafter <duration>", -5.484796933490655),
-                                    ("tomorrow<time-of-day>  o'clock", -5.484796933490655),
-                                    ("<time-of-day>  o'clocktomorrow", -4.791649752930709),
+                                     -4.3694478524670215),
+                                    ("dayyear", -3.4531571205928664),
+                                    ("tuesdayafter <duration>", -5.4680601411351315),
+                                    ("tomorrow<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("<time-of-day>  o'clocktomorrow", -4.774912960575186),
                                     ("<day-of-month> (non ordinal) <named-month>intersect",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.484796933490655),
-                                    ("<day-of-month> (ordinal)tuesday", -5.484796933490655),
-                                    ("hourminute", -4.791649752930709),
-                                    ("thursdayhh:mm", -5.484796933490655),
-                                    ("this <cycle>wednesday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("<day-of-month> (ordinal)tuesday", -5.4680601411351315),
+                                    ("hourminute", -4.774912960575186),
+                                    ("thursdayhh:mm", -5.4680601411351315),
+                                    ("this <cycle>wednesday", -5.4680601411351315),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month><time> <part-of-day>",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("on <date><day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("Aprilabout <time-of-day>", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("Aprilabout <time-of-day>", -5.4680601411351315),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("<day-of-month> (ordinal)February", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("<day-of-month> (ordinal)February", -5.4680601411351315),
                                     ("thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.791649752930709),
+                                     -4.774912960575186),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.5685062016165),
+                                     -4.551769409260976),
                                     ("today/tomorrow/yesterday evening<time-of-day>  o'clock",
-                                     -5.484796933490655),
-                                    ("fridayintersect", -4.791649752930709),
+                                     -5.4680601411351315),
+                                    ("fridayintersect", -4.774912960575186),
                                     ("on <date><time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("on <date><datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("this <cycle>monday", -5.484796933490655),
-                                    ("April<time-of-day>  o'clock", -5.484796933490655),
-                                    ("next <cycle>wednesday", -5.484796933490655),
-                                    ("hh:mmintersect", -5.079331825382491),
+                                     -5.4680601411351315),
+                                    ("this <cycle>monday", -5.4680601411351315),
+                                    ("April<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("next <cycle>wednesday", -5.4680601411351315),
+                                    ("hh:mmintersect", -5.062595033026967),
                                     ("thursday<datetime> - <datetime> (interval)",
-                                     -5.079331825382491),
-                                    ("<day-of-month> (ordinal)July", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("<day-of-month> (ordinal)July", -5.4680601411351315),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
-                                    ("yearmonth", -5.484796933490655),
-                                    ("at <time-of-day>intersect", -5.079331825382491),
+                                     -5.062595033026967),
+                                    ("yearmonth", -5.4680601411351315),
+                                    ("at <time-of-day>intersect", -5.062595033026967),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("<time> <part-of-day>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("dayminute", -2.7767467323884447),
+                                     -5.4680601411351315),
+                                    ("dayminute", -2.760009940032921),
                                     ("<time> <part-of-day>from <datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("intersectyear", -4.791649752930709),
-                                    ("<time-of-day> am|pmsaturday", -5.484796933490655),
-                                    ("<ordinal> <cycle> of <time>year", -5.484796933490655),
-                                    ("minuteday", -3.2875723561544357),
+                                     -5.4680601411351315),
+                                    ("intersectyear", -4.774912960575186),
+                                    ("<time-of-day> am|pmsaturday", -5.4680601411351315),
+                                    ("<ordinal> <cycle> of <time>year", -5.4680601411351315),
+                                    ("minuteday", -3.270835563798912),
                                     ("absorption of , after named dayintersect",
-                                     -5.484796933490655),
-                                    ("Julyyear", -5.484796933490655),
-                                    ("year<time-of-day>  o'clock", -5.484796933490655),
-                                    ("Octoberyear", -4.386184644822546),
-                                    ("hh:mmon <date>", -5.079331825382491),
+                                     -5.4680601411351315),
+                                    ("Julyyear", -5.4680601411351315),
+                                    ("year<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("Octoberyear", -4.3694478524670215),
+                                    ("hh:mmon <date>", -5.062595033026967),
                                     ("today/tomorrow/yesterday afternoonat <time-of-day>",
-                                     -5.484796933490655),
-                                    ("dd/mmyear", -5.484796933490655),
-                                    ("tuesdayin <duration>", -5.484796933490655),
-                                    ("Septemberyear", -5.079331825382491),
-                                    ("at <time-of-day>on <date>", -5.079331825382491),
-                                    ("absorption of , after named daydd/mm", -5.079331825382491),
-                                    ("intersectintersect", -5.484796933490655),
-                                    ("hh:mmon a named-day", -5.484796933490655),
-                                    ("weekday", -4.098502572370764),
-                                    ("dayweek", -4.791649752930709),
-                                    ("weekyear", -5.079331825382491),
-                                    ("on <date>February", -5.484796933490655),
-                                    ("Kerstmisyear", -5.484796933490655),
-                                    ("<month> dd-dd (interval)year", -5.484796933490655),
-                                    ("tomorrowat <time-of-day>", -5.079331825382491),
-                                    ("next <cycle>tuesday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("tuesdayin <duration>", -5.4680601411351315),
+                                    ("Septemberyear", -5.062595033026967),
+                                    ("at <time-of-day>on <date>", -5.062595033026967),
+                                    ("absorption of , after named daydd/mm", -5.062595033026967),
+                                    ("intersectintersect", -5.4680601411351315),
+                                    ("hh:mmon a named-day", -5.4680601411351315),
+                                    ("weekday", -4.081765780015241),
+                                    ("dayweek", -4.774912960575186),
+                                    ("weekyear", -5.062595033026967),
+                                    ("on <date>February", -5.4680601411351315),
+                                    ("Kerstmisyear", -5.4680601411351315),
+                                    ("<month> dd-dd (interval)year", -5.4680601411351315),
+                                    ("tomorrowat <time-of-day>", -5.062595033026967),
+                                    ("next <cycle>tuesday", -5.4680601411351315),
                                     ("monday<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("at <time-of-day>tomorrow", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("at <time-of-day>tomorrow", -5.4680601411351315),
                                     ("monday<named-month> <day-of-month> (non ordinal)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month>about <time-of-day>",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("on a named-day<time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("today/tomorrow/yesterday eveningat <time-of-day>",
-                                     -5.079331825382491),
-                                    ("last <cycle> of <time>year", -5.079331825382491),
+                                     -5.062595033026967),
+                                    ("last <cycle> of <time>year", -5.062595033026967),
                                     ("on a named-day<datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.5685062016165),
-                                    ("April<time> <part-of-day>", -5.079331825382491)],
-                               n = 169},
+                                     -4.551769409260976),
+                                    ("April<time> <part-of-day>", -5.062595033026967)],
+                               n = 168},
                    koData =
-                     ClassData{prior = -1.3518081850487211, unseen = -5.572154032177765,
+                     ClassData{prior = -1.399838586227648, unseen = -5.517452896464707,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<named-month> <day-of-month> (non ordinal)July",
-                                     -4.875197323201151),
-                                    ("dayhour", -3.488902962081261),
-                                    ("on a named-dayafter <time-of-day>", -4.875197323201151),
-                                    ("July<day-of-month> (non ordinal) <named-month>",
-                                     -4.875197323201151),
-                                    ("daymonth", -3.9589065913269965),
-                                    ("monthday", -4.4697322150929875),
-                                    ("monthyear", -3.776585034533042),
-                                    ("yearhour", -4.875197323201151),
-                                    ("intersect<time-of-day>  o'clock", -4.875197323201151),
+                                   [("dayhour", -3.4339872044851463),
+                                    ("on a named-dayafter <time-of-day>", -4.820281565605037),
+                                    ("daymonth", -4.4148164574968725),
+                                    ("monthyear", -3.721669276936927),
+                                    ("yearhour", -4.820281565605037),
+                                    ("intersect<time-of-day>  o'clock", -4.820281565605037),
                                     ("on a named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("<day-of-month> (ordinal)wednesday", -4.4697322150929875),
-                                    ("Julyintersect", -4.875197323201151),
-                                    ("thursdayafter <time-of-day>", -4.875197323201151),
-                                    ("intersect<time> <part-of-day>", -4.875197323201151),
-                                    ("Marchyear", -4.875197323201151),
-                                    ("<day-of-month> (ordinal)year", -4.875197323201151),
-                                    ("on a named-dayat <time-of-day>", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("<day-of-month> (ordinal)wednesday", -4.4148164574968725),
+                                    ("Julyintersect", -4.820281565605037),
+                                    ("thursdayafter <time-of-day>", -4.820281565605037),
+                                    ("intersect<time> <part-of-day>", -4.820281565605037),
+                                    ("Marchyear", -4.820281565605037),
+                                    ("<day-of-month> (ordinal)year", -4.820281565605037),
+                                    ("on a named-dayat <time-of-day>", -4.820281565605037),
                                     ("on a named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("tuesdayafter <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("tuesdayafter <time-of-day>", -4.820281565605037),
                                     ("on a named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("monthhour", -3.9589065913269965),
+                                     -4.820281565605037),
+                                    ("monthhour", -3.903990833730882),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("todayat <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("todayat <time-of-day>", -4.820281565605037),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("on <date>at <time-of-day>", -4.875197323201151),
-                                    ("on <date>about <time-of-day>", -4.875197323201151),
-                                    ("dayday", -3.776585034533042),
-                                    ("hourhour", -4.182050142641207),
-                                    ("thursdayat <time-of-day>", -4.875197323201151),
-                                    ("dayyear", -4.182050142641207),
+                                     -4.820281565605037),
+                                    ("on <date>at <time-of-day>", -4.820281565605037),
+                                    ("on <date>about <time-of-day>", -4.820281565605037),
+                                    ("dayday", -3.721669276936927),
+                                    ("hourhour", -4.127134385045092),
+                                    ("thursdayat <time-of-day>", -4.820281565605037),
+                                    ("dayyear", -4.127134385045092),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
+                                     -4.820281565605037),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("<day-of-month> (ordinal)tuesday", -4.4697322150929875),
-                                    ("thursdayhh:mm", -4.4697322150929875),
-                                    ("Aprilabout <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("<day-of-month> (ordinal)tuesday", -4.4148164574968725),
+                                    ("thursdayhh:mm", -4.4148164574968725),
+                                    ("Aprilabout <time-of-day>", -4.820281565605037),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("Aprilyear", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("Aprilyear", -4.820281565605037),
                                     ("thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.182050142641207),
-                                    ("mondayFebruary", -4.875197323201151),
+                                     -4.127134385045092),
+                                    ("mondayFebruary", -4.820281565605037),
                                     ("on <date><time-of-day> - <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("yearuntil <time-of-day>", -4.4697322150929875),
+                                     -4.820281565605037),
+                                    ("yearuntil <time-of-day>", -4.4148164574968725),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -4.875197323201151),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -4.875197323201151),
+                                     -4.4148164574968725),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("dayminute", -2.3902906734131513),
-                                    ("thursday<part-of-day> of <time>", -4.875197323201151),
-                                    ("Julyyear", -4.4697322150929875),
-                                    ("Octoberyear", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("dayminute", -2.3353749158170367),
+                                    ("thursday<part-of-day> of <time>", -4.820281565605037),
+                                    ("Julyyear", -4.4148164574968725),
+                                    ("Octoberyear", -4.820281565605037),
                                     ("today/tomorrow/yesterday afternoonat <time-of-day>",
-                                     -4.4697322150929875),
-                                    ("year<time> <part-of-day>", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("year<time> <part-of-day>", -4.820281565605037),
                                     ("today/tomorrow/yesterday afternoon<time-of-day>  o'clock",
-                                     -4.875197323201151),
-                                    ("yearday", -4.4697322150929875),
-                                    ("absorption of , after named dayFebruary", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("yearday", -4.4148164574968725),
+                                    ("absorption of , after named dayFebruary", -4.820281565605037),
                                     ("<day-of-month> (non ordinal) <named-month>about <time-of-day>",
-                                     -4.875197323201151),
-                                    ("after <time-of-day>year", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("after <time-of-day>year", -4.820281565605037),
                                     ("on a named-day<time-of-day> - <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("on <date>after <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("on <date>after <time-of-day>", -4.820281565605037),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.875197323201151)],
-                               n = 59}}),
+                                     -4.820281565605037)],
+                               n = 55}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1064,14 +1052,15 @@ classifiers
                                n = 25}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.19105523676270922,
-                               unseen = -3.044522437723423,
+                     ClassData{prior = -0.24512245803298496,
+                               unseen = -2.995732273553991,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 19},
+                               n = 18},
                    koData =
-                     ClassData{prior = -1.749199854809259, unseen = -1.791759469228055,
+                     ClassData{prior = -1.5260563034950494,
+                               unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 5}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -1618,7 +1607,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295,
+                     ClassData{prior = -0.2578291093020998,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -1631,15 +1620,14 @@ classifiers
                                     ("integer (numeric)March", -2.3513752571634776)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -1.4816045409242156,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)August", -2.3978952727983707),
-                                    ("month", -1.0116009116784799),
-                                    ("integer (numeric)October", -2.3978952727983707),
-                                    ("integer (numeric)July", -1.2992829841302609)],
-                               n = 7}}),
+                                   [("month", -1.0986122886681098),
+                                    ("integer (numeric)October", -2.1972245773362196),
+                                    ("integer (numeric)July", -1.2809338454620642)],
+                               n = 5}}),
        ("this|next <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
diff --git a/Duckling/Ranking/Classifiers/NL_NL.hs b/Duckling/Ranking/Classifiers/NL_NL.hs
index 61ff7b66..cbab6405 100644
--- a/Duckling/Ranking/Classifiers/NL_NL.hs
+++ b/Duckling/Ranking/Classifiers/NL_NL.hs
@@ -42,11 +42,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.7090205297162354, unseen = -4.844187086458591,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 125},
+                     ClassData{prior = -0.7170527014134996, unseen = -4.836281906951478,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 124},
                    koData =
-                     ClassData{prior = -0.6775218626568645, unseen = -4.875197323201151,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 129}}),
+                     ClassData{prior = -0.6697998165629542, unseen = -4.882801922586371,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 130}}),
        ("exactly <time-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -139,12 +139,11 @@ classifiers
                                n = 10}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.4307829160924542, unseen = -2.70805020110221,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
+                     ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.0498221244986778,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
+                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -389,258 +388,247 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.29944691403136736,
-                               unseen = -6.180016653652572,
+                     ClassData{prior = -0.2832077920568599, unseen = -6.163314804034641,
                                likelihoods =
                                  HashMap.fromList
-                                   [("last <cycle>sunday", -5.484796933490655),
-                                    ("Koningsdagyear", -5.484796933490655),
-                                    ("hourday", -4.386184644822546),
+                                   [("last <cycle>sunday", -5.4680601411351315),
+                                    ("Koningsdagyear", -5.4680601411351315),
+                                    ("hourday", -4.3694478524670215),
                                     ("on a named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month><time-of-day>  o'clock",
-                                     -5.484796933490655),
-                                    ("dayhour", -2.3493027175615055),
-                                    ("daymonth", -4.5685062016165),
-                                    ("next <cycle>friday", -5.484796933490655),
-                                    ("monthyear", -3.8753590210565547),
+                                     -5.4680601411351315),
+                                    ("dayhour", -2.3325659252059814),
+                                    ("daymonth", -4.551769409260976),
+                                    ("next <cycle>friday", -5.4680601411351315),
+                                    ("monthyear", -3.858622228701031),
                                     ("friday<day-of-month> (non ordinal) <named-month>",
-                                     -5.079331825382491),
-                                    ("yearhour", -5.484796933490655),
-                                    ("intersect<time-of-day>  o'clock", -4.791649752930709),
-                                    ("tuesdaythis <cycle>", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("yearhour", -5.4680601411351315),
+                                    ("intersect<time-of-day>  o'clock", -4.774912960575186),
+                                    ("tuesdaythis <cycle>", -5.4680601411351315),
                                     ("on a named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
-                                    ("saturday<time-of-day>  o'clock", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("saturday<time-of-day>  o'clock", -5.4680601411351315),
                                     ("absorption of , after named daydd/mm/yyyy",
-                                     -5.079331825382491),
-                                    ("<time-of-day> am|pmintersect", -5.484796933490655),
-                                    ("intersect<time> <part-of-day>", -4.791649752930709),
-                                    ("Marchyear", -5.484796933490655),
-                                    ("saturdayat <time-of-day>", -5.079331825382491),
-                                    ("saturday<time> <part-of-day>", -5.079331825382491),
-                                    ("dd/mm<time-of-day>  o'clock", -5.484796933490655),
-                                    ("on a named-dayat <time-of-day>", -4.791649752930709),
-                                    ("today<time-of-day>  o'clock", -5.484796933490655),
-                                    ("at <time-of-day>on a named-day", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("<time-of-day> am|pmintersect", -5.4680601411351315),
+                                    ("intersect<time> <part-of-day>", -4.774912960575186),
+                                    ("Marchyear", -5.4680601411351315),
+                                    ("saturdayat <time-of-day>", -5.062595033026967),
+                                    ("saturday<time> <part-of-day>", -5.062595033026967),
+                                    ("dd/mm<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("on a named-dayat <time-of-day>", -4.774912960575186),
+                                    ("today<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("at <time-of-day>on a named-day", -5.4680601411351315),
                                     ("on a named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("intersect by ','year", -5.484796933490655),
-                                    ("on <date><time-of-day>  o'clock", -4.791649752930709),
-                                    ("next <cycle>monday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("intersect by ','year", -5.4680601411351315),
+                                    ("on <date><time-of-day>  o'clock", -4.774912960575186),
+                                    ("next <cycle>monday", -5.4680601411351315),
                                     ("on a named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("exactly <time-of-day>tomorrow", -5.484796933490655),
-                                    ("on a named-day<time> <part-of-day>", -5.079331825382491),
-                                    ("monthhour", -4.5685062016165),
+                                     -5.4680601411351315),
+                                    ("exactly <time-of-day>tomorrow", -5.4680601411351315),
+                                    ("on a named-day<time> <part-of-day>", -5.062595033026967),
+                                    ("monthhour", -4.551769409260976),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("last <day-of-week> of <time>year", -5.484796933490655),
-                                    ("on a named-day<time-of-day>  o'clock", -5.484796933490655),
-                                    ("next <cycle>March", -5.484796933490655),
-                                    ("todayat <time-of-day>", -4.791649752930709),
+                                     -5.4680601411351315),
+                                    ("last <day-of-week> of <time>year", -5.4680601411351315),
+                                    ("on a named-day<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("next <cycle>March", -5.4680601411351315),
+                                    ("todayat <time-of-day>", -4.774912960575186),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("on <date>at <time-of-day>", -4.791649752930709),
-                                    ("thursday<time> timezone", -5.079331825382491),
-                                    ("on <date>about <time-of-day>", -4.791649752930709),
-                                    ("dayday", -3.1822118404966093),
-                                    ("on <date><time> <part-of-day>", -4.5685062016165),
-                                    ("dd/mmabout <time-of-day>", -5.079331825382491),
-                                    ("<day-of-month> (ordinal)intersect", -5.484796933490655),
-                                    ("hourhour", -4.386184644822546),
+                                     -5.4680601411351315),
+                                    ("on <date>at <time-of-day>", -4.774912960575186),
+                                    ("thursday<time> timezone", -5.062595033026967),
+                                    ("on <date>about <time-of-day>", -4.774912960575186),
+                                    ("dayday", -3.1654750481410856),
+                                    ("on <date><time> <part-of-day>", -4.551769409260976),
+                                    ("dd/mmabout <time-of-day>", -5.062595033026967),
+                                    ("<day-of-month> (ordinal)intersect", -5.4680601411351315),
+                                    ("hourhour", -4.3694478524670215),
                                     ("saturday<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("thursdayat <time-of-day>", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("thursdayat <time-of-day>", -5.4680601411351315),
                                     ("today/tomorrow/yesterday afternoon<hour-of-day> <integer> (as relative minutes)",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.386184644822546),
-                                    ("dayyear", -3.405355391810819),
-                                    ("tuesdayafter <duration>", -5.484796933490655),
-                                    ("tomorrow<time-of-day>  o'clock", -5.484796933490655),
-                                    ("<time-of-day>  o'clocktomorrow", -4.791649752930709),
+                                     -4.3694478524670215),
+                                    ("dayyear", -3.4531571205928664),
+                                    ("tuesdayafter <duration>", -5.4680601411351315),
+                                    ("tomorrow<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("<time-of-day>  o'clocktomorrow", -4.774912960575186),
                                     ("<day-of-month> (non ordinal) <named-month>intersect",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.484796933490655),
-                                    ("<day-of-month> (ordinal)tuesday", -5.484796933490655),
-                                    ("hourminute", -4.791649752930709),
-                                    ("thursdayhh:mm", -5.484796933490655),
-                                    ("this <cycle>wednesday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("<day-of-month> (ordinal)tuesday", -5.4680601411351315),
+                                    ("hourminute", -4.774912960575186),
+                                    ("thursdayhh:mm", -5.4680601411351315),
+                                    ("this <cycle>wednesday", -5.4680601411351315),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month><time> <part-of-day>",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("on <date><day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("Aprilabout <time-of-day>", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("Aprilabout <time-of-day>", -5.4680601411351315),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("<day-of-month> (ordinal)February", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("<day-of-month> (ordinal)February", -5.4680601411351315),
                                     ("thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.791649752930709),
+                                     -4.774912960575186),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.5685062016165),
+                                     -4.551769409260976),
                                     ("today/tomorrow/yesterday evening<time-of-day>  o'clock",
-                                     -5.484796933490655),
-                                    ("fridayintersect", -4.791649752930709),
+                                     -5.4680601411351315),
+                                    ("fridayintersect", -4.774912960575186),
                                     ("on <date><time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("on <date><datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("this <cycle>monday", -5.484796933490655),
-                                    ("April<time-of-day>  o'clock", -5.484796933490655),
-                                    ("next <cycle>wednesday", -5.484796933490655),
-                                    ("hh:mmintersect", -5.079331825382491),
+                                     -5.4680601411351315),
+                                    ("this <cycle>monday", -5.4680601411351315),
+                                    ("April<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("next <cycle>wednesday", -5.4680601411351315),
+                                    ("hh:mmintersect", -5.062595033026967),
                                     ("thursday<datetime> - <datetime> (interval)",
-                                     -5.079331825382491),
-                                    ("<day-of-month> (ordinal)July", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("<day-of-month> (ordinal)July", -5.4680601411351315),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
-                                    ("yearmonth", -5.484796933490655),
-                                    ("at <time-of-day>intersect", -5.079331825382491),
+                                     -5.062595033026967),
+                                    ("yearmonth", -5.4680601411351315),
+                                    ("at <time-of-day>intersect", -5.062595033026967),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("<time> <part-of-day>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("dayminute", -2.7767467323884447),
+                                     -5.4680601411351315),
+                                    ("dayminute", -2.760009940032921),
                                     ("<time> <part-of-day>from <datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("intersectyear", -4.791649752930709),
-                                    ("<time-of-day> am|pmsaturday", -5.484796933490655),
-                                    ("<ordinal> <cycle> of <time>year", -5.484796933490655),
-                                    ("minuteday", -3.2875723561544357),
+                                     -5.4680601411351315),
+                                    ("intersectyear", -4.774912960575186),
+                                    ("<time-of-day> am|pmsaturday", -5.4680601411351315),
+                                    ("<ordinal> <cycle> of <time>year", -5.4680601411351315),
+                                    ("minuteday", -3.270835563798912),
                                     ("absorption of , after named dayintersect",
-                                     -5.484796933490655),
-                                    ("Julyyear", -5.484796933490655),
-                                    ("year<time-of-day>  o'clock", -5.484796933490655),
-                                    ("Octoberyear", -4.386184644822546),
-                                    ("hh:mmon <date>", -5.079331825382491),
+                                     -5.4680601411351315),
+                                    ("Julyyear", -5.4680601411351315),
+                                    ("year<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("Octoberyear", -4.3694478524670215),
+                                    ("hh:mmon <date>", -5.062595033026967),
                                     ("today/tomorrow/yesterday afternoonat <time-of-day>",
-                                     -5.484796933490655),
-                                    ("dd/mmyear", -5.484796933490655),
-                                    ("tuesdayin <duration>", -5.484796933490655),
-                                    ("Septemberyear", -5.079331825382491),
-                                    ("at <time-of-day>on <date>", -5.079331825382491),
-                                    ("absorption of , after named daydd/mm", -5.079331825382491),
-                                    ("intersectintersect", -5.484796933490655),
-                                    ("hh:mmon a named-day", -5.484796933490655),
-                                    ("weekday", -4.098502572370764),
-                                    ("dayweek", -4.791649752930709),
-                                    ("weekyear", -5.079331825382491),
-                                    ("on <date>February", -5.484796933490655),
-                                    ("Kerstmisyear", -5.484796933490655),
-                                    ("<month> dd-dd (interval)year", -5.484796933490655),
-                                    ("tomorrowat <time-of-day>", -5.079331825382491),
-                                    ("next <cycle>tuesday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("tuesdayin <duration>", -5.4680601411351315),
+                                    ("Septemberyear", -5.062595033026967),
+                                    ("at <time-of-day>on <date>", -5.062595033026967),
+                                    ("absorption of , after named daydd/mm", -5.062595033026967),
+                                    ("intersectintersect", -5.4680601411351315),
+                                    ("hh:mmon a named-day", -5.4680601411351315),
+                                    ("weekday", -4.081765780015241),
+                                    ("dayweek", -4.774912960575186),
+                                    ("weekyear", -5.062595033026967),
+                                    ("on <date>February", -5.4680601411351315),
+                                    ("Kerstmisyear", -5.4680601411351315),
+                                    ("<month> dd-dd (interval)year", -5.4680601411351315),
+                                    ("tomorrowat <time-of-day>", -5.062595033026967),
+                                    ("next <cycle>tuesday", -5.4680601411351315),
                                     ("monday<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("at <time-of-day>tomorrow", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("at <time-of-day>tomorrow", -5.4680601411351315),
                                     ("monday<named-month> <day-of-month> (non ordinal)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month>about <time-of-day>",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("on a named-day<time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("today/tomorrow/yesterday eveningat <time-of-day>",
-                                     -5.079331825382491),
-                                    ("last <cycle> of <time>year", -5.079331825382491),
+                                     -5.062595033026967),
+                                    ("last <cycle> of <time>year", -5.062595033026967),
                                     ("on a named-day<datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.5685062016165),
-                                    ("April<time> <part-of-day>", -5.079331825382491)],
-                               n = 169},
+                                     -4.551769409260976),
+                                    ("April<time> <part-of-day>", -5.062595033026967)],
+                               n = 168},
                    koData =
-                     ClassData{prior = -1.3518081850487211, unseen = -5.572154032177765,
+                     ClassData{prior = -1.399838586227648, unseen = -5.517452896464707,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<named-month> <day-of-month> (non ordinal)July",
-                                     -4.875197323201151),
-                                    ("dayhour", -3.488902962081261),
-                                    ("on a named-dayafter <time-of-day>", -4.875197323201151),
-                                    ("July<day-of-month> (non ordinal) <named-month>",
-                                     -4.875197323201151),
-                                    ("daymonth", -3.9589065913269965),
-                                    ("monthday", -4.4697322150929875),
-                                    ("monthyear", -3.776585034533042),
-                                    ("yearhour", -4.875197323201151),
-                                    ("intersect<time-of-day>  o'clock", -4.875197323201151),
+                                   [("dayhour", -3.4339872044851463),
+                                    ("on a named-dayafter <time-of-day>", -4.820281565605037),
+                                    ("daymonth", -4.4148164574968725),
+                                    ("monthyear", -3.721669276936927),
+                                    ("yearhour", -4.820281565605037),
+                                    ("intersect<time-of-day>  o'clock", -4.820281565605037),
                                     ("on a named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("<day-of-month> (ordinal)wednesday", -4.4697322150929875),
-                                    ("Julyintersect", -4.875197323201151),
-                                    ("thursdayafter <time-of-day>", -4.875197323201151),
-                                    ("intersect<time> <part-of-day>", -4.875197323201151),
-                                    ("Marchyear", -4.875197323201151),
-                                    ("<day-of-month> (ordinal)year", -4.875197323201151),
-                                    ("on a named-dayat <time-of-day>", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("<day-of-month> (ordinal)wednesday", -4.4148164574968725),
+                                    ("Julyintersect", -4.820281565605037),
+                                    ("thursdayafter <time-of-day>", -4.820281565605037),
+                                    ("intersect<time> <part-of-day>", -4.820281565605037),
+                                    ("Marchyear", -4.820281565605037),
+                                    ("<day-of-month> (ordinal)year", -4.820281565605037),
+                                    ("on a named-dayat <time-of-day>", -4.820281565605037),
                                     ("on a named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("tuesdayafter <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("tuesdayafter <time-of-day>", -4.820281565605037),
                                     ("on a named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("monthhour", -3.9589065913269965),
+                                     -4.820281565605037),
+                                    ("monthhour", -3.903990833730882),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("todayat <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("todayat <time-of-day>", -4.820281565605037),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("on <date>at <time-of-day>", -4.875197323201151),
-                                    ("on <date>about <time-of-day>", -4.875197323201151),
-                                    ("dayday", -3.776585034533042),
-                                    ("hourhour", -4.182050142641207),
-                                    ("thursdayat <time-of-day>", -4.875197323201151),
-                                    ("dayyear", -4.182050142641207),
+                                     -4.820281565605037),
+                                    ("on <date>at <time-of-day>", -4.820281565605037),
+                                    ("on <date>about <time-of-day>", -4.820281565605037),
+                                    ("dayday", -3.721669276936927),
+                                    ("hourhour", -4.127134385045092),
+                                    ("thursdayat <time-of-day>", -4.820281565605037),
+                                    ("dayyear", -4.127134385045092),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
+                                     -4.820281565605037),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("<day-of-month> (ordinal)tuesday", -4.4697322150929875),
-                                    ("thursdayhh:mm", -4.4697322150929875),
-                                    ("Aprilabout <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("<day-of-month> (ordinal)tuesday", -4.4148164574968725),
+                                    ("thursdayhh:mm", -4.4148164574968725),
+                                    ("Aprilabout <time-of-day>", -4.820281565605037),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("Aprilyear", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("Aprilyear", -4.820281565605037),
                                     ("thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.182050142641207),
-                                    ("mondayFebruary", -4.875197323201151),
+                                     -4.127134385045092),
+                                    ("mondayFebruary", -4.820281565605037),
                                     ("on <date><time-of-day> - <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("yearuntil <time-of-day>", -4.4697322150929875),
+                                     -4.820281565605037),
+                                    ("yearuntil <time-of-day>", -4.4148164574968725),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -4.875197323201151),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -4.875197323201151),
+                                     -4.4148164574968725),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("dayminute", -2.3902906734131513),
-                                    ("thursday<part-of-day> of <time>", -4.875197323201151),
-                                    ("Julyyear", -4.4697322150929875),
-                                    ("Octoberyear", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("dayminute", -2.3353749158170367),
+                                    ("thursday<part-of-day> of <time>", -4.820281565605037),
+                                    ("Julyyear", -4.4148164574968725),
+                                    ("Octoberyear", -4.820281565605037),
                                     ("today/tomorrow/yesterday afternoonat <time-of-day>",
-                                     -4.4697322150929875),
-                                    ("year<time> <part-of-day>", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("year<time> <part-of-day>", -4.820281565605037),
                                     ("today/tomorrow/yesterday afternoon<time-of-day>  o'clock",
-                                     -4.875197323201151),
-                                    ("yearday", -4.4697322150929875),
-                                    ("absorption of , after named dayFebruary", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("yearday", -4.4148164574968725),
+                                    ("absorption of , after named dayFebruary", -4.820281565605037),
                                     ("<day-of-month> (non ordinal) <named-month>about <time-of-day>",
-                                     -4.875197323201151),
-                                    ("after <time-of-day>year", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("after <time-of-day>year", -4.820281565605037),
                                     ("on a named-day<time-of-day> - <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("on <date>after <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("on <date>after <time-of-day>", -4.820281565605037),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.875197323201151)],
-                               n = 59}}),
+                                     -4.820281565605037)],
+                               n = 55}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1064,14 +1052,15 @@ classifiers
                                n = 25}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.19105523676270922,
-                               unseen = -3.044522437723423,
+                     ClassData{prior = -0.24512245803298496,
+                               unseen = -2.995732273553991,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 19},
+                               n = 18},
                    koData =
-                     ClassData{prior = -1.749199854809259, unseen = -1.791759469228055,
+                     ClassData{prior = -1.5260563034950494,
+                               unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 5}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -1611,7 +1600,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295,
+                     ClassData{prior = -0.2578291093020998,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -1624,15 +1613,14 @@ classifiers
                                     ("integer (numeric)March", -2.3513752571634776)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -1.4816045409242156,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)August", -2.3978952727983707),
-                                    ("month", -1.0116009116784799),
-                                    ("integer (numeric)October", -2.3978952727983707),
-                                    ("integer (numeric)July", -1.2992829841302609)],
-                               n = 7}}),
+                                   [("month", -1.0986122886681098),
+                                    ("integer (numeric)October", -2.1972245773362196),
+                                    ("integer (numeric)July", -1.2809338454620642)],
+                               n = 5}}),
        ("this|next <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
diff --git a/Duckling/Ranking/Classifiers/NL_XX.hs b/Duckling/Ranking/Classifiers/NL_XX.hs
index 7cf4a2d9..450b87ed 100644
--- a/Duckling/Ranking/Classifiers/NL_XX.hs
+++ b/Duckling/Ranking/Classifiers/NL_XX.hs
@@ -42,11 +42,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.7090205297162354, unseen = -4.844187086458591,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 125},
+                     ClassData{prior = -0.7170527014134996, unseen = -4.836281906951478,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 124},
                    koData =
-                     ClassData{prior = -0.6775218626568645, unseen = -4.875197323201151,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 129}}),
+                     ClassData{prior = -0.6697998165629542, unseen = -4.882801922586371,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 130}}),
        ("exactly <time-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -139,12 +139,11 @@ classifiers
                                n = 10}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.4307829160924542, unseen = -2.70805020110221,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
+                     ClassData{prior = -0.5108256237659907, unseen = -2.639057329615259,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 12},
                    koData =
-                     ClassData{prior = -1.0498221244986778,
-                               unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 7}}),
+                     ClassData{prior = -0.916290731874155, unseen = -2.3025850929940455,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 8}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -389,258 +388,247 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.29944691403136736,
-                               unseen = -6.180016653652572,
+                     ClassData{prior = -0.2832077920568599, unseen = -6.163314804034641,
                                likelihoods =
                                  HashMap.fromList
-                                   [("last <cycle>sunday", -5.484796933490655),
-                                    ("Koningsdagyear", -5.484796933490655),
-                                    ("hourday", -4.386184644822546),
+                                   [("last <cycle>sunday", -5.4680601411351315),
+                                    ("Koningsdagyear", -5.4680601411351315),
+                                    ("hourday", -4.3694478524670215),
                                     ("on a named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month><time-of-day>  o'clock",
-                                     -5.484796933490655),
-                                    ("dayhour", -2.3493027175615055),
-                                    ("daymonth", -4.5685062016165),
-                                    ("next <cycle>friday", -5.484796933490655),
-                                    ("monthyear", -3.8753590210565547),
+                                     -5.4680601411351315),
+                                    ("dayhour", -2.3325659252059814),
+                                    ("daymonth", -4.551769409260976),
+                                    ("next <cycle>friday", -5.4680601411351315),
+                                    ("monthyear", -3.858622228701031),
                                     ("friday<day-of-month> (non ordinal) <named-month>",
-                                     -5.079331825382491),
-                                    ("yearhour", -5.484796933490655),
-                                    ("intersect<time-of-day>  o'clock", -4.791649752930709),
-                                    ("tuesdaythis <cycle>", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("yearhour", -5.4680601411351315),
+                                    ("intersect<time-of-day>  o'clock", -4.774912960575186),
+                                    ("tuesdaythis <cycle>", -5.4680601411351315),
                                     ("on a named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
-                                    ("saturday<time-of-day>  o'clock", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("saturday<time-of-day>  o'clock", -5.4680601411351315),
                                     ("absorption of , after named daydd/mm/yyyy",
-                                     -5.079331825382491),
-                                    ("<time-of-day> am|pmintersect", -5.484796933490655),
-                                    ("intersect<time> <part-of-day>", -4.791649752930709),
-                                    ("Marchyear", -5.484796933490655),
-                                    ("saturdayat <time-of-day>", -5.079331825382491),
-                                    ("saturday<time> <part-of-day>", -5.079331825382491),
-                                    ("dd/mm<time-of-day>  o'clock", -5.484796933490655),
-                                    ("on a named-dayat <time-of-day>", -4.791649752930709),
-                                    ("today<time-of-day>  o'clock", -5.484796933490655),
-                                    ("at <time-of-day>on a named-day", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("<time-of-day> am|pmintersect", -5.4680601411351315),
+                                    ("intersect<time> <part-of-day>", -4.774912960575186),
+                                    ("Marchyear", -5.4680601411351315),
+                                    ("saturdayat <time-of-day>", -5.062595033026967),
+                                    ("saturday<time> <part-of-day>", -5.062595033026967),
+                                    ("dd/mm<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("on a named-dayat <time-of-day>", -4.774912960575186),
+                                    ("today<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("at <time-of-day>on a named-day", -5.4680601411351315),
                                     ("on a named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("intersect by ','year", -5.484796933490655),
-                                    ("on <date><time-of-day>  o'clock", -4.791649752930709),
-                                    ("next <cycle>monday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("intersect by ','year", -5.4680601411351315),
+                                    ("on <date><time-of-day>  o'clock", -4.774912960575186),
+                                    ("next <cycle>monday", -5.4680601411351315),
                                     ("on a named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("exactly <time-of-day>tomorrow", -5.484796933490655),
-                                    ("on a named-day<time> <part-of-day>", -5.079331825382491),
-                                    ("monthhour", -4.5685062016165),
+                                     -5.4680601411351315),
+                                    ("exactly <time-of-day>tomorrow", -5.4680601411351315),
+                                    ("on a named-day<time> <part-of-day>", -5.062595033026967),
+                                    ("monthhour", -4.551769409260976),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("last <day-of-week> of <time>year", -5.484796933490655),
-                                    ("on a named-day<time-of-day>  o'clock", -5.484796933490655),
-                                    ("next <cycle>March", -5.484796933490655),
-                                    ("todayat <time-of-day>", -4.791649752930709),
+                                     -5.4680601411351315),
+                                    ("last <day-of-week> of <time>year", -5.4680601411351315),
+                                    ("on a named-day<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("next <cycle>March", -5.4680601411351315),
+                                    ("todayat <time-of-day>", -4.774912960575186),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("on <date>at <time-of-day>", -4.791649752930709),
-                                    ("thursday<time> timezone", -5.079331825382491),
-                                    ("on <date>about <time-of-day>", -4.791649752930709),
-                                    ("dayday", -3.1822118404966093),
-                                    ("on <date><time> <part-of-day>", -4.5685062016165),
-                                    ("dd/mmabout <time-of-day>", -5.079331825382491),
-                                    ("<day-of-month> (ordinal)intersect", -5.484796933490655),
-                                    ("hourhour", -4.386184644822546),
+                                     -5.4680601411351315),
+                                    ("on <date>at <time-of-day>", -4.774912960575186),
+                                    ("thursday<time> timezone", -5.062595033026967),
+                                    ("on <date>about <time-of-day>", -4.774912960575186),
+                                    ("dayday", -3.1654750481410856),
+                                    ("on <date><time> <part-of-day>", -4.551769409260976),
+                                    ("dd/mmabout <time-of-day>", -5.062595033026967),
+                                    ("<day-of-month> (ordinal)intersect", -5.4680601411351315),
+                                    ("hourhour", -4.3694478524670215),
                                     ("saturday<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("thursdayat <time-of-day>", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("thursdayat <time-of-day>", -5.4680601411351315),
                                     ("today/tomorrow/yesterday afternoon<hour-of-day> <integer> (as relative minutes)",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.386184644822546),
-                                    ("dayyear", -3.405355391810819),
-                                    ("tuesdayafter <duration>", -5.484796933490655),
-                                    ("tomorrow<time-of-day>  o'clock", -5.484796933490655),
-                                    ("<time-of-day>  o'clocktomorrow", -4.791649752930709),
+                                     -4.3694478524670215),
+                                    ("dayyear", -3.4531571205928664),
+                                    ("tuesdayafter <duration>", -5.4680601411351315),
+                                    ("tomorrow<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("<time-of-day>  o'clocktomorrow", -4.774912960575186),
                                     ("<day-of-month> (non ordinal) <named-month>intersect",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.484796933490655),
-                                    ("<day-of-month> (ordinal)tuesday", -5.484796933490655),
-                                    ("hourminute", -4.791649752930709),
-                                    ("thursdayhh:mm", -5.484796933490655),
-                                    ("this <cycle>wednesday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("<day-of-month> (ordinal)tuesday", -5.4680601411351315),
+                                    ("hourminute", -4.774912960575186),
+                                    ("thursdayhh:mm", -5.4680601411351315),
+                                    ("this <cycle>wednesday", -5.4680601411351315),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month><time> <part-of-day>",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("on <date><day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("Aprilabout <time-of-day>", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("Aprilabout <time-of-day>", -5.4680601411351315),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("<day-of-month> (ordinal)February", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("<day-of-month> (ordinal)February", -5.4680601411351315),
                                     ("thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.791649752930709),
+                                     -4.774912960575186),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.5685062016165),
+                                     -4.551769409260976),
                                     ("today/tomorrow/yesterday evening<time-of-day>  o'clock",
-                                     -5.484796933490655),
-                                    ("fridayintersect", -4.791649752930709),
+                                     -5.4680601411351315),
+                                    ("fridayintersect", -4.774912960575186),
                                     ("on <date><time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("on <date><datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("this <cycle>monday", -5.484796933490655),
-                                    ("April<time-of-day>  o'clock", -5.484796933490655),
-                                    ("next <cycle>wednesday", -5.484796933490655),
-                                    ("hh:mmintersect", -5.079331825382491),
+                                     -5.4680601411351315),
+                                    ("this <cycle>monday", -5.4680601411351315),
+                                    ("April<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("next <cycle>wednesday", -5.4680601411351315),
+                                    ("hh:mmintersect", -5.062595033026967),
                                     ("thursday<datetime> - <datetime> (interval)",
-                                     -5.079331825382491),
-                                    ("<day-of-month> (ordinal)July", -5.484796933490655),
+                                     -5.062595033026967),
+                                    ("<day-of-month> (ordinal)July", -5.4680601411351315),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
-                                    ("yearmonth", -5.484796933490655),
-                                    ("at <time-of-day>intersect", -5.079331825382491),
+                                     -5.062595033026967),
+                                    ("yearmonth", -5.4680601411351315),
+                                    ("at <time-of-day>intersect", -5.062595033026967),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.079331825382491),
+                                     -5.062595033026967),
                                     ("<time> <part-of-day>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
-                                    ("dayminute", -2.7767467323884447),
+                                     -5.4680601411351315),
+                                    ("dayminute", -2.760009940032921),
                                     ("<time> <part-of-day>from <datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
-                                    ("intersectyear", -4.791649752930709),
-                                    ("<time-of-day> am|pmsaturday", -5.484796933490655),
-                                    ("<ordinal> <cycle> of <time>year", -5.484796933490655),
-                                    ("minuteday", -3.2875723561544357),
+                                     -5.4680601411351315),
+                                    ("intersectyear", -4.774912960575186),
+                                    ("<time-of-day> am|pmsaturday", -5.4680601411351315),
+                                    ("<ordinal> <cycle> of <time>year", -5.4680601411351315),
+                                    ("minuteday", -3.270835563798912),
                                     ("absorption of , after named dayintersect",
-                                     -5.484796933490655),
-                                    ("Julyyear", -5.484796933490655),
-                                    ("year<time-of-day>  o'clock", -5.484796933490655),
-                                    ("Octoberyear", -4.386184644822546),
-                                    ("hh:mmon <date>", -5.079331825382491),
+                                     -5.4680601411351315),
+                                    ("Julyyear", -5.4680601411351315),
+                                    ("year<time-of-day>  o'clock", -5.4680601411351315),
+                                    ("Octoberyear", -4.3694478524670215),
+                                    ("hh:mmon <date>", -5.062595033026967),
                                     ("today/tomorrow/yesterday afternoonat <time-of-day>",
-                                     -5.484796933490655),
-                                    ("dd/mmyear", -5.484796933490655),
-                                    ("tuesdayin <duration>", -5.484796933490655),
-                                    ("Septemberyear", -5.079331825382491),
-                                    ("at <time-of-day>on <date>", -5.079331825382491),
-                                    ("absorption of , after named daydd/mm", -5.079331825382491),
-                                    ("intersectintersect", -5.484796933490655),
-                                    ("hh:mmon a named-day", -5.484796933490655),
-                                    ("weekday", -4.098502572370764),
-                                    ("dayweek", -4.791649752930709),
-                                    ("weekyear", -5.079331825382491),
-                                    ("on <date>February", -5.484796933490655),
-                                    ("Kerstmisyear", -5.484796933490655),
-                                    ("<month> dd-dd (interval)year", -5.484796933490655),
-                                    ("tomorrowat <time-of-day>", -5.079331825382491),
-                                    ("next <cycle>tuesday", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("tuesdayin <duration>", -5.4680601411351315),
+                                    ("Septemberyear", -5.062595033026967),
+                                    ("at <time-of-day>on <date>", -5.062595033026967),
+                                    ("absorption of , after named daydd/mm", -5.062595033026967),
+                                    ("intersectintersect", -5.4680601411351315),
+                                    ("hh:mmon a named-day", -5.4680601411351315),
+                                    ("weekday", -4.081765780015241),
+                                    ("dayweek", -4.774912960575186),
+                                    ("weekyear", -5.062595033026967),
+                                    ("on <date>February", -5.4680601411351315),
+                                    ("Kerstmisyear", -5.4680601411351315),
+                                    ("<month> dd-dd (interval)year", -5.4680601411351315),
+                                    ("tomorrowat <time-of-day>", -5.062595033026967),
+                                    ("next <cycle>tuesday", -5.4680601411351315),
                                     ("monday<day-of-month> (non ordinal) <named-month>",
-                                     -5.484796933490655),
-                                    ("at <time-of-day>tomorrow", -5.484796933490655),
+                                     -5.4680601411351315),
+                                    ("at <time-of-day>tomorrow", -5.4680601411351315),
                                     ("monday<named-month> <day-of-month> (non ordinal)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month>about <time-of-day>",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("on a named-day<time-of-day> - <time-of-day> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("today/tomorrow/yesterday eveningat <time-of-day>",
-                                     -5.079331825382491),
-                                    ("last <cycle> of <time>year", -5.079331825382491),
+                                     -5.062595033026967),
+                                    ("last <cycle> of <time>year", -5.062595033026967),
                                     ("on a named-day<datetime> - <datetime> (interval)",
-                                     -5.484796933490655),
+                                     -5.4680601411351315),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.5685062016165),
-                                    ("April<time> <part-of-day>", -5.079331825382491)],
-                               n = 169},
+                                     -4.551769409260976),
+                                    ("April<time> <part-of-day>", -5.062595033026967)],
+                               n = 168},
                    koData =
-                     ClassData{prior = -1.3518081850487211, unseen = -5.572154032177765,
+                     ClassData{prior = -1.399838586227648, unseen = -5.517452896464707,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<named-month> <day-of-month> (non ordinal)July",
-                                     -4.875197323201151),
-                                    ("dayhour", -3.488902962081261),
-                                    ("on a named-dayafter <time-of-day>", -4.875197323201151),
-                                    ("July<day-of-month> (non ordinal) <named-month>",
-                                     -4.875197323201151),
-                                    ("daymonth", -3.9589065913269965),
-                                    ("monthday", -4.4697322150929875),
-                                    ("monthyear", -3.776585034533042),
-                                    ("yearhour", -4.875197323201151),
-                                    ("intersect<time-of-day>  o'clock", -4.875197323201151),
+                                   [("dayhour", -3.4339872044851463),
+                                    ("on a named-dayafter <time-of-day>", -4.820281565605037),
+                                    ("daymonth", -4.4148164574968725),
+                                    ("monthyear", -3.721669276936927),
+                                    ("yearhour", -4.820281565605037),
+                                    ("intersect<time-of-day>  o'clock", -4.820281565605037),
                                     ("on a named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("<day-of-month> (ordinal)wednesday", -4.4697322150929875),
-                                    ("Julyintersect", -4.875197323201151),
-                                    ("thursdayafter <time-of-day>", -4.875197323201151),
-                                    ("intersect<time> <part-of-day>", -4.875197323201151),
-                                    ("Marchyear", -4.875197323201151),
-                                    ("<day-of-month> (ordinal)year", -4.875197323201151),
-                                    ("on a named-dayat <time-of-day>", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("<day-of-month> (ordinal)wednesday", -4.4148164574968725),
+                                    ("Julyintersect", -4.820281565605037),
+                                    ("thursdayafter <time-of-day>", -4.820281565605037),
+                                    ("intersect<time> <part-of-day>", -4.820281565605037),
+                                    ("Marchyear", -4.820281565605037),
+                                    ("<day-of-month> (ordinal)year", -4.820281565605037),
+                                    ("on a named-dayat <time-of-day>", -4.820281565605037),
                                     ("on a named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("tuesdayafter <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("tuesdayafter <time-of-day>", -4.820281565605037),
                                     ("on a named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("monthhour", -3.9589065913269965),
+                                     -4.820281565605037),
+                                    ("monthhour", -3.903990833730882),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("todayat <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("todayat <time-of-day>", -4.820281565605037),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("on <date>at <time-of-day>", -4.875197323201151),
-                                    ("on <date>about <time-of-day>", -4.875197323201151),
-                                    ("dayday", -3.776585034533042),
-                                    ("hourhour", -4.182050142641207),
-                                    ("thursdayat <time-of-day>", -4.875197323201151),
-                                    ("dayyear", -4.182050142641207),
+                                     -4.820281565605037),
+                                    ("on <date>at <time-of-day>", -4.820281565605037),
+                                    ("on <date>about <time-of-day>", -4.820281565605037),
+                                    ("dayday", -3.721669276936927),
+                                    ("hourhour", -4.127134385045092),
+                                    ("thursdayat <time-of-day>", -4.820281565605037),
+                                    ("dayyear", -4.127134385045092),
                                     ("thursdaybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.875197323201151),
+                                     -4.820281565605037),
                                     ("thursdaybetween <datetime> and <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("<day-of-month> (ordinal)tuesday", -4.4697322150929875),
-                                    ("thursdayhh:mm", -4.4697322150929875),
-                                    ("Aprilabout <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("<day-of-month> (ordinal)tuesday", -4.4148164574968725),
+                                    ("thursdayhh:mm", -4.4148164574968725),
+                                    ("Aprilabout <time-of-day>", -4.820281565605037),
                                     ("thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.875197323201151),
-                                    ("Aprilyear", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("Aprilyear", -4.820281565605037),
                                     ("thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.182050142641207),
-                                    ("mondayFebruary", -4.875197323201151),
+                                     -4.127134385045092),
+                                    ("mondayFebruary", -4.820281565605037),
                                     ("on <date><time-of-day> - <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("yearuntil <time-of-day>", -4.4697322150929875),
+                                     -4.820281565605037),
+                                    ("yearuntil <time-of-day>", -4.4148164574968725),
                                     ("thursday<time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -4.875197323201151),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -4.875197323201151),
+                                     -4.4148164574968725),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -4.4697322150929875),
-                                    ("dayminute", -2.3902906734131513),
-                                    ("thursday<part-of-day> of <time>", -4.875197323201151),
-                                    ("Julyyear", -4.4697322150929875),
-                                    ("Octoberyear", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("dayminute", -2.3353749158170367),
+                                    ("thursday<part-of-day> of <time>", -4.820281565605037),
+                                    ("Julyyear", -4.4148164574968725),
+                                    ("Octoberyear", -4.820281565605037),
                                     ("today/tomorrow/yesterday afternoonat <time-of-day>",
-                                     -4.4697322150929875),
-                                    ("year<time> <part-of-day>", -4.875197323201151),
+                                     -4.4148164574968725),
+                                    ("year<time> <part-of-day>", -4.820281565605037),
                                     ("today/tomorrow/yesterday afternoon<time-of-day>  o'clock",
-                                     -4.875197323201151),
-                                    ("yearday", -4.4697322150929875),
-                                    ("absorption of , after named dayFebruary", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("yearday", -4.4148164574968725),
+                                    ("absorption of , after named dayFebruary", -4.820281565605037),
                                     ("<day-of-month> (non ordinal) <named-month>about <time-of-day>",
-                                     -4.875197323201151),
-                                    ("after <time-of-day>year", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("after <time-of-day>year", -4.820281565605037),
                                     ("on a named-day<time-of-day> - <time-of-day> (interval)",
-                                     -4.875197323201151),
-                                    ("on <date>after <time-of-day>", -4.875197323201151),
+                                     -4.820281565605037),
+                                    ("on <date>after <time-of-day>", -4.820281565605037),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.875197323201151)],
-                               n = 59}}),
+                                     -4.820281565605037)],
+                               n = 55}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1064,14 +1052,15 @@ classifiers
                                n = 25}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.19105523676270922,
-                               unseen = -3.044522437723423,
+                     ClassData{prior = -0.24512245803298496,
+                               unseen = -2.995732273553991,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 19},
+                               n = 18},
                    koData =
-                     ClassData{prior = -1.749199854809259, unseen = -1.791759469228055,
+                     ClassData{prior = -1.5260563034950494,
+                               unseen = -1.9459101490553135,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 4}}),
+                               n = 5}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -1618,7 +1607,7 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -0.3448404862917295,
+                     ClassData{prior = -0.2578291093020998,
                                unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
@@ -1631,15 +1620,14 @@ classifiers
                                     ("integer (numeric)March", -2.3513752571634776)],
                                n = 17},
                    koData =
-                     ClassData{prior = -1.2321436812926323,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -1.4816045409242156,
+                               unseen = -2.9444389791664407,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)August", -2.3978952727983707),
-                                    ("month", -1.0116009116784799),
-                                    ("integer (numeric)October", -2.3978952727983707),
-                                    ("integer (numeric)July", -1.2992829841302609)],
-                               n = 7}}),
+                                   [("month", -1.0986122886681098),
+                                    ("integer (numeric)October", -2.1972245773362196),
+                                    ("integer (numeric)July", -1.2809338454620642)],
+                               n = 5}}),
        ("this|next <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
diff --git a/Duckling/Ranking/Classifiers/PL_XX.hs b/Duckling/Ranking/Classifiers/PL_XX.hs
index 1b668687..f274fb44 100644
--- a/Duckling/Ranking/Classifiers/PL_XX.hs
+++ b/Duckling/Ranking/Classifiers/PL_XX.hs
@@ -443,225 +443,216 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.3189150921417123, unseen = -6.280395838960195,
+                     ClassData{prior = -0.304044929662261, unseen = -6.270988431858299,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Tuesdayon <date>", -4.669083511731744),
-                                    ("Sundaylast <cycle>", -5.179909135497735),
-                                    ("Fridaynext <cycle>", -5.585374243605899),
+                                   [("Tuesdayon <date>", -4.659658371272161),
+                                    ("Sundaylast <cycle>", -5.170483995038151),
+                                    ("Fridaynext <cycle>", -5.575949103146316),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -5.179909135497735),
+                                     -5.170483995038151),
                                     ("mm/dd<time-of-day> popo\322udniu/wieczorem/w nocy",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("<hour-of-day> - <hour-of-day> (interval)on <date>",
-                                     -5.179909135497735),
+                                     -5.170483995038151),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.179909135497735),
-                                    ("hourday", -3.7936147743778443),
-                                    ("dayhour", -2.7231733626764307),
-                                    ("daymonth", -3.7936147743778443),
+                                     -5.170483995038151),
+                                    ("hourday", -3.784189633918261),
+                                    ("dayhour", -2.713748222216848),
+                                    ("daymonth", -3.784189633918261),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyabsorption of , after named day",
-                                     -4.669083511731744),
-                                    ("TuesdaySeptember", -5.585374243605899),
-                                    ("monthyear", -3.100467593817899),
-                                    ("Wednesdayintersect", -5.179909135497735),
+                                     -4.659658371272161),
+                                    ("TuesdaySeptember", -5.575949103146316),
+                                    ("monthyear", -3.0910424533583156),
+                                    ("Wednesdayintersect", -5.170483995038151),
                                     ("from <hour-of-day> - <hour-of-day> (interval)on a named-day",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("from <time-of-day> - <time-of-day> (interval)on a named-day",
-                                     -5.585374243605899),
-                                    ("intersecthh:mm", -5.585374243605899),
+                                     -5.575949103146316),
+                                    ("intersecthh:mm", -5.575949103146316),
                                     ("from <datetime> - <datetime> (interval)on a named-day",
-                                     -5.585374243605899),
-                                    ("Wednesdaynext <cycle>", -5.179909135497735),
-                                    ("Tuesdaythis <cycle>", -5.585374243605899),
-                                    ("Saturday<time> <part-of-day>", -5.585374243605899),
-                                    ("Marchyear", -5.179909135497735),
-                                    ("Saturdayat <time-of-day>", -5.179909135497735),
-                                    ("on a named-dayat <time-of-day>", -5.179909135497735),
-                                    ("at <time-of-day>on a named-day", -5.585374243605899),
-                                    ("<time> <part-of-day>on a named-day", -5.179909135497735),
-                                    ("Wednesdayon <date>", -4.48676195493779),
-                                    ("on a named-day<time> <part-of-day>", -5.585374243605899),
-                                    ("last <day-of-week> of <time>year", -5.585374243605899),
-                                    ("today<time> <part-of-day>", -5.585374243605899),
-                                    ("todayat <time-of-day>", -5.585374243605899),
-                                    ("on <date>at <time-of-day>", -5.179909135497735),
-                                    ("dayday", -2.9463169139906404),
-                                    ("on <date><time> <part-of-day>", -5.585374243605899),
-                                    ("intersect by \",\"hh:mm", -4.669083511731744),
-                                    ("mm/ddat <time-of-day>", -4.892227063045954),
-                                    ("WednesdayOctober", -5.179909135497735),
-                                    ("last <cycle> <time>year", -4.669083511731744),
+                                     -5.575949103146316),
+                                    ("Wednesdaynext <cycle>", -5.170483995038151),
+                                    ("Tuesdaythis <cycle>", -5.575949103146316),
+                                    ("Saturday<time> <part-of-day>", -5.575949103146316),
+                                    ("Marchyear", -5.170483995038151),
+                                    ("Saturdayat <time-of-day>", -5.170483995038151),
+                                    ("on a named-dayat <time-of-day>", -5.170483995038151),
+                                    ("at <time-of-day>on a named-day", -5.575949103146316),
+                                    ("<time> <part-of-day>on a named-day", -5.170483995038151),
+                                    ("Wednesdayon <date>", -4.477336814478207),
+                                    ("on a named-day<time> <part-of-day>", -5.575949103146316),
+                                    ("last <day-of-week> of <time>year", -5.575949103146316),
+                                    ("today<time> <part-of-day>", -5.575949103146316),
+                                    ("todayat <time-of-day>", -5.575949103146316),
+                                    ("on <date>at <time-of-day>", -5.170483995038151),
+                                    ("dayday", -2.9368917735310576),
+                                    ("on <date><time> <part-of-day>", -5.575949103146316),
+                                    ("intersect by \",\"hh:mm", -4.659658371272161),
+                                    ("mm/ddat <time-of-day>", -4.882801922586371),
+                                    ("WednesdayOctober", -5.170483995038151),
+                                    ("last <cycle> <time>year", -4.659658371272161),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.892227063045954),
+                                     -4.882801922586371),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.892227063045954),
-                                    ("dayyear", -3.5704712230636346),
+                                     -4.882801922586371),
+                                    ("dayyear", -3.5610460826040513),
                                     ("Wednesday<day-of-month>(ordinal) <named-month>",
-                                     -5.585374243605899),
-                                    ("Thursday<time> <part-of-day>", -5.179909135497735),
+                                     -5.575949103146316),
+                                    ("Thursday<time> <part-of-day>", -5.170483995038151),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.179909135497735),
+                                     -5.170483995038151),
                                     ("day-after-tomorrow (single-word)at <time-of-day>",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.081296846829625),
-                                    ("Tuesdaynext <cycle>", -5.585374243605899),
+                                     -4.071871706370042),
+                                    ("Tuesdaynext <cycle>", -5.575949103146316),
                                     ("tomorrow<time-of-day> popo\322udniu/wieczorem/w nocy",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.199079882486009),
+                                     -4.189654742026425),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.892227063045954),
+                                     -4.882801922586371),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.892227063045954),
-                                    ("tomorrowuntil <time-of-day>", -5.179909135497735),
+                                     -4.882801922586371),
+                                    ("tomorrowuntil <time-of-day>", -5.170483995038151),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.081296846829625),
+                                     -4.071871706370042),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect by \",\"",
-                                     -4.669083511731744),
-                                    ("TuesdayOctober", -5.585374243605899),
-                                    ("last <day-of-week> <time>year", -5.179909135497735),
+                                     -4.659658371272161),
+                                    ("TuesdayOctober", -5.575949103146316),
+                                    ("last <day-of-week> <time>year", -5.170483995038151),
                                     ("Monday<day-of-month>(ordinal) <named-month>",
-                                     -5.179909135497735),
-                                    ("Mondaythis <cycle>", -5.585374243605899),
-                                    ("<time-of-day> ranoon <date>", -5.179909135497735),
-                                    ("on <date><time-of-day> rano", -5.585374243605899),
+                                     -5.170483995038151),
+                                    ("Mondaythis <cycle>", -5.575949103146316),
+                                    ("<time-of-day> ranoon <date>", -5.170483995038151),
+                                    ("on <date><time-of-day> rano", -5.575949103146316),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocytomorrow",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyFriday",
-                                     -4.669083511731744),
-                                    ("at <time-of-day>intersect", -5.179909135497735),
-                                    ("dayminute", -3.975936331171799),
-                                    ("<time-of-day> ranoon a named-day", -5.179909135497735),
+                                     -4.659658371272161),
+                                    ("at <time-of-day>intersect", -5.170483995038151),
+                                    ("dayminute", -3.966511190712216),
+                                    ("<time-of-day> ranoon a named-day", -5.170483995038151),
                                     ("from <hour-of-day> - <hour-of-day> (interval)on <date>",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.585374243605899),
-                                    ("intersectyear", -5.179909135497735),
-                                    ("on a named-day<time-of-day> rano", -5.585374243605899),
-                                    ("<ordinal> <cycle> of <time>year", -5.585374243605899),
-                                    ("minuteday", -2.386701126055218),
+                                     -5.575949103146316),
+                                    ("intersectyear", -5.170483995038151),
+                                    ("on a named-day<time-of-day> rano", -5.575949103146316),
+                                    ("<ordinal> <cycle> of <time>year", -5.575949103146316),
+                                    ("minuteday", -2.377275985595635),
                                     ("absorption of , after named dayintersect",
-                                     -5.585374243605899),
-                                    ("Saturday<time-of-day> rano", -5.585374243605899),
-                                    ("Octoberyear", -3.880626151367474),
-                                    ("yearhh:mm", -5.585374243605899),
-                                    ("at <time-of-day>intersect by \",\"", -5.179909135497735),
+                                     -5.575949103146316),
+                                    ("Saturday<time-of-day> rano", -5.575949103146316),
+                                    ("Octoberyear", -3.871201010907891),
+                                    ("yearhh:mm", -5.575949103146316),
+                                    ("at <time-of-day>intersect by \",\"", -5.170483995038151),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -5.179909135497735),
-                                    ("tomorrowexactly <time-of-day>", -4.892227063045954),
+                                     -5.170483995038151),
+                                    ("tomorrowexactly <time-of-day>", -4.882801922586371),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -5.179909135497735),
-                                    ("Septemberyear", -4.669083511731744),
-                                    ("at <time-of-day>on <date>", -5.585374243605899),
-                                    ("on <date>year", -4.199079882486009),
-                                    ("dayweek", -3.639464094550586),
-                                    ("Tuesdayin <duration>", -5.585374243605899),
-                                    ("<time> <part-of-day>on <date>", -5.179909135497735),
-                                    ("weekyear", -4.332611275110531),
-                                    ("<ordinal> <cycle> <time>year", -5.179909135497735),
-                                    ("tomorrowat <time-of-day>", -5.585374243605899),
-                                    ("tomorrow<time> <part-of-day>", -5.585374243605899),
-                                    ("at <time-of-day>Friday", -5.179909135497735),
+                                     -5.170483995038151),
+                                    ("Septemberyear", -4.659658371272161),
+                                    ("at <time-of-day>on <date>", -5.575949103146316),
+                                    ("on <date>year", -4.189654742026425),
+                                    ("dayweek", -3.630038954091003),
+                                    ("Tuesdayin <duration>", -5.575949103146316),
+                                    ("<time> <part-of-day>on <date>", -5.170483995038151),
+                                    ("weekyear", -4.323186134650948),
+                                    ("<ordinal> <cycle> <time>year", -5.170483995038151),
+                                    ("tomorrowat <time-of-day>", -5.575949103146316),
+                                    ("tomorrow<time> <part-of-day>", -5.575949103146316),
+                                    ("at <time-of-day>Friday", -5.170483995038151),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect",
-                                     -4.669083511731744),
+                                     -4.659658371272161),
                                     ("<named-month> <day-of-month> (ordinal)year",
-                                     -5.585374243605899),
-                                    ("tomorrow<time-of-day> rano", -5.585374243605899),
+                                     -5.575949103146316),
+                                    ("tomorrow<time-of-day> rano", -5.575949103146316),
                                     ("<datetime> - <datetime> (interval)on a named-day",
-                                     -5.179909135497735),
-                                    ("last <cycle> of <time>year", -5.179909135497735),
+                                     -5.170483995038151),
+                                    ("last <cycle> of <time>year", -5.170483995038151),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.585374243605899),
+                                     -5.575949103146316),
                                     ("<time-of-day> - <time-of-day> (interval)on a named-day",
-                                     -5.179909135497735),
+                                     -5.170483995038151),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -5.179909135497735),
+                                     -5.170483995038151),
                                     ("<hour-of-day> - <hour-of-day> (interval)on a named-day",
-                                     -5.179909135497735),
-                                    ("yearminute", -5.585374243605899)],
+                                     -5.170483995038151),
+                                    ("yearminute", -5.575949103146316)],
                                n = 197},
                    koData =
-                     ClassData{prior = -1.298053727675531, unseen = -5.662960480135946,
+                     ClassData{prior = -1.3387534163508907, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Tuesdayon <date>", -4.966335035199676),
-                                    ("<time-of-day> ranoby <time>", -4.560869927091511),
-                                    ("<named-month> <day-of-month> (non ordinal)July",
-                                     -4.966335035199676),
+                                   [("Tuesdayon <date>", -4.919980925828125),
+                                    ("<time-of-day> ranoby <time>", -4.5145158177199605),
                                     ("Julyrelative minutes to|till|before <integer> (hour-of-day)",
-                                     -4.966335035199676),
-                                    ("dayhour", -3.867722746531566),
-                                    ("July<day-of-month> (non ordinal) <named-month>",
-                                     -4.966335035199676),
-                                    ("daymonth", -2.5684397624013053),
-                                    ("monthday", -4.560869927091511),
-                                    ("monthyear", -4.050044303325521),
-                                    ("Wednesdayintersect", -4.560869927091511),
-                                    ("<time> <part-of-day>until <time-of-day>", -4.560869927091511),
-                                    ("Marchyear", -4.273187854639731),
-                                    ("Wednesdayon <date>", -4.966335035199676),
-                                    ("absorption of , after named dayJuly", -4.966335035199676),
-                                    ("<time> <part-of-day><time> <part-of-day>",
-                                     -4.273187854639731),
-                                    ("mm/ddat <time-of-day>", -4.966335035199676),
-                                    ("hourhour", -4.050044303325521),
-                                    ("<time> <part-of-day>by <time>", -4.560869927091511),
-                                    ("dayyear", -3.713572066704308),
-                                    ("<time-of-day> ranoby the end of <time>", -4.560869927091511),
+                                     -4.919980925828125),
+                                    ("dayhour", -3.821368637160015),
+                                    ("daymonth", -2.617395832834079),
+                                    ("monthyear", -4.00369019395397),
+                                    ("Wednesdayintersect", -4.5145158177199605),
+                                    ("<time> <part-of-day>until <time-of-day>",
+                                     -4.5145158177199605),
+                                    ("Marchyear", -4.22683374526818),
+                                    ("Wednesdayon <date>", -4.919980925828125),
+                                    ("absorption of , after named dayJuly", -4.919980925828125),
+                                    ("<time> <part-of-day><time> <part-of-day>", -4.22683374526818),
+                                    ("mm/ddat <time-of-day>", -4.919980925828125),
+                                    ("hourhour", -4.00369019395397),
+                                    ("<time> <part-of-day>by <time>", -4.5145158177199605),
+                                    ("dayyear", -3.667217957332757),
+                                    ("<time-of-day> ranoby the end of <time>", -4.5145158177199605),
                                     ("<named-month> <day-of-month> (non ordinal)until <time-of-day>",
-                                     -4.966335035199676),
-                                    ("monthminute", -4.966335035199676),
-                                    ("minutemonth", -4.273187854639731),
+                                     -4.919980925828125),
+                                    ("monthminute", -4.919980925828125),
+                                    ("minutemonth", -4.22683374526818),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.966335035199676),
+                                     -4.919980925828125),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.966335035199676),
-                                    ("Aprilyear", -4.966335035199676),
+                                     -4.919980925828125),
+                                    ("Aprilyear", -4.919980925828125),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect by \",\"",
-                                     -4.560869927091511),
-                                    ("after <time-of-day>at <time-of-day>", -4.966335035199676),
-                                    ("SundayMarch", -4.966335035199676),
-                                    ("hh:mmby the end of <time>", -4.966335035199676),
-                                    ("daysecond", -4.560869927091511),
+                                     -4.5145158177199605),
+                                    ("after <time-of-day>at <time-of-day>", -4.919980925828125),
+                                    ("SundayMarch", -4.919980925828125),
+                                    ("hh:mmby the end of <time>", -4.919980925828125),
+                                    ("daysecond", -4.5145158177199605),
                                     ("<time> <part-of-day>by the end of <time>",
-                                     -4.560869927091511),
-                                    ("<time> <part-of-day><time-of-day> rano", -4.966335035199676),
-                                    ("<time-of-day> rano<time> <part-of-day>", -4.560869927091511),
-                                    ("<named-month> <day-of-month> (non ordinal)August",
-                                     -4.966335035199676),
-                                    ("August<day-of-month> (non ordinal) <named-month>",
-                                     -4.966335035199676),
-                                    ("at <time-of-day>intersect", -4.966335035199676),
-                                    ("dayminute", -4.560869927091511),
+                                     -4.5145158177199605),
+                                    ("<time> <part-of-day><time-of-day> rano", -4.919980925828125),
+                                    ("<time-of-day> rano<time> <part-of-day>", -4.5145158177199605),
+                                    ("at <time-of-day>intersect", -4.919980925828125),
+                                    ("dayminute", -4.5145158177199605),
                                     ("<named-month> <day-of-month> (non ordinal)by <time>",
-                                     -4.966335035199676),
-                                    ("intersectyear", -3.713572066704308),
-                                    ("intersectSeptember", -4.273187854639731),
-                                    ("minuteday", -3.2615869429612507),
-                                    ("hh:mmon <date>", -4.560869927091511),
-                                    ("at <time-of-day>intersect by \",\"", -4.966335035199676),
-                                    ("MondayMarch", -4.966335035199676),
+                                     -4.919980925828125),
+                                    ("intersectyear", -3.667217957332757),
+                                    ("intersectSeptember", -4.22683374526818),
+                                    ("minuteday", -3.2152328335897),
+                                    ("hh:mmon <date>", -4.5145158177199605),
+                                    ("at <time-of-day>intersect by \",\"", -4.919980925828125),
+                                    ("MondayMarch", -4.919980925828125),
                                     ("<named-month> <day-of-month> (non ordinal)by the end of <time>",
-                                     -4.966335035199676),
-                                    ("tomorrowexactly <time-of-day>", -4.966335035199676),
-                                    ("hoursecond", -3.094532858298084),
+                                     -4.919980925828125),
+                                    ("tomorrowexactly <time-of-day>", -4.919980925828125),
+                                    ("hoursecond", -3.0481787489265337),
                                     ("absorption of , after named daySeptember",
-                                     -4.966335035199676),
-                                    ("hh:mmon a named-day", -4.560869927091511),
-                                    ("Sundayon <date>", -4.560869927091511),
-                                    ("absorption of , after named dayFebruary", -3.867722746531566),
-                                    ("hh:mmby <time>", -4.966335035199676),
-                                    ("tomorrowat <time-of-day>", -4.966335035199676),
-                                    ("minutesecond", -4.560869927091511),
+                                     -4.919980925828125),
+                                    ("hh:mmon a named-day", -4.5145158177199605),
+                                    ("Sundayon <date>", -4.5145158177199605),
+                                    ("absorption of , after named dayFebruary", -3.821368637160015),
+                                    ("hh:mmby <time>", -4.919980925828125),
+                                    ("tomorrowat <time-of-day>", -4.919980925828125),
+                                    ("minutesecond", -4.5145158177199605),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect",
-                                     -4.560869927091511),
-                                    ("Tuesdayintersect", -4.560869927091511),
-                                    ("Sundayintersect", -4.560869927091511)],
-                               n = 74}}),
+                                     -4.5145158177199605),
+                                    ("Tuesdayintersect", -4.5145158177199605),
+                                    ("Sundayintersect", -4.5145158177199605)],
+                               n = 70}}),
        ("half after|past <integer> (hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -810,15 +801,6 @@ classifiers
                                    [("minutehour", -1.2992829841302609),
                                     ("hh:mm<integer> (latent time-of-day)", -1.2992829841302609)],
                                n = 2}}),
-       ("integer 21..99",
-        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)integer (numeric)", 0.0)],
-                               n = 1}}),
        ("yyyy-mm-dd",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -2049,27 +2031,21 @@ classifiers
                                n = 8}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
-                     ClassData{prior = -9.53101798043249e-2,
-                               unseen = -3.912023005428146,
+                     ClassData{prior = 0.0, unseen = -3.891820298110627,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)September", -3.1986731175506815),
-                                    ("integer (numeric)May", -2.505525936990736),
-                                    ("integer (numeric)April", -3.1986731175506815),
-                                    ("integer (numeric)August", -3.1986731175506815),
-                                    ("integer (numeric)February", -1.589235205116581),
-                                    ("month", -0.8472978603872037),
-                                    ("integer (numeric)November", -2.2823823856765264),
-                                    ("integer (numeric)March", -3.1986731175506815)],
+                                   [("integer (numeric)September", -3.1780538303479458),
+                                    ("integer (numeric)May", -2.4849066497880004),
+                                    ("integer (numeric)April", -3.1780538303479458),
+                                    ("integer (numeric)August", -3.1780538303479458),
+                                    ("integer (numeric)February", -1.5686159179138452),
+                                    ("month", -0.8266785731844679),
+                                    ("integer (numeric)November", -2.2617630984737906),
+                                    ("integer (numeric)March", -3.1780538303479458)],
                                n = 20},
                    koData =
-                     ClassData{prior = -2.3978952727983707, unseen = -2.639057329615259,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("integer (numeric)August", -1.8718021769015913),
-                                    ("month", -1.466337068793427),
-                                    ("integer (numeric)July", -1.8718021769015913)],
-                               n = 2}}),
+                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("this|next <day-of-week>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
diff --git a/Duckling/Ranking/Classifiers/PT_XX.hs b/Duckling/Ranking/Classifiers/PT_XX.hs
index f663c76d..013a4f68 100644
--- a/Duckling/Ranking/Classifiers/PT_XX.hs
+++ b/Duckling/Ranking/Classifiers/PT_XX.hs
@@ -103,11 +103,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6513000706244448, unseen = -4.143134726391533,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 61},
+                     ClassData{prior = -0.6678293725756556, unseen = -4.127134385045092,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 60},
                    koData =
-                     ClassData{prior = -0.7368222440626069, unseen = -4.060443010546419,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 56}}),
+                     ClassData{prior = -0.719122666963206, unseen = -4.07753744390572,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 57}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -471,121 +471,118 @@ classifiers
                                n = 7}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.702716631576096, unseen = -5.14166355650266,
+                     ClassData{prior = -0.712565266417047, unseen = -5.123963979403259,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.037186148382152),
-                                    ("dayhour", -2.3632097148104805),
+                                     -4.019381523748645),
+                                    ("dayhour", -2.345405090176974),
                                     ("<day-of-month> de <named-month>two time tokens separated by \",\"2",
-                                     -4.442651256490317),
+                                     -4.42484663185681),
                                     ("nowquinze para as <hour-of-day> (as relative minutes)",
-                                     -4.442651256490317),
-                                    ("Quart-feiraamanh\227 pela <part-of-day>", -4.442651256490317),
-                                    ("now\224s <time-of-day>", -4.037186148382152),
-                                    ("<day-of-month> de <named-month>intersect",
-                                     -4.442651256490317),
-                                    ("now<hour-of-day> and 3/4", -4.442651256490317),
+                                     -4.42484663185681),
+                                    ("Quart-feiraamanh\227 pela <part-of-day>", -4.42484663185681),
+                                    ("now\224s <time-of-day>", -4.019381523748645),
+                                    ("<day-of-month> de <named-month>intersect", -4.42484663185681),
+                                    ("now<hour-of-day> and 3/4", -4.42484663185681),
                                     ("<day-of-month> de <named-month>two time tokens separated by \",\"",
-                                     -4.442651256490317),
-                                    ("Segunda-feirain the <part-of-day>", -4.442651256490317),
-                                    ("Quart-feira<time-of-day> <part-of-day>", -4.442651256490317),
-                                    ("yearSexta-feira", -4.442651256490317),
-                                    ("dayday", -2.9385738597140425),
-                                    ("hourhour", -4.442651256490317),
-                                    ("dayyear", -2.4277482359480516),
-                                    ("de <year>Sexta-feira", -4.442651256490317),
-                                    ("minutehour", -3.1898882879949486),
+                                     -4.42484663185681),
+                                    ("Segunda-feirain the <part-of-day>", -4.42484663185681),
+                                    ("Quart-feira<time-of-day> <part-of-day>", -4.42484663185681),
+                                    ("yearSexta-feira", -4.42484663185681),
+                                    ("dayday", -2.920769235080536), ("hourhour", -4.42484663185681),
+                                    ("dayyear", -2.4789364828014966),
+                                    ("de <year>Sexta-feira", -4.42484663185681),
+                                    ("minutehour", -3.172083663361442),
                                     ("<hour-of-day> and quinzein the <part-of-day>",
-                                     -4.037186148382152),
+                                     -4.019381523748645),
                                     ("intersect by `da` or `de`in the <part-of-day>",
-                                     -4.037186148382152),
-                                    ("now<hour-of-day> and <relative minutes>", -4.442651256490317),
-                                    ("tomorrow<time-of-day> horas", -4.037186148382152),
+                                     -4.019381523748645),
+                                    ("now<hour-of-day> and <relative minutes>", -4.42484663185681),
+                                    ("tomorrow<time-of-day> horas", -4.019381523748645),
                                     ("now<integer> para as <hour-of-day> (as relative minutes)",
-                                     -4.442651256490317),
+                                     -4.42484663185681),
                                     ("\224s <time-of-day>in the <part-of-day>",
-                                     -3.7495040759303713),
-                                    ("Sexta-feiraintersect", -4.442651256490317),
-                                    ("dayminute", -3.1898882879949486),
-                                    ("intersectSexta-feira", -4.442651256490317),
+                                     -3.7316994512968646),
+                                    ("Sexta-feiraintersect", -4.42484663185681),
+                                    ("dayminute", -3.172083663361442),
+                                    ("intersectSexta-feira", -4.42484663185681),
                                     ("Sexta-feira<day-of-month> de <named-month>",
-                                     -4.442651256490317),
-                                    ("dd-dd <month>(interval)de <year>", -4.442651256490317),
-                                    ("Sexta-feiraintersect by `da` or `de`", -4.442651256490317),
-                                    ("intersect by `da` or `de`Sexta-feira", -4.442651256490317),
+                                     -4.42484663185681),
+                                    ("dd-dd <month>(interval)de <year>", -4.42484663185681),
+                                    ("Sexta-feiraintersect by `da` or `de`", -4.42484663185681),
+                                    ("intersect by `da` or `de`Sexta-feira", -4.42484663185681),
                                     ("dia <day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.037186148382152),
-                                    ("yearday", -4.037186148382152),
+                                     -4.019381523748645),
+                                    ("yearday", -4.019381523748645),
                                     ("two time tokens separated by \",\"de <year>",
-                                     -4.037186148382152),
-                                    ("dd[/-]mmyear", -4.442651256490317),
-                                    ("Quart-feira\224s <time-of-day>", -4.442651256490317),
+                                     -4.019381523748645),
+                                    ("Quart-feira\224s <time-of-day>", -4.42484663185681),
                                     ("<day-of-month> de <named-month>de <year>",
-                                     -3.056356895370426),
-                                    ("Quart-feira<dim time> da manha", -4.442651256490317),
-                                    ("tomorrowdepois das <time-of-day>", -4.037186148382152),
+                                     -3.0385522707369192),
+                                    ("Quart-feira<dim time> da manha", -4.42484663185681),
+                                    ("tomorrowdepois das <time-of-day>", -4.019381523748645),
                                     ("<hour-of-day> and <relative minutes>in the <part-of-day>",
-                                     -4.037186148382152),
+                                     -4.019381523748645),
                                     ("two time tokens separated by \",\"2de <year>",
-                                     -4.037186148382152),
-                                    ("intersectde <year>", -4.442651256490317)],
-                               n = 52},
+                                     -4.019381523748645),
+                                    ("intersectde <year>", -4.42484663185681)],
+                               n = 51},
                    koData =
-                     ClassData{prior = -0.6836684366054016, unseen = -5.153291594497779,
+                     ClassData{prior = -0.6740989855892509, unseen = -5.147494476813453,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -2.9502698994772336),
-                                    ("dayhour", -3.068052935133617),
-                                    ("daymonth", -4.454347296253507),
-                                    ("monthday", -3.355735007585398),
-                                    ("monthyear", -2.9502698994772336),
-                                    ("now\224s <time-of-day>", -4.048882188145344),
-                                    ("houryear", -2.5084371471981943),
-                                    ("Dezembro\224s <time-of-day>", -4.454347296253507),
+                                   [("hourday", -2.9444389791664407),
+                                    ("dayhour", -3.062222014822824),
+                                    ("daymonth", -4.448516375942715),
+                                    ("monthday", -3.349904087274605),
+                                    ("monthyear", -2.9444389791664407),
+                                    ("now\224s <time-of-day>", -4.04305126783455),
+                                    ("houryear", -2.5026062268874014),
+                                    ("Dezembro\224s <time-of-day>", -4.448516375942715),
                                     ("<time-of-day> am|pm<day-of-month> de <named-month>",
-                                     -4.454347296253507),
-                                    ("Fevereiroin the <part-of-day>", -4.048882188145344),
-                                    ("monthhour", -3.2015843277581397),
-                                    ("Setembrointersect", -4.454347296253507),
+                                     -4.448516375942715),
+                                    ("Fevereiroin the <part-of-day>", -4.04305126783455),
+                                    ("monthhour", -3.1957534074473464),
+                                    ("Setembrointersect", -4.448516375942715),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -4.454347296253507),
-                                    ("hourmonth", -4.454347296253507),
-                                    ("Julhode <year>", -4.454347296253507),
+                                     -4.448516375942715),
+                                    ("hourmonth", -4.448516375942715),
+                                    ("Julhode <year>", -4.448516375942715),
                                     ("<time-of-day> am|pmintersect by `da` or `de`",
-                                     -4.454347296253507),
+                                     -4.448516375942715),
                                     ("Setembrotwo time tokens separated by \",\"2",
-                                     -4.454347296253507),
-                                    ("dayyear", -4.454347296253507),
+                                     -4.448516375942715),
+                                    ("dayyear", -4.448516375942715),
                                     ("intersect by `da` or `de`\224s <time-of-day>",
-                                     -4.454347296253507),
+                                     -4.448516375942715),
                                     ("intersect by `da` or `de`in the <part-of-day>",
-                                     -4.048882188145344),
-                                    ("Setembrode <year>", -3.355735007585398),
-                                    ("now<hour-of-day> and <relative minutes>", -4.454347296253507),
-                                    ("daysecond", -4.454347296253507),
-                                    ("Ter\231a-feiraright now", -4.454347296253507),
-                                    ("Sexta-feiraintersect", -4.454347296253507),
-                                    ("dayminute", -4.048882188145344),
+                                     -4.04305126783455),
+                                    ("Setembrode <year>", -3.349904087274605),
+                                    ("now<hour-of-day> and <relative minutes>", -4.448516375942715),
+                                    ("daysecond", -4.448516375942715),
+                                    ("Ter\231a-feiraright now", -4.448516375942715),
+                                    ("Sexta-feiraintersect", -4.448516375942715),
+                                    ("dayminute", -4.04305126783455),
                                     ("Setembrotwo time tokens separated by \",\"",
-                                     -4.454347296253507),
-                                    ("intersect by `da` or `de`intersect", -4.454347296253507),
-                                    ("intersectSexta-feira", -4.048882188145344),
+                                     -4.448516375942715),
+                                    ("intersect by `da` or `de`intersect", -4.448516375942715),
+                                    ("intersectSexta-feira", -4.04305126783455),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -4.454347296253507),
-                                    ("Sexta-feiraintersect by `da` or `de`", -3.355735007585398),
-                                    ("intersect by `da` or `de`Sexta-feira", -3.5380565643793527),
+                                     -4.448516375942715),
+                                    ("Sexta-feiraintersect by `da` or `de`", -3.349904087274605),
+                                    ("intersect by `da` or `de`Sexta-feira", -3.5322256440685593),
                                     ("two time tokens separated by \",\"de <year>",
-                                     -4.048882188145344),
-                                    ("intersect by `da` or `de`de <year>", -2.9502698994772336),
+                                     -4.04305126783455),
+                                    ("intersect by `da` or `de`de <year>", -2.9444389791664407),
                                     ("<day-of-month> de <named-month>\224s <time-of-day>",
-                                     -4.454347296253507),
-                                    ("Maiode <year>", -4.048882188145344),
+                                     -4.448516375942715),
+                                    ("Maiode <year>", -4.04305126783455),
                                     ("<day-of-month> de <named-month>de <year>",
-                                     -4.454347296253507),
+                                     -4.448516375942715),
                                     ("two time tokens separated by \",\"2de <year>",
-                                     -4.048882188145344),
-                                    ("intersectde <year>", -4.454347296253507)],
+                                     -4.04305126783455),
+                                    ("intersectde <year>", -4.448516375942715)],
                                n = 53}}),
        ("season",
         Classifier{okData =
@@ -990,14 +987,15 @@ classifiers
                                n = 5}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.5108256237659907,
-                               unseen = -2.3978952727983707,
+                     ClassData{prior = -0.6286086594223742,
+                               unseen = -2.3025850929940455,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 9},
+                               n = 8},
                    koData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.7621400520468967,
+                               unseen = -2.1972245773362196,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 6}}),
+                               n = 7}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
                      ClassData{prior = -0.6443570163905132, unseen = -4.174387269895637,
diff --git a/Duckling/Ranking/Classifiers/SV_XX.hs b/Duckling/Ranking/Classifiers/SV_XX.hs
index 7500afb7..f9138b89 100644
--- a/Duckling/Ranking/Classifiers/SV_XX.hs
+++ b/Duckling/Ranking/Classifiers/SV_XX.hs
@@ -35,11 +35,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.832909122935104, unseen = -4.882801922586371,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 130},
+                     ClassData{prior = -0.8484133094710693, unseen = -4.867534450455582,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 128},
                    koData =
-                     ClassData{prior = -0.570544858467613, unseen = -5.14166355650266,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 169}}),
+                     ClassData{prior = -0.5587800168880267, unseen = -5.153291594497779,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 171}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -93,13 +93,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("dd/mm",
         Classifier{okData =
-                     ClassData{prior = -0.2231435513142097,
-                               unseen = -2.3025850929940455,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 8},
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.0794415416798357,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
                    koData =
-                     ClassData{prior = -1.6094379124341003,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
+                     ClassData{prior = -0.916290731874155, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -303,142 +302,137 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4318772076479415, unseen = -5.877735781779639,
+                     ClassData{prior = -0.3980301296206462, unseen = -5.855071922202427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Onsdagthis <cycle>", -5.181783550292085),
-                                    ("Torsdag<time> timezone", -3.929020581796717),
+                                   [("Onsdagthis <cycle>", -5.159055299214529),
+                                    ("Torsdag<time> timezone", -3.906292330719161),
                                     ("<datetime> - <datetime> (interval)on <date>",
-                                     -4.083171261623976),
+                                     -4.060443010546419),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.083171261623976),
-                                    ("hourday", -5.181783550292085), ("dayhour", -2.93049175168559),
-                                    ("daymonth", -3.0417173867958143),
-                                    ("monthyear", -3.1668805297498204),
+                                     -4.060443010546419),
+                                    ("hourday", -5.159055299214529),
+                                    ("dayhour", -2.907763500608034),
+                                    ("daymonth", -3.0189891357182583),
+                                    ("monthyear", -3.144152278672264),
                                     ("Torsdagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.181783550292085),
-                                    ("Mandagon <date>", -5.181783550292085),
-                                    ("yyyy-mm-ddat <time-of-day>", -4.48863636973214),
-                                    ("intersecthh:mm", -5.181783550292085),
+                                     -5.159055299214529),
+                                    ("Mandagon <date>", -5.159055299214529),
+                                    ("yyyy-mm-ddat <time-of-day>", -4.465908118654584),
+                                    ("intersecthh:mm", -5.159055299214529),
                                     ("Torsdagbetween <datetime> and <datetime> (interval)",
-                                     -5.181783550292085),
-                                    ("Torsdagat <time-of-day>", -4.26549281841793),
-                                    ("Marsyear", -5.181783550292085),
+                                     -5.159055299214529),
+                                    ("Torsdagat <time-of-day>", -4.242764567340374),
+                                    ("Marsyear", -5.159055299214529),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.77631844218392),
-                                    ("Oktoberyear", -3.572345637857985),
+                                     -4.7535901911063645),
+                                    ("Oktoberyear", -3.5496173867804286),
                                     ("Torsdagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.77631844218392),
+                                     -4.7535901911063645),
                                     ("Torsdagfrom <datetime> - <datetime> (interval)",
-                                     -4.77631844218392),
-                                    ("last <day-of-week> of <time>year", -5.181783550292085),
-                                    ("todayat <time-of-day>", -4.77631844218392),
-                                    ("the <day-of-month> (ordinal)Februari", -5.181783550292085),
-                                    ("dayday", -3.3099813733904937),
-                                    ("dd/mmat <time-of-day>", -4.26549281841793),
-                                    ("intersect by \",\"hh:mm", -4.26549281841793),
-                                    ("dayyear", -3.39002408106403),
-                                    ("tomorrow<time-of-day> sharp", -4.77631844218392),
+                                     -4.7535901911063645),
+                                    ("last <day-of-week> of <time>year", -5.159055299214529),
+                                    ("todayat <time-of-day>", -4.7535901911063645),
+                                    ("the <day-of-month> (ordinal)Februari", -5.159055299214529),
+                                    ("dayday", -3.2872531223129373),
+                                    ("dd/mmat <time-of-day>", -4.242764567340374),
+                                    ("intersect by \",\"hh:mm", -4.242764567340374),
+                                    ("dayyear", -3.5496173867804286),
+                                    ("tomorrow<time-of-day> sharp", -4.7535901911063645),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.77631844218392),
+                                     -4.7535901911063645),
                                     ("Onsdag<named-month> <day-of-month> (non ordinal)",
-                                     -5.181783550292085),
-                                    ("Onsdagthis <time>", -4.48863636973214),
+                                     -5.159055299214529),
+                                    ("Onsdagthis <time>", -4.465908118654584),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.083171261623976),
-                                    ("tomorrowuntil <time-of-day>", -4.77631844218392),
+                                     -4.060443010546419),
+                                    ("tomorrowuntil <time-of-day>", -4.7535901911063645),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.48863636973214),
-                                    ("after <time-of-day>at <time-of-day>", -4.77631844218392),
-                                    ("the <day-of-month> (ordinal)Mars", -4.083171261623976),
+                                     -4.465908118654584),
+                                    ("after <time-of-day>at <time-of-day>", -4.7535901911063645),
+                                    ("the <day-of-month> (ordinal)Mars", -4.060443010546419),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.77631844218392),
-                                    ("Mandagthis <cycle>", -5.181783550292085),
-                                    ("tomorrowafter <time-of-day>", -4.77631844218392),
+                                     -4.7535901911063645),
+                                    ("Mandagthis <cycle>", -5.159055299214529),
+                                    ("tomorrowafter <time-of-day>", -4.7535901911063645),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.26549281841793),
-                                    ("dayminute", -2.5076349008655563),
+                                     -4.242764567340374),
+                                    ("dayminute", -2.4849066497880004),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.48863636973214),
-                                    ("on <date>Mars", -4.083171261623976),
-                                    ("<ordinal> <cycle> of <time>year", -4.77631844218392),
-                                    ("minuteday", -2.5790938648477013),
+                                     -4.465908118654584),
+                                    ("on <date>Mars", -4.060443010546419),
+                                    ("<ordinal> <cycle> of <time>year", -4.7535901911063645),
+                                    ("minuteday", -2.5563656137701454),
                                     ("absorption of , after named dayintersect",
-                                     -5.181783550292085),
-                                    ("yearhh:mm", -5.181783550292085),
-                                    ("Tisdagthis <time>", -4.77631844218392),
-                                    ("Onsdagnext <cycle>", -5.181783550292085),
+                                     -5.159055299214529),
+                                    ("yearhh:mm", -5.159055299214529),
+                                    ("Tisdagthis <time>", -4.7535901911063645),
+                                    ("Onsdagnext <cycle>", -5.159055299214529),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.77631844218392),
-                                    ("Sondaglast <cycle>", -5.181783550292085),
-                                    ("dd/mmyear", -4.77631844218392),
-                                    ("Septemberyear", -4.26549281841793),
-                                    ("at <time-of-day>on <date>", -5.181783550292085),
+                                     -4.7535901911063645),
+                                    ("Sondaglast <cycle>", -5.159055299214529),
+                                    ("Septemberyear", -4.242764567340374),
+                                    ("at <time-of-day>on <date>", -5.159055299214529),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.181783550292085),
+                                     -5.159055299214529),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.181783550292085),
-                                    ("dayweek", -3.929020581796717),
-                                    ("Tisdagthis <cycle>", -5.181783550292085),
-                                    ("on <date>Februari", -5.181783550292085),
-                                    ("weekyear", -4.26549281841793),
-                                    ("hh:mmtomorrow", -4.48863636973214),
-                                    ("tomorrowat <time-of-day>", -3.929020581796717),
-                                    ("at <time-of-day>tomorrow", -4.77631844218392),
+                                     -5.159055299214529),
+                                    ("dayweek", -3.906292330719161),
+                                    ("Tisdagthis <cycle>", -5.159055299214529),
+                                    ("on <date>Februari", -5.159055299214529),
+                                    ("weekyear", -4.242764567340374),
+                                    ("hh:mmtomorrow", -4.465908118654584),
+                                    ("tomorrowat <time-of-day>", -3.906292330719161),
+                                    ("at <time-of-day>tomorrow", -4.7535901911063645),
                                     ("Sondag<day-of-month> (non ordinal) <named-month>",
-                                     -5.181783550292085),
-                                    ("last <cycle> of <time>year", -4.26549281841793),
+                                     -5.159055299214529),
+                                    ("last <cycle> of <time>year", -4.242764567340374),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.77631844218392),
-                                    ("yearminute", -5.181783550292085)],
-                               n = 137},
+                                     -4.7535901911063645),
+                                    ("yearminute", -5.159055299214529)],
+                               n = 135},
                    koData =
-                     ClassData{prior = -1.0477930402718967, unseen = -5.442417710521793,
+                     ClassData{prior = -1.11365016603265, unseen = -5.351858133476067,
                                likelihoods =
                                  HashMap.fromList
-                                   [("OnsdagFebruari", -4.74493212836325),
-                                    ("dayhour", -2.7990219793079367),
-                                    ("daymonth", -2.1799827709017134),
-                                    ("monthday", -3.828641396489095),
-                                    ("monthyear", -3.828641396489095),
+                                   [("OnsdagFebruari", -4.653960350157523),
+                                    ("dayhour", -2.70805020110221),
+                                    ("daymonth", -2.256065077359153),
+                                    ("monthyear", -3.7376696182833684),
                                     ("Torsdagbetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.74493212836325),
-                                    ("Mandagon <date>", -4.339467020255086),
-                                    ("yyyy-mm-ddat <time-of-day>", -4.051784947803305),
+                                     -4.653960350157523),
+                                    ("Mandagon <date>", -4.248495242049359),
+                                    ("yyyy-mm-ddat <time-of-day>", -3.960813169597578),
                                     ("Torsdagbetween <datetime> and <datetime> (interval)",
-                                     -4.74493212836325),
-                                    ("Torsdagat <time-of-day>", -3.240854731586976),
-                                    ("Marsyear", -4.051784947803305),
+                                     -4.653960350157523),
+                                    ("Torsdagat <time-of-day>", -3.1498829533812494),
+                                    ("Marsyear", -3.960813169597578),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.6463198396951406),
+                                     -3.5553480614894135),
                                     ("Torsdagfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.74493212836325),
+                                     -4.653960350157523),
                                     ("Torsdagfrom <datetime> - <datetime> (interval)",
-                                     -4.339467020255086),
-                                    ("Mandagintersect", -4.339467020255086),
-                                    ("absorption of , after named dayJuli", -4.339467020255086),
-                                    ("hourmonth", -4.339467020255086),
-                                    ("dd/mmat <time-of-day>", -3.828641396489095),
-                                    ("dayyear", -3.3586377672433594),
-                                    ("<named-month> <day-of-month> (non ordinal)Augusti",
-                                     -3.828641396489095),
-                                    ("Augusti<day-of-month> (non ordinal) <named-month>",
-                                     -3.828641396489095),
-                                    ("Onsdagthis <time>", -3.492169159867882),
-                                    ("Aprilyear", -4.74493212836325),
-                                    ("yearmonth", -4.74493212836325),
-                                    ("until <time-of-day>on <date>", -4.74493212836325),
-                                    ("Torsdaghh:mm", -4.339467020255086),
-                                    ("dayminute", -3.040184036124825),
-                                    ("minuteday", -3.240854731586976),
-                                    ("Tisdagthis <time>", -3.828641396489095),
-                                    ("hh:mmon <date>", -3.3586377672433594),
-                                    ("on <date>Februari", -4.339467020255086),
-                                    ("absorption of , after named dayFebruari", -4.051784947803305),
-                                    ("intersectFebruari", -4.339467020255086),
-                                    ("Mandagthis <time>", -4.74493212836325),
-                                    ("Sondagthis <time>", -4.339467020255086)],
-                               n = 74}}),
+                                     -4.248495242049359),
+                                    ("Mandagintersect", -4.248495242049359),
+                                    ("absorption of , after named dayJuli", -4.248495242049359),
+                                    ("hourmonth", -4.248495242049359),
+                                    ("dd/mmat <time-of-day>", -3.7376696182833684),
+                                    ("dayyear", -3.2676659890376327),
+                                    ("Onsdagthis <time>", -3.4011973816621555),
+                                    ("Aprilyear", -4.653960350157523),
+                                    ("yearmonth", -4.653960350157523),
+                                    ("until <time-of-day>on <date>", -4.653960350157523),
+                                    ("Torsdaghh:mm", -4.248495242049359),
+                                    ("dayminute", -2.9492122579190982),
+                                    ("minuteday", -3.1498829533812494),
+                                    ("Tisdagthis <time>", -3.7376696182833684),
+                                    ("hh:mmon <date>", -3.2676659890376327),
+                                    ("on <date>Februari", -4.248495242049359),
+                                    ("absorption of , after named dayFebruari", -3.960813169597578),
+                                    ("intersectFebruari", -4.248495242049359),
+                                    ("Mandagthis <time>", -4.653960350157523),
+                                    ("Sondagthis <time>", -4.248495242049359)],
+                               n = 66}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.890371757896165,
@@ -887,15 +881,15 @@ classifiers
                                n = 60}}),
        ("year",
         Classifier{okData =
-                     ClassData{prior = -0.24686007793152578,
-                               unseen = -3.295836866004329,
+                     ClassData{prior = -0.33024168687057687,
+                               unseen = -3.2188758248682006,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 25},
+                               n = 23},
                    koData =
-                     ClassData{prior = -1.5198257537444133,
-                               unseen = -2.1972245773362196,
+                     ClassData{prior = -1.2685113254635072,
+                               unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 7}}),
+                               n = 9}}),
        ("last <day-of-week> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3978952727983707,
@@ -1440,23 +1434,23 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month> <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = -0.4418327522790392,
-                               unseen = -3.1780538303479458,
+                     ClassData{prior = -0.10536051565782628,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Aprilinteger (numeric)", -2.4423470353692043),
-                                    ("Februariinteger (numeric)", -1.3437347467010947),
-                                    ("month", -0.832909122935104),
-                                    ("Juliinteger (numeric)", -1.749199854809259)],
+                                   [("Aprilinteger (numeric)", -2.3978952727983707),
+                                    ("Februariinteger (numeric)", -1.2992829841302609),
+                                    ("month", -0.7884573603642702),
+                                    ("Juliinteger (numeric)", -1.7047480922384253)],
                                n = 9},
                    koData =
-                     ClassData{prior = -1.0296194171811581, unseen = -2.772588722239781,
+                     ClassData{prior = -2.3025850929940455,
+                               unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
-                                   [("Augustiinteger (numeric)", -1.0986122886681098),
-                                    ("Aprilinteger (numeric)", -2.0149030205422647),
-                                    ("month", -0.916290731874155)],
-                               n = 5}}),
+                                   [("Aprilinteger (numeric)", -1.0986122886681098),
+                                    ("month", -1.0986122886681098)],
+                               n = 1}}),
        ("<day-of-month> (non ordinal) <named-month>",
         Classifier{okData =
                      ClassData{prior = -0.1466034741918754, unseen = -3.828641396489095,
diff --git a/Duckling/Types/Document.hs b/Duckling/Types/Document.hs
index 164cffbb..0ebd4990 100644
--- a/Duckling/Types/Document.hs
+++ b/Duckling/Types/Document.hs
@@ -136,7 +136,7 @@ isAdjacent Document{..} a b =
   b >= a && (firstNonAdjacent Array.! a >= b)
 
 isAdjacentSeparator :: Char -> Bool
-isAdjacentSeparator c = elem c [' ', '\t', '-']
+isAdjacentSeparator c = elem c [' ', '\t']
 
 (!) :: Document -> Int -> Char
 (!) Document { indexable = s } ix = s Array.! ix