From 2e50aa5ea004ceac952931bc2774d85ceafaa921 Mon Sep 17 00:00:00 2001
From: Julien Odent <jodent@fb.com>
Date: Mon, 13 Mar 2017 11:38:34 -0700
Subject: [PATCH] Fix 'tomorrow July' + IT fixes

Summary:
* we weren't checking the right reference time in `takeNth` and `takeN`
* fixing resulting failing tests for `IT`
* `analyzedNTest` to check that input results in `n` parsed tokens

Reviewed By: niteria

Differential Revision: D4698788

fbshipit-source-id: 2cd4762
---
 Duckling/Ranking/Classifiers/DA.hs | 517 +++++++++--------
 Duckling/Ranking/Classifiers/DE.hs | 390 ++++++-------
 Duckling/Ranking/Classifiers/EN.hs | 874 +++++++++++++++--------------
 Duckling/Ranking/Classifiers/FR.hs | 637 ++++++++++-----------
 Duckling/Ranking/Classifiers/IT.hs | 732 ++++++++++++------------
 Duckling/Ranking/Classifiers/KO.hs | 262 ++++-----
 Duckling/Ranking/Classifiers/NB.hs | 524 +++++++++--------
 Duckling/Ranking/Classifiers/PL.hs | 615 ++++++++++----------
 Duckling/Ranking/Classifiers/SV.hs | 547 +++++++++---------
 Duckling/Testing/Asserts.hs        |   7 +-
 Duckling/Time/EN/Tests.hs          |   9 +
 Duckling/Time/Helpers.hs           |  10 +-
 Duckling/Time/IT/Corpus.hs         |   6 -
 Duckling/Time/IT/Rules.hs          |   8 +-
 14 files changed, 2587 insertions(+), 2551 deletions(-)

diff --git a/Duckling/Ranking/Classifiers/DA.hs b/Duckling/Ranking/Classifiers/DA.hs
index a9d29c6c..cb195375 100644
--- a/Duckling/Ranking/Classifiers/DA.hs
+++ b/Duckling/Ranking/Classifiers/DA.hs
@@ -56,172 +56,159 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect2",
         Classifier{okData =
-                     ClassData{prior = -0.5817214453990283, unseen = -5.937536205082426,
+                     ClassData{prior = -0.4981471655062198, unseen = -5.808142489980444,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.143134726391533),
+                                     -4.013375499688434),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.143134726391533),
-                                    ("hourday", -5.241747015059643),
-                                    ("dayhour", -2.9904552164531473),
-                                    ("daymonth", -2.890371757896165),
-                                    ("monthyear", -3.044522437723423),
-                                    ("the <day-of-month> (ordinal)named-month",
-                                     -3.9889840465642745),
+                                     -4.013375499688434),
+                                    ("hourday", -5.111987788356543),
+                                    ("dayhour", -2.8606959897500484),
+                                    ("daymonth", -3.0970847678142785),
+                                    ("monthyear", -3.0325462466767075),
+                                    ("the <day-of-month> (ordinal)named-month", -3.859224819861175),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.836281906951478),
-                                    ("intersect2hh:mm", -5.241747015059643),
-                                    ("last <day-of-week> of <time>year", -4.836281906951478),
-                                    ("todayat <time-of-day>", -4.836281906951478),
-                                    ("dayday", -3.101680851563372),
-                                    ("dd/mmat <time-of-day>", -4.3254562831854875),
-                                    ("intersect by \",\"hh:mm", -4.836281906951478),
-                                    ("intersectnamed-month", -5.241747015059643),
-                                    ("dayyear", -2.799399979690438),
-                                    ("named-daythis <time>", -3.369944838158051),
-                                    ("quarteryear", -4.836281906951478),
-                                    ("tomorrow<time-of-day> sharp", -4.836281906951478),
+                                     -4.706522680248379),
+                                    ("intersect2hh:mm", -5.111987788356543),
+                                    ("last <day-of-week> of <time>year", -4.706522680248379),
+                                    ("todayat <time-of-day>", -4.706522680248379),
+                                    ("dayday", -2.9719216248602724),
+                                    ("dd/mmat <time-of-day>", -4.1956970564823886),
+                                    ("intersect by \",\"hh:mm", -4.706522680248379),
+                                    ("intersectnamed-month", -5.111987788356543),
+                                    ("dayyear", -3.240185611454952),
+                                    ("named-daythis <time>", -3.407239696118118),
+                                    ("tomorrow<time-of-day> sharp", -4.706522680248379),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.836281906951478),
-                                    ("named-day<time> timezone", -4.548599834499697),
-                                    ("named-monthyear", -3.1623054733798064),
+                                     -4.706522680248379),
+                                    ("named-day<time> timezone", -4.418840607796598),
+                                    ("named-monthyear", -3.0325462466767075),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.143134726391533),
-                                    ("tomorrowuntil <time-of-day>", -4.836281906951478),
+                                     -4.013375499688434),
+                                    ("tomorrowuntil <time-of-day>", -4.706522680248379),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.548599834499697),
-                                    ("intersect2named-month", -5.241747015059643),
-                                    ("after <time-of-day>at <time-of-day>", -4.836281906951478),
+                                     -4.418840607796598),
+                                    ("intersect2named-month", -5.111987788356543),
+                                    ("after <time-of-day>at <time-of-day>", -4.706522680248379),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.836281906951478),
+                                     -4.706522680248379),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.241747015059643),
+                                     -5.111987788356543),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.241747015059643),
-                                    ("nth <time> of <time>year", -3.9889840465642745),
+                                     -5.111987788356543),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.836281906951478),
-                                    ("named-daynext <cycle>", -5.241747015059643),
-                                    ("named-dayintersect", -4.548599834499697),
+                                     -4.706522680248379),
+                                    ("named-daynext <cycle>", -5.111987788356543),
+                                    ("named-dayintersect", -5.111987788356543),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.836281906951478),
-                                    ("tomorrowafter <time-of-day>", -4.836281906951478),
+                                     -4.706522680248379),
+                                    ("tomorrowafter <time-of-day>", -4.706522680248379),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.3254562831854875),
-                                    ("dayminute", -3.101680851563372),
-                                    ("<ordinal> quarteryear", -4.836281906951478),
+                                     -4.1956970564823886),
+                                    ("dayminute", -2.9719216248602724),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.548599834499697),
-                                    ("intersectyear", -4.836281906951478),
-                                    ("<ordinal> <cycle> of <time>year", -4.836281906951478),
-                                    ("minuteday", -2.639057329615259),
+                                     -4.418840607796598),
+                                    ("<ordinal> <cycle> of <time>year", -4.706522680248379),
+                                    ("minuteday", -2.5092981029121595),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.241747015059643),
-                                    ("named-dayon <date>", -5.241747015059643),
-                                    ("named-dayat <time-of-day>", -4.836281906951478),
-                                    ("named-dayintersect2", -4.548599834499697),
+                                     -5.111987788356543),
+                                    ("named-dayon <date>", -5.111987788356543),
+                                    ("named-dayat <time-of-day>", -4.706522680248379),
+                                    ("named-dayintersect2", -5.111987788356543),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.241747015059643),
+                                     -5.111987788356543),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -5.241747015059643),
-                                    ("dd/mmyear", -4.836281906951478),
-                                    ("at <time-of-day>on <date>", -5.241747015059643),
+                                     -5.111987788356543),
+                                    ("dd/mmyear", -4.706522680248379),
+                                    ("at <time-of-day>on <date>", -5.111987788356543),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.241747015059643),
+                                     -5.111987788356543),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.241747015059643),
-                                    ("dayweek", -4.143134726391533),
-                                    ("intersect2year", -4.836281906951478),
-                                    ("weekyear", -4.3254562831854875),
-                                    ("hh:mmtomorrow", -4.548599834499697),
-                                    ("tomorrowat <time-of-day>", -3.9889840465642745),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.241747015059643),
-                                    ("at <time-of-day>tomorrow", -4.836281906951478),
-                                    ("this <time>year", -4.836281906951478),
-                                    ("last <cycle> of <time>year", -4.3254562831854875),
+                                     -5.111987788356543),
+                                    ("dayweek", -4.013375499688434),
+                                    ("weekyear", -4.1956970564823886),
+                                    ("hh:mmtomorrow", -4.418840607796598),
+                                    ("tomorrowat <time-of-day>", -3.859224819861175),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.111987788356543),
+                                    ("at <time-of-day>tomorrow", -4.706522680248379),
+                                    ("last <cycle> of <time>year", -4.1956970564823886),
                                     ("named-daythe <day-of-month> (non ordinal)",
-                                     -5.241747015059643),
+                                     -5.111987788356543),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.836281906951478)],
-                               n = 147},
+                                     -4.706522680248379)],
+                               n = 127},
                    koData =
-                     ClassData{prior = -0.8185638410713999, unseen = -5.75890177387728,
+                     ClassData{prior = -0.9356150047005579, unseen = -5.493061443340548,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -5.062595033026967),
-                                    ("dayhour", -3.676300671907076),
-                                    ("daymonth", -1.9945420978933497),
-                                    ("monthday", -4.146304301152812),
-                                    ("monthyear", -2.922528869530696),
+                                   [("named-daynamed-month", -4.795790545596741),
+                                    ("dayhour", -3.4094961844768505),
+                                    ("daymonth", -1.9924301646902063),
+                                    ("monthday", -3.879499813722586),
+                                    ("monthyear", -3.879499813722586),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.809832064531599),
-                                    ("named-dayhh:mm", -5.062595033026967),
-                                    ("dd/mmat <time-of-day>", -4.146304301152812),
-                                    ("hourhour", -3.809832064531599),
-                                    ("dayyear", -2.760009940032921),
-                                    ("named-daythis <time>", -2.7112197758634893),
+                                     -3.5430275771013733),
+                                    ("named-dayhh:mm", -4.795790545596741),
+                                    ("dd/mmat <time-of-day>", -3.879499813722586),
+                                    ("hourhour", -3.5430275771013733),
+                                    ("dayyear", -3.4094961844768505),
+                                    ("named-daythis <time>", -2.3534435102275366),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.657129924918802),
-                                    ("minutemonth", -4.657129924918802),
-                                    ("named-monthyear", -4.146304301152812),
+                                     -4.390325437488577),
+                                    ("minutemonth", -4.390325437488577),
+                                    ("named-monthyear", -3.879499813722586),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.657129924918802),
+                                     -4.390325437488577),
                                     ("absorption of , after named daynamed-month",
-                                     -3.963982744358857),
+                                     -3.6971782569286313),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.657129924918802),
-                                    ("named-dayintersect", -3.809832064531599),
+                                     -4.390325437488577),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.657129924918802),
+                                     -4.390325437488577),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("until <time-of-day>on <date>", -5.062595033026967),
-                                    ("dayminute", -3.676300671907076),
-                                    ("intersectyear", -3.809832064531599),
-                                    ("minuteday", -3.5585176362506927),
+                                     -4.795790545596741),
+                                    ("until <time-of-day>on <date>", -4.795790545596741),
+                                    ("dayminute", -3.4094961844768505),
+                                    ("minuteday", -3.291713148820467),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("named-dayat <time-of-day>", -4.146304301152812),
-                                    ("named-dayintersect2", -3.809832064531599),
-                                    ("yearhh:mm", -5.062595033026967),
-                                    ("hh:mmon <date>", -3.676300671907076),
+                                     -4.795790545596741),
+                                    ("named-dayat <time-of-day>", -3.879499813722586),
+                                    ("yearhh:mm", -4.795790545596741),
+                                    ("hh:mmon <date>", -3.4094961844768505),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.062595033026967),
+                                     -4.795790545596741),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.146304301152812),
+                                     -3.879499813722586),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.146304301152812),
-                                    ("intersect2year", -3.809832064531599),
-                                    ("this <part-of-day>until <time-of-day>", -4.657129924918802),
+                                     -3.879499813722586),
+                                    ("this <part-of-day>until <time-of-day>", -4.390325437488577),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.657129924918802),
-                                    ("this <time>year", -3.1907928561253756),
-                                    ("tomorrownoon", -5.062595033026967),
-                                    ("this <time>until <time-of-day>", -4.657129924918802),
-                                    ("minuteyear", -4.657129924918802),
-                                    ("yearminute", -4.3694478524670215)],
-                               n = 116}}),
+                                     -4.390325437488577),
+                                    ("tomorrownoon", -4.795790545596741),
+                                    ("this <time>until <time-of-day>", -4.390325437488577),
+                                    ("minuteyear", -4.390325437488577),
+                                    ("yearminute", -4.102643365036796)],
+                               n = 82}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.833213344056216,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.1631508098056809),
-                                    ("tomorrowevening", -2.0794415416798357),
-                                    ("named-daymorning", -2.0794415416798357),
-                                    ("tomorrowlunch", -2.0794415416798357),
-                                    ("yesterdayevening", -2.0794415416798357)],
+                                   [("dayhour", -1.0986122886681098),
+                                    ("tomorrowevening", -2.0149030205422647),
+                                    ("named-daymorning", -2.0149030205422647),
+                                    ("tomorrowlunch", -2.0149030205422647),
+                                    ("yesterdayevening", -2.0149030205422647)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.5108256237659907, unseen = -3.044522437723423,
+                     ClassData{prior = -0.8472978603872037, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -1.0498221244986778),
-                                    ("year (latent)this <part-of-day>", -1.6094379124341003),
+                                   [("yearhour", -1.1786549963416462),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -1.6094379124341003)],
-                               n = 6}}),
+                                     -1.1786549963416462)],
+                               n = 3}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -0.2231435513142097,
@@ -379,161 +366,158 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.0794415416798357,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)quarter (grain)", -1.2992829841302609),
-                                    ("quarter", -0.7884573603642702),
-                                    ("ordinals (first..31st)quarter (grain)", -1.2992829841302609)],
-                               n = 4},
+                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
+                                    ("quarter", -0.8472978603872037),
+                                    ("ordinals (first..31st)quarter (grain)", -1.252762968495368)],
+                               n = 2},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
+                                    ("quarter", -0.8472978603872037),
+                                    ("ordinals (first..31st)quarter (grain)", -1.252762968495368)],
+                               n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.5939834314396305, unseen = -5.91350300563827,
+                     ClassData{prior = -0.5108256237659907, unseen = -5.780743515792329,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.119037174812472),
+                                     -3.9858928539946015),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.119037174812472),
-                                    ("hourday", -5.217649463480582),
-                                    ("dayhour", -2.966357664874087),
-                                    ("daymonth", -2.866274206317104),
-                                    ("monthyear", -3.0204248861443626),
-                                    ("the <day-of-month> (ordinal)named-month", -3.964886494985214),
+                                     -3.9858928539946015),
+                                    ("hourday", -5.084505142662711),
+                                    ("dayhour", -2.833213344056216),
+                                    ("daymonth", -3.0696021221204464),
+                                    ("monthyear", -3.0050636009828753),
+                                    ("the <day-of-month> (ordinal)named-month",
+                                     -3.8317421741673434),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.812184355372417),
-                                    ("intersect2hh:mm", -5.217649463480582),
-                                    ("last <day-of-week> of <time>year", -4.812184355372417),
-                                    ("todayat <time-of-day>", -4.812184355372417),
-                                    ("dayday", -3.3458472865789903),
-                                    ("dd/mmat <time-of-day>", -4.301358731606427),
-                                    ("intersect by \",\"hh:mm", -4.812184355372417),
-                                    ("intersectnamed-month", -5.217649463480582),
-                                    ("dayyear", -2.7753024281113774),
-                                    ("named-daythis <time>", -3.3458472865789903),
-                                    ("quarteryear", -4.812184355372417),
-                                    ("tomorrow<time-of-day> sharp", -4.812184355372417),
+                                     -4.679040034554547),
+                                    ("intersect2hh:mm", -5.084505142662711),
+                                    ("last <day-of-week> of <time>year", -4.679040034554547),
+                                    ("todayat <time-of-day>", -4.679040034554547),
+                                    ("dayday", -3.2127029657611197),
+                                    ("dd/mmat <time-of-day>", -4.168214410788556),
+                                    ("intersect by \",\"hh:mm", -4.679040034554547),
+                                    ("intersectnamed-month", -5.084505142662711),
+                                    ("dayyear", -3.2127029657611197),
+                                    ("named-daythis <time>", -3.379757050424286),
+                                    ("tomorrow<time-of-day> sharp", -4.679040034554547),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.812184355372417),
-                                    ("named-day<time> timezone", -4.524502282920636),
-                                    ("named-monthyear", -3.138207921800746),
+                                     -4.679040034554547),
+                                    ("named-day<time> timezone", -4.391357962102766),
+                                    ("named-monthyear", -3.0050636009828753),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.524502282920636),
-                                    ("tomorrowuntil <time-of-day>", -4.812184355372417),
+                                     -4.391357962102766),
+                                    ("tomorrowuntil <time-of-day>", -4.679040034554547),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.812184355372417),
-                                    ("intersect2named-month", -5.217649463480582),
-                                    ("after <time-of-day>at <time-of-day>", -4.812184355372417),
+                                     -4.679040034554547),
+                                    ("intersect2named-month", -5.084505142662711),
+                                    ("after <time-of-day>at <time-of-day>", -4.679040034554547),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.812184355372417),
+                                     -4.679040034554547),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.217649463480582),
+                                     -5.084505142662711),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.217649463480582),
-                                    ("nth <time> of <time>year", -3.964886494985214),
+                                     -5.084505142662711),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.812184355372417),
-                                    ("named-daynext <cycle>", -5.217649463480582),
-                                    ("named-dayintersect", -4.524502282920636),
+                                     -4.679040034554547),
+                                    ("named-daynext <cycle>", -5.084505142662711),
+                                    ("named-dayintersect", -5.084505142662711),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.812184355372417),
-                                    ("tomorrowafter <time-of-day>", -4.812184355372417),
+                                     -4.679040034554547),
+                                    ("tomorrowafter <time-of-day>", -4.679040034554547),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.301358731606427),
-                                    ("dayminute", -3.077583299984311),
-                                    ("<ordinal> quarteryear", -4.812184355372417),
+                                     -4.168214410788556),
+                                    ("dayminute", -2.9444389791664407),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.524502282920636),
-                                    ("intersectyear", -4.812184355372417),
-                                    ("<ordinal> <cycle> of <time>year", -4.812184355372417),
-                                    ("minuteday", -2.6149597780361984),
+                                     -4.391357962102766),
+                                    ("<ordinal> <cycle> of <time>year", -4.679040034554547),
+                                    ("minuteday", -2.4818154572183277),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.217649463480582),
-                                    ("named-dayon <date>", -5.217649463480582),
-                                    ("named-dayat <time-of-day>", -4.812184355372417),
-                                    ("named-dayintersect2", -4.524502282920636),
+                                     -5.084505142662711),
+                                    ("named-dayon <date>", -5.084505142662711),
+                                    ("named-dayat <time-of-day>", -4.679040034554547),
+                                    ("named-dayintersect2", -5.084505142662711),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.217649463480582),
-                                    ("dd/mmyear", -4.812184355372417),
-                                    ("at <time-of-day>on <date>", -5.217649463480582),
+                                     -5.084505142662711),
+                                    ("dd/mmyear", -4.679040034554547),
+                                    ("at <time-of-day>on <date>", -5.084505142662711),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.217649463480582),
+                                     -5.084505142662711),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.217649463480582),
-                                    ("dayweek", -4.119037174812472),
-                                    ("intersect2year", -4.812184355372417),
-                                    ("weekyear", -4.301358731606427),
-                                    ("hh:mmtomorrow", -4.524502282920636),
-                                    ("tomorrowat <time-of-day>", -3.964886494985214),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.217649463480582),
-                                    ("at <time-of-day>tomorrow", -4.812184355372417),
-                                    ("this <time>year", -4.812184355372417),
-                                    ("last <cycle> of <time>year", -4.301358731606427),
+                                     -5.084505142662711),
+                                    ("dayweek", -3.9858928539946015),
+                                    ("weekyear", -4.168214410788556),
+                                    ("hh:mmtomorrow", -4.391357962102766),
+                                    ("tomorrowat <time-of-day>", -3.8317421741673434),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.084505142662711),
+                                    ("at <time-of-day>tomorrow", -4.679040034554547),
+                                    ("last <cycle> of <time>year", -4.168214410788556),
                                     ("named-daythe <day-of-month> (non ordinal)",
-                                     -5.217649463480582),
+                                     -5.084505142662711),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.812184355372417)],
-                               n = 143},
+                                     -4.679040034554547)],
+                               n = 123},
                    koData =
-                     ClassData{prior = -0.8032378705931731, unseen = -5.755742213586912,
+                     ClassData{prior = -0.916290731874155, unseen = -5.488937726156687,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -5.059425458265688),
-                                    ("dayhour", -3.6731310971457973),
-                                    ("daymonth", -1.9913725231320707),
-                                    ("monthday", -4.143134726391533),
-                                    ("monthyear", -2.919359294769417),
+                                   [("named-daynamed-month", -4.791649752930709),
+                                    ("dayhour", -3.405355391810819),
+                                    ("daymonth", -1.9882893720241748),
+                                    ("monthday", -3.8753590210565547),
+                                    ("monthyear", -3.8753590210565547),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.8066624897703196),
-                                    ("named-dayhh:mm", -5.059425458265688),
-                                    ("dd/mmat <time-of-day>", -4.143134726391533),
-                                    ("hourhour", -3.8066624897703196),
-                                    ("dayyear", -2.7568403652716422),
-                                    ("named-daythis <time>", -2.70805020110221),
+                                     -3.5388867844353418),
+                                    ("named-dayhh:mm", -4.791649752930709),
+                                    ("dd/mmat <time-of-day>", -3.8753590210565547),
+                                    ("hourhour", -3.5388867844353418),
+                                    ("dayyear", -3.405355391810819),
+                                    ("named-daythis <time>", -2.3493027175615055),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.653960350157523),
-                                    ("minutemonth", -4.653960350157523),
-                                    ("named-monthyear", -4.143134726391533),
+                                     -4.386184644822546),
+                                    ("minutemonth", -4.386184644822546),
+                                    ("named-monthyear", -3.8753590210565547),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.653960350157523),
+                                     -4.386184644822546),
                                     ("absorption of , after named daynamed-month",
-                                     -3.960813169597578),
+                                     -3.6930374642626003),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.653960350157523),
-                                    ("named-dayintersect", -3.8066624897703196),
+                                     -4.386184644822546),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.653960350157523),
+                                     -4.386184644822546),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.059425458265688),
-                                    ("until <time-of-day>on <date>", -5.059425458265688),
-                                    ("dayminute", -3.6731310971457973),
-                                    ("intersectyear", -3.8066624897703196),
-                                    ("minuteday", -3.5553480614894135),
+                                     -4.791649752930709),
+                                    ("until <time-of-day>on <date>", -4.791649752930709),
+                                    ("dayminute", -3.405355391810819),
+                                    ("minuteday", -3.2875723561544357),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.059425458265688),
-                                    ("named-dayat <time-of-day>", -4.143134726391533),
-                                    ("named-dayintersect2", -3.8066624897703196),
-                                    ("yearhh:mm", -5.059425458265688),
-                                    ("hh:mmon <date>", -3.6731310971457973),
+                                     -4.791649752930709),
+                                    ("named-dayat <time-of-day>", -3.8753590210565547),
+                                    ("yearhh:mm", -4.791649752930709),
+                                    ("hh:mmon <date>", -3.405355391810819),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.059425458265688),
+                                     -4.791649752930709),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.143134726391533),
+                                     -3.8753590210565547),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.143134726391533),
-                                    ("intersect2year", -3.8066624897703196),
-                                    ("this <part-of-day>until <time-of-day>", -4.653960350157523),
+                                     -3.8753590210565547),
+                                    ("this <part-of-day>until <time-of-day>", -4.386184644822546),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.653960350157523),
-                                    ("this <time>year", -3.1876232813640963),
-                                    ("tomorrownoon", -5.059425458265688),
-                                    ("this <time>until <time-of-day>", -4.653960350157523),
-                                    ("minuteyear", -4.653960350157523),
-                                    ("yearminute", -4.366278277705742)],
-                               n = 116}}),
+                                     -4.386184644822546),
+                                    ("tomorrownoon", -4.791649752930709),
+                                    ("this <time>until <time-of-day>", -4.386184644822546),
+                                    ("minuteyear", -4.386184644822546),
+                                    ("yearminute", -4.098502572370764)],
+                               n = 82}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -726,20 +710,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.8066624897703196,
+                     ClassData{prior = -0.35667494393873245,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7396671961948381),
+                                   [("daymonth", -0.7576857016975165),
                                     ("ordinals (first..31st)named-dayintersect2",
-                                     -1.8382794848629478),
+                                     -1.5198257537444133),
                                     ("ordinals (first..31st)named-dayintersect",
-                                     -1.8382794848629478),
+                                     -1.5198257537444133),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -1.5869650565820417)],
-                               n = 20},
+                                     -2.367123614131617)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.2039728043259361, unseen = -2.833213344056216,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.8266785731844679),
+                                    ("ordinals (first..31st)named-daynamed-month",
+                                     -0.8266785731844679)],
+                               n = 6}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.3025850929940455,
@@ -1678,32 +1668,33 @@ classifiers
                                n = 10}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -1.3083328196501787, unseen = -4.007333185232471,
+                     ClassData{prior = -1.413693335308005, unseen = -3.9318256327243257,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.379546134130174),
-                                    ("intersect2", -2.890371757896165),
-                                    ("intersect", -2.890371757896165),
-                                    ("season", -2.379546134130174),
-                                    ("next <cycle>", -3.295836866004329),
-                                    ("named-month", -2.379546134130174),
-                                    ("day", -2.379546134130174),
-                                    ("this <cycle>", -2.6026896854443837),
-                                    ("hour", -2.379546134130174), ("evening", -3.295836866004329),
-                                    ("month", -1.791759469228055), ("morning", -3.295836866004329),
-                                    ("week-end", -2.890371757896165)],
-                               n = 20},
+                                   [("week", -2.3025850929940455),
+                                    ("intersect2", -2.8134107167600364),
+                                    ("intersect", -2.8134107167600364),
+                                    ("season", -2.3025850929940455),
+                                    ("next <cycle>", -3.2188758248682006),
+                                    ("named-month", -2.8134107167600364),
+                                    ("day", -2.3025850929940455),
+                                    ("this <cycle>", -2.5257286443082556),
+                                    ("hour", -2.3025850929940455), ("evening", -3.2188758248682006),
+                                    ("month", -1.9661128563728327),
+                                    ("morning", -3.2188758248682006),
+                                    ("week-end", -2.8134107167600364)],
+                               n = 18},
                    koData =
-                     ClassData{prior = -0.3150810466398954, unseen = -4.812184355372417,
+                     ClassData{prior = -0.2787134024690205, unseen = -4.844187086458591,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.23907168727172),
-                                    ("intersect", -2.23907168727172),
-                                    ("named-month", -1.9708077006770406),
-                                    ("time-of-day (latent)", -3.7054087560651467),
-                                    ("hour", -2.0959708436310467), ("month", -1.0904489780289488),
-                                    ("morning", -2.23907168727172)],
-                               n = 54}}),
+                                   [("intersect2", -2.2713325494899412),
+                                    ("intersect", -2.2713325494899412),
+                                    ("named-month", -1.8918429277850375),
+                                    ("time-of-day (latent)", -3.7376696182833684),
+                                    ("hour", -2.128231705849268), ("month", -1.0750817912579156),
+                                    ("morning", -2.2713325494899412)],
+                               n = 56}}),
        ("within <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Ranking/Classifiers/DE.hs b/Duckling/Ranking/Classifiers/DE.hs
index 34b78e6d..f5c8cd3e 100644
--- a/Duckling/Ranking/Classifiers/DE.hs
+++ b/Duckling/Ranking/Classifiers/DE.hs
@@ -86,7 +86,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.1823215567939546, unseen = -5.429345628954441,
+                     ClassData{prior = -0.16362942378180204,
+                               unseen = -5.429345628954441,
                                likelihoods =
                                  HashMap.fromList
                                    [("<time-of-day>  o'clockmorning", -4.326337728813293),
@@ -147,23 +148,23 @@ classifiers
                                      -4.7318028369214575)],
                                n = 90},
                    koData =
-                     ClassData{prior = -1.791759469228055, unseen = -4.430816798843313,
+                     ClassData{prior = -1.890850371872286, unseen = -4.382026634673881,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.8094026953624978),
-                                    ("year (latent)on <date>", -3.3202283191284883),
-                                    ("<time-of-day>  o'clockafter lunch", -3.7256934272366524),
-                                    ("intersectevening", -3.0325462466767075),
-                                    ("monthhour", -3.7256934272366524),
-                                    ("time-of-day (latent)on <date>", -2.8094026953624978),
-                                    ("hourhour", -1.7797832781813394),
-                                    ("<time-of-day>  o'clockafternoon", -3.7256934272366524),
+                                   [("yearhour", -3.270835563798912),
+                                    ("year (latent)on <date>", -3.676300671907076),
+                                    ("<time-of-day>  o'clockafter lunch", -3.676300671907076),
+                                    ("intersectevening", -2.9831534913471307),
+                                    ("monthhour", -3.676300671907076),
+                                    ("time-of-day (latent)on <date>", -2.760009940032921),
+                                    ("hourhour", -1.7303905228517629),
+                                    ("<time-of-day>  o'clockafternoon", -3.676300671907076),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -3.3202283191284883),
-                                    ("named-monthmorning", -3.7256934272366524),
+                                     -3.676300671907076),
+                                    ("named-monthmorning", -3.676300671907076),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.8094026953624978)],
-                               n = 18}}),
+                                     -2.760009940032921)],
+                               n = 16}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -337,238 +338,238 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
-                                    ("ordinals (first..19th)quarter (grain)", -1.252762968495368),
-                                    ("quarter", -0.8472978603872037)],
-                               n = 2},
+                                   [("ordinals (first..19th)quarter (grain)", -0.916290731874155),
+                                    ("quarter", -0.916290731874155)],
+                               n = 1},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -0.916290731874155),
+                                    ("quarter", -0.916290731874155)],
+                               n = 1}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.18643557964027913, unseen = -6.54534966033442,
+                     ClassData{prior = -0.18887114853099604,
+                               unseen = -6.529418838262226,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect by ','named-month", -4.241326752570746),
-                                    ("hourday", -4.5980016965094785),
-                                    ("dayhour", -3.0474042840983118),
-                                    ("daymonth", -3.0781759427650655),
+                                   [("intersect by ','named-month", -4.225372824628505),
+                                    ("hourday", -4.582047768567238),
+                                    ("dayhour", -3.0314503561560704),
+                                    ("daymonth", -3.062222014822824),
                                     ("<day-of-month>(ordinal) <named-month> year<time-of-day>  o'clock",
-                                     -5.850764665004847),
-                                    ("monthyear", -4.241326752570746),
-                                    ("yearhour", -5.850764665004847),
-                                    ("intersect<time-of-day>  o'clock", -4.464470303884956),
-                                    ("christmasyear", -5.850764665004847),
-                                    ("after lunchat <time-of-day>", -5.850764665004847),
-                                    ("named-daylast <cycle>", -5.850764665004847),
-                                    ("intersect by 'of', 'from', 'syear", -5.445299556896683),
-                                    ("<time-of-day> am|pmintersect", -5.157617484444901),
-                                    ("intersect<time> <part-of-day>", -4.464470303884956),
-                                    ("<time-of-day>  o'clockafter lunch", -5.157617484444901),
+                                     -5.834810737062605),
+                                    ("monthyear", -4.225372824628505),
+                                    ("yearhour", -5.834810737062605),
+                                    ("intersect<time-of-day>  o'clock", -4.448516375942715),
+                                    ("christmasyear", -5.834810737062605),
+                                    ("after lunchat <time-of-day>", -5.834810737062605),
+                                    ("named-daylast <cycle>", -5.834810737062605),
+                                    ("intersect by 'of', 'from', 'syear", -5.429345628954441),
+                                    ("<time-of-day> am|pmintersect", -5.14166355650266),
+                                    ("intersect<time> <part-of-day>", -4.448516375942715),
+                                    ("<time-of-day>  o'clockafter lunch", -5.14166355650266),
                                     ("<time> <part-of-day><time-of-day>  o'clock",
-                                     -5.850764665004847),
-                                    ("today<time-of-day>  o'clock", -5.850764665004847),
-                                    ("<time-of-day>  o'clockon <date>", -5.445299556896683),
-                                    ("<time-of-day> am|pmintersect by ','", -5.850764665004847),
-                                    ("on <date><time-of-day>  o'clock", -5.850764665004847),
-                                    ("exactly <time-of-day>tomorrow", -5.445299556896683),
+                                     -5.834810737062605),
+                                    ("today<time-of-day>  o'clock", -5.834810737062605),
+                                    ("<time-of-day>  o'clockon <date>", -5.429345628954441),
+                                    ("<time-of-day> am|pmintersect by ','", -5.834810737062605),
+                                    ("on <date><time-of-day>  o'clock", -5.834810737062605),
+                                    ("exactly <time-of-day>tomorrow", -5.429345628954441),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -5.850764665004847),
-                                    ("last <day-of-week> of <time>year", -5.850764665004847),
-                                    ("hourmonth", -5.445299556896683),
-                                    ("todayat <time-of-day>", -5.157617484444901),
+                                     -5.834810737062605),
+                                    ("last <day-of-week> of <time>year", -5.834810737062605),
+                                    ("hourmonth", -5.429345628954441),
+                                    ("todayat <time-of-day>", -5.14166355650266),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -5.850764665004847),
-                                    ("on <date>at <time-of-day>", -5.445299556896683),
-                                    ("named-dayhh:mm", -5.850764665004847),
-                                    ("dayday", -3.7106985015085763),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.445299556896683),
+                                     -5.834810737062605),
+                                    ("on <date>at <time-of-day>", -5.429345628954441),
+                                    ("named-dayhh:mm", -5.834810737062605),
+                                    ("dayday", -3.6947445735663345),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.429345628954441),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -5.850764665004847),
-                                    ("about <time-of-day>on <date>", -5.850764665004847),
+                                     -5.834810737062605),
+                                    ("about <time-of-day>on <date>", -5.834810737062605),
                                     ("<hour-of-day> <integer> (as relative minutes)in|during the <part-of-day>",
-                                     -5.445299556896683),
-                                    ("<day-of-month> (ordinal)intersect", -5.850764665004847),
-                                    ("hourhour", -3.3250360206965914),
-                                    ("<part-of-day> of <time>named-month", -5.445299556896683),
-                                    ("hh:mmintersect by ','", -5.445299556896683),
-                                    ("intersectnamed-month", -3.0781759427650655),
-                                    ("dayyear", -3.7106985015085763),
+                                     -5.429345628954441),
+                                    ("<day-of-month> (ordinal)intersect", -5.834810737062605),
+                                    ("hourhour", -3.3090820927543496),
+                                    ("<part-of-day> of <time>named-month", -5.429345628954441),
+                                    ("hh:mmintersect by ','", -5.429345628954441),
+                                    ("intersectnamed-month", -3.062222014822824),
+                                    ("dayyear", -3.8889005880072918),
                                     ("<time-of-day>  o'clockin|during the <part-of-day>",
-                                     -4.7521523763367375),
-                                    ("tomorrow<time-of-day>  o'clock", -5.850764665004847),
-                                    ("<time-of-day>  o'clocktomorrow", -5.157617484444901),
-                                    ("quarteryear", -5.850764665004847),
+                                     -4.736198448394496),
+                                    ("tomorrow<time-of-day>  o'clock", -5.834810737062605),
+                                    ("<time-of-day>  o'clocktomorrow", -5.14166355650266),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("half <integer> (german style hour-of-day)after lunch",
-                                     -5.850764665004847),
-                                    ("hourminute", -5.157617484444901),
-                                    ("minutemonth", -3.176616015578318),
-                                    ("minutehour", -3.5994728663983517),
-                                    ("named-day<time> timezone", -5.850764665004847),
+                                     -5.834810737062605),
+                                    ("hourminute", -5.14166355650266),
+                                    ("minutemonth", -3.1606620876360765),
+                                    ("minutehour", -3.58351893845611),
+                                    ("named-day<time> timezone", -5.834810737062605),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -4.9344739331306915),
-                                    ("named-monthyear", -4.241326752570746),
+                                     -4.918520005188451),
+                                    ("named-monthyear", -4.225372824628505),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.7521523763367375),
+                                     -4.736198448394496),
                                     ("named-day<time-of-day> - <time-of-day> (interval)",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("<day-of-month>(ordinal) <named-month> year<time> <part-of-day>",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("<hour-of-day> <integer> (as relative minutes)after lunch",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("named-day<datetime> - <datetime> (interval)",
-                                     -5.850764665004847),
-                                    ("on <date>named-month", -4.9344739331306915),
+                                     -5.834810737062605),
+                                    ("on <date>named-month", -4.918520005188451),
                                     ("intersect<day-of-month>(ordinal) <named-month>",
-                                     -4.464470303884956),
+                                     -4.448516375942715),
                                     ("this <part-of-day><time-of-day>  o'clock",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("<day-of-month>(ordinal) <named-month>intersect",
-                                     -5.850764665004847),
-                                    ("nth <time> of <time>year", -5.157617484444901),
-                                    ("hh:mmintersect", -3.835861644462582),
+                                     -5.834810737062605),
+                                    ("hh:mmintersect", -3.8199077165203406),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -5.445299556896683),
-                                    ("named-daynext <cycle>", -5.850764665004847),
+                                     -5.429345628954441),
+                                    ("named-daynext <cycle>", -5.834810737062605),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.157617484444901),
-                                    ("<day-of-month> (ordinal)named-day", -5.445299556896683),
-                                    ("intersect by ','intersect", -5.850764665004847),
+                                     -5.14166355650266),
+                                    ("<day-of-month> (ordinal)named-day", -5.429345628954441),
+                                    ("intersect by ','intersect", -5.834810737062605),
                                     ("half <integer> (german style hour-of-day)in|during the <part-of-day>",
-                                     -5.445299556896683),
-                                    ("at <time-of-day>intersect", -4.464470303884956),
+                                     -5.429345628954441),
+                                    ("at <time-of-day>intersect", -4.448516375942715),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.445299556896683),
+                                     -5.429345628954441),
                                     ("<time> <part-of-day>from <time-of-day> - <time-of-day> (interval)",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("absorption of , after named day<day-of-month> (ordinal)",
-                                     -4.7521523763367375),
-                                    ("dayminute", -3.6535400876686275),
+                                     -4.736198448394496),
+                                    ("dayminute", -3.6375861597263857),
                                     ("on <date>from <datetime> - <datetime> (interval)",
-                                     -5.850764665004847),
-                                    ("<ordinal> quarteryear", -5.850764665004847),
+                                     -5.834810737062605),
                                     ("<time> <part-of-day>from <datetime> - <datetime> (interval)",
-                                     -5.850764665004847),
-                                    ("intersectyear", -4.9344739331306915),
-                                    ("on <date><day-of-month> (ordinal)", -5.445299556896683),
-                                    ("<ordinal> <cycle> of <time>year", -5.850764665004847),
-                                    ("minuteday", -2.253452404416401),
+                                     -5.834810737062605),
+                                    ("intersectyear", -4.918520005188451),
+                                    ("on <date><day-of-month> (ordinal)", -5.429345628954441),
+                                    ("<ordinal> <cycle> of <time>year", -5.834810737062605),
+                                    ("minuteday", -2.2374984764741592),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("<datetime> - <datetime> (interval)named-month",
-                                     -5.445299556896683),
-                                    ("year<time-of-day>  o'clock", -5.850764665004847),
-                                    ("at <time-of-day>intersect by ','", -5.850764665004847),
-                                    ("named-dayat <time-of-day>", -5.445299556896683),
-                                    ("hh:mmabsorption of , after named day", -5.445299556896683),
-                                    ("<time-of-day> am|pmnamed-day", -5.850764665004847),
-                                    ("hh:mmon <date>", -3.835861644462582),
+                                     -5.429345628954441),
+                                    ("year<time-of-day>  o'clock", -5.834810737062605),
+                                    ("at <time-of-day>intersect by ','", -5.834810737062605),
+                                    ("named-dayat <time-of-day>", -5.429345628954441),
+                                    ("hh:mmabsorption of , after named day", -5.429345628954441),
+                                    ("<time-of-day> am|pmnamed-day", -5.834810737062605),
+                                    ("hh:mmon <date>", -3.8199077165203406),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -5.850764665004847),
-                                    ("until <time-of-day>after lunch", -5.850764665004847),
-                                    ("mm/ddyear", -5.850764665004847),
-                                    ("intersect<day-of-month> (ordinal)", -4.464470303884956),
-                                    ("named-day<time-of-day>  o'clock", -5.850764665004847),
+                                     -5.834810737062605),
+                                    ("until <time-of-day>after lunch", -5.834810737062605),
+                                    ("mm/ddyear", -5.834810737062605),
+                                    ("intersect<day-of-month> (ordinal)", -4.448516375942715),
+                                    ("named-day<time-of-day>  o'clock", -5.834810737062605),
                                     ("<day-of-month> (ordinal)intersect by 'of', 'from', 's",
-                                     -5.445299556896683),
-                                    ("at <time-of-day>on <date>", -4.346687268228573),
-                                    ("intersectintersect", -4.059005195776792),
-                                    ("dayweek", -4.7521523763367375),
-                                    ("weekyear", -5.445299556896683),
-                                    ("hh:mmin|during the <part-of-day>", -4.9344739331306915),
-                                    ("<day-of-month> (ordinal)named-month", -4.146016572766421),
-                                    ("tomorrowat <time-of-day>", -5.445299556896683),
+                                     -5.429345628954441),
+                                    ("at <time-of-day>on <date>", -4.330733340286331),
+                                    ("intersectintersect", -4.04305126783455),
+                                    ("dayweek", -4.736198448394496),
+                                    ("weekyear", -5.429345628954441),
+                                    ("hh:mmin|during the <part-of-day>", -4.918520005188451),
+                                    ("<day-of-month> (ordinal)named-month", -4.13006264482418),
+                                    ("tomorrowat <time-of-day>", -5.429345628954441),
                                     ("<hour-of-day> <integer> (as relative minutes)on <date>",
-                                     -5.850764665004847),
-                                    ("named-daythis <cycle>", -5.157617484444901),
-                                    ("at <time-of-day>tomorrow", -5.850764665004847),
+                                     -5.834810737062605),
+                                    ("named-daythis <cycle>", -5.14166355650266),
+                                    ("at <time-of-day>tomorrow", -5.834810737062605),
                                     ("about <time-of-day>in|during the <part-of-day>",
-                                     -5.445299556896683),
+                                     -5.429345628954441),
                                     ("half <integer> (german style hour-of-day)on <date>",
-                                     -5.850764665004847),
-                                    ("this <part-of-day>at <time-of-day>", -5.445299556896683),
+                                     -5.834810737062605),
+                                    ("this <part-of-day>at <time-of-day>", -5.429345628954441),
                                     ("after lunch<hour-of-day> <integer> (as relative minutes)",
-                                     -5.445299556896683),
-                                    ("last <cycle> of <time>year", -5.445299556896683),
+                                     -5.429345628954441),
+                                    ("last <cycle> of <time>year", -5.429345628954441),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.850764665004847),
+                                     -5.834810737062605),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -5.850764665004847)],
-                               n = 283},
+                                     -5.834810737062605)],
+                               n = 279},
                    koData =
-                     ClassData{prior = -1.7714394667370976,
-                               unseen = -5.5053315359323625,
+                     ClassData{prior = -1.7596399198059425, unseen = -5.493061443340548,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-day<part-of-day> of <time>", -4.808111029984782),
-                                    ("dayhour", -4.114963849424837),
-                                    ("daymonth", -2.9363088530831902),
-                                    ("monthday", -4.402645921876617),
-                                    ("monthyear", -4.808111029984782),
-                                    ("yearhour", -4.808111029984782),
-                                    ("intersect<time-of-day>  o'clock", -4.808111029984782),
-                                    ("after lunchat <time-of-day>", -4.402645921876617),
-                                    ("intersect by 'of', 'from', 'syear", -4.114963849424837),
-                                    ("intersect<time> <part-of-day>", -4.808111029984782),
-                                    ("<time-of-day>  o'clockafter lunch", -4.808111029984782),
-                                    ("<day-of-month> (ordinal)year", -4.808111029984782),
-                                    ("after lunch<time-of-day>  o'clock", -4.808111029984782),
+                                   [("named-day<part-of-day> of <time>", -4.795790545596741),
+                                    ("dayhour", -4.102643365036796),
+                                    ("daymonth", -2.9239883686951496),
+                                    ("monthday", -4.390325437488577),
+                                    ("monthyear", -4.795790545596741),
+                                    ("yearhour", -4.795790545596741),
+                                    ("intersect<time-of-day>  o'clock", -4.795790545596741),
+                                    ("after lunchat <time-of-day>", -4.390325437488577),
+                                    ("intersect by 'of', 'from', 'syear", -4.102643365036796),
+                                    ("intersect<time> <part-of-day>", -4.795790545596741),
+                                    ("<time-of-day>  o'clockafter lunch", -4.795790545596741),
+                                    ("<day-of-month> (ordinal)year", -4.795790545596741),
+                                    ("after lunch<time-of-day>  o'clock", -4.795790545596741),
                                     ("<time-of-day>  o'clock<time> <part-of-day>",
-                                     -3.891820298110627),
-                                    ("monthhour", -4.114963849424837),
+                                     -3.879499813722586),
+                                    ("monthhour", -4.102643365036796),
                                     ("on <date>between <datetime> and <datetime> (interval)",
-                                     -4.808111029984782),
-                                    ("todayat <time-of-day>", -4.808111029984782),
+                                     -4.795790545596741),
+                                    ("todayat <time-of-day>", -4.795790545596741),
                                     ("on <date>between <time-of-day> and <time-of-day> (interval)",
-                                     -4.808111029984782),
-                                    ("named-dayhh:mm", -4.808111029984782),
-                                    ("dayday", -3.5553480614894135),
-                                    ("hourhour", -3.3040336332085074),
-                                    ("dayyear", -3.709498741316672),
-                                    ("minutemonth", -4.808111029984782),
-                                    ("named-monthyear", -4.808111029984782),
+                                     -4.795790545596741),
+                                    ("named-dayhh:mm", -4.795790545596741),
+                                    ("dayday", -3.5430275771013733),
+                                    ("hourhour", -3.291713148820467),
+                                    ("dayyear", -3.6971782569286313),
+                                    ("minutemonth", -4.795790545596741),
+                                    ("named-monthyear", -4.795790545596741),
                                     ("named-day<time-of-day> - <time-of-day> (interval)",
-                                     -4.808111029984782),
-                                    ("on <date>named-month", -4.808111029984782),
+                                     -4.795790545596741),
+                                    ("on <date>named-month", -4.795790545596741),
                                     ("absorption of , after named daynamed-month",
-                                     -3.709498741316672),
-                                    ("named-dayafter <time-of-day>", -4.402645921876617),
+                                     -3.6971782569286313),
+                                    ("named-dayafter <time-of-day>", -4.390325437488577),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.402645921876617),
+                                     -4.390325437488577),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.808111029984782),
+                                     -4.795790545596741),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.114963849424837),
-                                    ("<day-of-month> (ordinal)named-day", -4.114963849424837),
+                                     -4.102643365036796),
+                                    ("<day-of-month> (ordinal)named-day", -4.102643365036796),
                                     ("on <date>from <time-of-day> - <time-of-day> (interval)",
-                                     -4.402645921876617),
-                                    ("dayminute", -2.668044866488511),
+                                     -4.390325437488577),
+                                    ("dayminute", -2.65572438210047),
                                     ("on <date>from <datetime> - <datetime> (interval)",
-                                     -4.808111029984782),
+                                     -4.795790545596741),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -4.808111029984782),
+                                     -4.795790545596741),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.808111029984782),
+                                     -4.795790545596741),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.402645921876617),
-                                    ("year<time> <part-of-day>", -4.808111029984782),
+                                     -4.390325437488577),
+                                    ("year<time> <part-of-day>", -4.795790545596741),
                                     ("<day-of-month> (ordinal)intersect by 'of', 'from', 's",
-                                     -4.402645921876617),
+                                     -4.390325437488577),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.402645921876617),
-                                    ("named-monthintersect", -4.808111029984782),
-                                    ("<day-of-month> (ordinal)named-month", -4.114963849424837),
-                                    ("until <time-of-day>named-month", -4.808111029984782),
-                                    ("after <time-of-day>year", -4.808111029984782),
-                                    ("on <date>after <time-of-day>", -4.808111029984782),
-                                    ("tomorrownoon", -4.808111029984782)],
+                                     -4.390325437488577),
+                                    ("named-monthintersect", -4.795790545596741),
+                                    ("<day-of-month> (ordinal)named-month", -4.102643365036796),
+                                    ("until <time-of-day>named-month", -4.795790545596741),
+                                    ("after <time-of-day>year", -4.795790545596741),
+                                    ("on <date>after <time-of-day>", -4.795790545596741),
+                                    ("tomorrownoon", -4.795790545596741)],
                                n = 58}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
@@ -744,18 +745,25 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.890371757896165,
+                     ClassData{prior = -0.5596157879354228,
+                               unseen = -2.4849066497880004,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7537718023763802),
+                                   [("daymonth", -0.7884573603642702),
                                     ("ordinals (first..19th)named-dayintersect",
-                                     -1.4469189829363254),
+                                     -1.0116009116784799),
                                     ("ordinals (first..19th)named-daynamed-month",
-                                     -1.2237754316221157)],
-                               n = 7},
+                                     -1.7047480922384253)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.8472978603872037,
+                               unseen = -2.3025850929940455,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.8109302162163288),
+                                    ("ordinals (first..19th)named-daynamed-month",
+                                     -0.8109302162163288)],
+                               n = 3}}),
        ("named-month",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.8501476017100584,
diff --git a/Duckling/Ranking/Classifiers/EN.hs b/Duckling/Ranking/Classifiers/EN.hs
index 481c4dfc..6ac5c13b 100644
--- a/Duckling/Ranking/Classifiers/EN.hs
+++ b/Duckling/Ranking/Classifiers/EN.hs
@@ -152,211 +152,209 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect2",
         Classifier{okData =
-                     ClassData{prior = -0.5108256237659907, unseen = -6.124683390894205,
+                     ClassData{prior = -0.5145224856473168,
+                               unseen = -6.1070228877422545,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.513054897080286),
+                                     -4.4953553199808844),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.513054897080286),
-                                    ("hourday", -3.8199077165203406),
-                                    ("dayhour", -3.126760535960395),
-                                    ("daymonth", -5.429345628954441),
-                                    ("monthday", -5.0238805208462765),
-                                    ("monthyear", -3.8199077165203406),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.429345628954441),
-                                    ("Christmasyear", -5.429345628954441),
+                                     -4.4953553199808844),
+                                    ("hourday", -3.7068979596166147),
+                                    ("dayhour", -3.109060958860994),
+                                    ("daymonth", -5.4116460518550396),
+                                    ("monthday", -5.006180943746876),
+                                    ("monthyear", -3.8022081394209395),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.4116460518550396),
+                                    ("Christmasyear", -5.4116460518550396),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -5.429345628954441),
+                                     -5.4116460518550396),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -5.429345628954441),
-                                    ("Marchyear", -5.429345628954441),
+                                     -5.4116460518550396),
+                                    ("Marchyear", -5.4116460518550396),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year",
-                                     -5.0238805208462765),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.429345628954441),
-                                    ("monthhour", -4.736198448394496),
-                                    ("last <day-of-week> of <time>year", -5.429345628954441),
-                                    ("intersect2<time-of-day> am|pm", -5.429345628954441),
-                                    ("todayat <time-of-day>", -5.429345628954441),
-                                    ("Thursday<time> timezone", -5.0238805208462765),
-                                    ("at <time-of-day>intersect2", -5.0238805208462765),
+                                     -5.006180943746876),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.4116460518550396),
+                                    ("monthhour", -4.718498871295094),
+                                    ("last <day-of-week> of <time>year", -5.4116460518550396),
+                                    ("intersect2<time-of-day> am|pm", -5.4116460518550396),
+                                    ("todayat <time-of-day>", -5.4116460518550396),
+                                    ("Thursday<time> timezone", -5.006180943746876),
+                                    ("at <time-of-day>intersect2", -5.006180943746876),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -5.429345628954441),
-                                    ("dayday", -3.414442608412176),
-                                    ("Thanksgiving Dayyear", -5.0238805208462765),
-                                    ("Tuesdayin <named-month>", -5.429345628954441),
-                                    ("mm/ddat <time-of-day>", -5.429345628954441),
-                                    ("tonightat <time-of-day>", -5.429345628954441),
+                                     -5.4116460518550396),
+                                    ("dayday", -3.3967430313127753),
+                                    ("Thanksgiving Dayyear", -5.006180943746876),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.4116460518550396),
+                                    ("Tuesdayin <named-month>", -5.4116460518550396),
+                                    ("mm/ddat <time-of-day>", -5.4116460518550396),
+                                    ("tonightat <time-of-day>", -5.4116460518550396),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -4.736198448394496),
-                                    ("today<time-of-day> am|pm", -5.429345628954441),
-                                    ("Februarythe <day-of-month> (ordinal)", -5.0238805208462765),
-                                    ("at <time-of-day><time> <part-of-day>", -5.429345628954441),
-                                    ("mm/dd<time-of-day> am|pm", -5.429345628954441),
-                                    ("hourhour", -4.330733340286331),
-                                    ("<time-of-day> am|pmon <date>", -3.6375861597263857),
-                                    ("Wednesdaythis|last|next <cycle>", -5.429345628954441),
+                                     -4.718498871295094),
+                                    ("today<time-of-day> am|pm", -5.4116460518550396),
+                                    ("Februarythe <day-of-month> (ordinal)", -5.006180943746876),
+                                    ("at <time-of-day><time> <part-of-day>", -5.4116460518550396),
+                                    ("mm/dd<time-of-day> am|pm", -5.4116460518550396),
+                                    ("hourhour", -4.1588830833596715),
+                                    ("<time-of-day> am|pmon <date>", -3.619886582626985),
+                                    ("Wednesdaythis|last|next <cycle>", -5.4116460518550396),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.925268232178167),
-                                    ("dayyear", -3.077970371790963),
+                                     -3.907568655078766),
+                                    ("dayyear", -3.2144214745188204),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -5.429345628954441),
-                                    ("quarteryear", -5.0238805208462765),
-                                    ("<time-of-day> am|pmtomorrow", -4.736198448394496),
-                                    ("intersect2in|during the <part-of-day>", -5.429345628954441),
-                                    ("minutehour", -4.513054897080286),
-                                    ("Mother's Dayyear", -5.429345628954441),
+                                     -5.4116460518550396),
+                                    ("<time-of-day> am|pmtomorrow", -4.718498871295094),
+                                    ("intersect2in|during the <part-of-day>", -5.4116460518550396),
+                                    ("minutehour", -4.4953553199808844),
+                                    ("Mother's Dayyear", -5.4116460518550396),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -5.0238805208462765),
+                                     -5.006180943746876),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -3.724597536716016),
-                                    ("tomorrow<time-of-day> sharp|exactly", -5.429345628954441),
+                                     -3.7068979596166147),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.4116460518550396),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.513054897080286),
+                                     -4.4953553199808844),
                                     ("on <date><named-month> <day-of-month> (non ordinal)",
-                                     -5.0238805208462765),
+                                     -5.006180943746876),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.513054897080286),
-                                    ("Mondayin|during the <part-of-day>", -5.429345628954441),
+                                     -4.4953553199808844),
+                                    ("Mondayin|during the <part-of-day>", -5.4116460518550396),
                                     ("intersect2<named-month> <day-of-month> (non ordinal)",
-                                     -3.925268232178167),
+                                     -3.907568655078766),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.0238805208462765),
-                                    ("nth <time> of <time>year", -4.736198448394496),
-                                    ("intersectin|during the <part-of-day>", -5.429345628954441),
+                                     -5.006180943746876),
+                                    ("intersectin|during the <part-of-day>", -5.4116460518550396),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -5.429345628954441),
+                                     -5.4116460518550396),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.736198448394496),
+                                     -4.718498871295094),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -5.0238805208462765),
+                                     -5.006180943746876),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -5.429345628954441),
-                                    ("dayminute", -3.349904087274605),
-                                    ("<ordinal> quarteryear", -5.0238805208462765),
+                                     -5.4116460518550396),
+                                    ("dayminute", -3.332204510175204),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.0238805208462765),
+                                     -5.006180943746876),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -5.429345628954441),
+                                     -5.4116460518550396),
                                     ("absorption of , after named dayintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.429345628954441),
-                                    ("<ordinal> <cycle> of <time>year", -5.429345628954441),
-                                    ("minuteday", -2.0281482472922856),
-                                    ("Octoberyear", -4.176582660459073),
+                                     -5.4116460518550396),
+                                    ("<ordinal> <cycle> of <time>year", -5.4116460518550396),
+                                    ("minuteday", -2.0104486701928845),
+                                    ("Octoberyear", -4.1588830833596715),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -5.429345628954441),
+                                     -5.4116460518550396),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -5.429345628954441),
+                                     -5.4116460518550396),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -5.429345628954441),
-                                    ("Septemberyear", -5.0238805208462765),
-                                    ("at <time-of-day>on <date>", -4.513054897080286),
+                                     -5.4116460518550396),
+                                    ("Septemberyear", -5.006180943746876),
+                                    ("at <time-of-day>on <date>", -4.4953553199808844),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.736198448394496),
-                                    ("<time-of-day> am|pmintersect2", -4.176582660459073),
-                                    ("Halloweenyear", -5.429345628954441),
-                                    ("dayweek", -5.429345628954441),
-                                    ("weekyear", -5.0238805208462765),
-                                    ("hh:mmin|during the <part-of-day>", -4.736198448394496),
-                                    ("Father's Dayyear", -5.429345628954441),
+                                     -4.718498871295094),
+                                    ("<time-of-day> am|pmintersect2", -4.1588830833596715),
+                                    ("Halloweenyear", -5.4116460518550396),
+                                    ("dayweek", -5.4116460518550396),
+                                    ("weekyear", -5.006180943746876),
+                                    ("hh:mmin|during the <part-of-day>", -4.718498871295094),
+                                    ("Father's Dayyear", -5.4116460518550396),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -5.0238805208462765),
-                                    ("February<time> <part-of-day>", -5.429345628954441),
-                                    ("Martin Luther King's Dayyear", -5.0238805208462765),
-                                    ("Februaryintersect2", -5.429345628954441),
-                                    ("tomorrowat <time-of-day>", -4.736198448394496),
-                                    ("between <time> and <time>on <date>", -4.736198448394496),
-                                    ("at <time-of-day>tomorrow", -5.429345628954441),
-                                    ("tomorrow<time-of-day> am|pm", -5.429345628954441),
+                                     -5.006180943746876),
+                                    ("February<time> <part-of-day>", -5.4116460518550396),
+                                    ("Martin Luther King's Dayyear", -5.006180943746876),
+                                    ("Februaryintersect2", -5.4116460518550396),
+                                    ("tomorrowat <time-of-day>", -4.718498871295094),
+                                    ("between <time> and <time>on <date>", -4.718498871295094),
+                                    ("at <time-of-day>tomorrow", -5.006180943746876),
+                                    ("tomorrow<time-of-day> am|pm", -5.4116460518550396),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -5.429345628954441),
-                                    ("Labor Dayyear", -5.429345628954441),
-                                    ("Februaryintersect", -5.429345628954441),
-                                    ("last <cycle> of <time>year", -4.736198448394496),
+                                     -5.4116460518550396),
+                                    ("Labor Dayyear", -5.4116460518550396),
+                                    ("Februaryintersect", -5.4116460518550396),
+                                    ("last <cycle> of <time>year", -4.718498871295094),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.429345628954441)],
-                               n = 165},
+                                     -5.4116460518550396)],
+                               n = 162},
                    koData =
-                     ClassData{prior = -0.916290731874155, unseen = -5.849324779946859,
+                     ClassData{prior = -0.9107709386505572, unseen = -5.83773044716594,
                                likelihoods =
                                  HashMap.fromList
-                                   [("in <named-month>year", -5.153291594497779),
+                                   [("in <named-month>year", -5.14166355650266),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.153291594497779),
-                                    ("hourday", -4.747826486389615),
+                                     -5.14166355650266),
+                                    ("hourday", -5.14166355650266),
                                     ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.153291594497779),
-                                    ("dayhour", -3.361532125269724),
-                                    ("daymonth", -3.138388573955514),
-                                    ("monthday", -4.747826486389615),
-                                    ("monthyear", -4.747826486389615),
-                                    ("until <time-of-day><time-of-day> am|pm", -5.153291594497779),
+                                     -5.14166355650266),
+                                    ("dayhour", -3.349904087274605),
+                                    ("daymonth", -3.126760535960395),
+                                    ("monthday", -4.736198448394496),
+                                    ("monthyear", -4.736198448394496),
+                                    ("until <time-of-day><time-of-day> am|pm", -5.14166355650266),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.460144413937834),
-                                    ("<time-of-day> am|pmintersect", -3.900528626002411),
+                                     -4.448516375942715),
+                                    ("<time-of-day> am|pmintersect", -3.8889005880072918),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -4.460144413937834),
-                                    ("Tuesdayafter <time-of-day>", -5.153291594497779),
+                                     -4.448516375942715),
+                                    ("Tuesdayafter <time-of-day>", -5.14166355650266),
                                     ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.153291594497779),
-                                    ("intersect2hh:mm", -5.153291594497779),
-                                    ("absorption of , after named dayJuly", -4.747826486389615),
-                                    ("monthhour", -4.747826486389615),
-                                    ("todayat <time-of-day>", -5.153291594497779),
-                                    ("at <time-of-day>intersect2", -4.747826486389615),
-                                    ("dayday", -5.153291594497779),
-                                    ("mm/ddat <time-of-day>", -4.747826486389615),
-                                    ("<time-of-day> am|pmon <date>", -3.543853682063679),
-                                    ("dayyear", -4.237000862623624),
-                                    ("Thursdayat <time-of-day>", -5.153291594497779),
-                                    ("August<time-of-day> am|pm", -5.153291594497779),
-                                    ("monthminute", -5.153291594497779),
-                                    ("<time-of-day> am|pmtomorrow", -5.153291594497779),
-                                    ("Thursdayhh:mm", -5.153291594497779),
+                                     -5.14166355650266),
+                                    ("intersect2hh:mm", -5.14166355650266),
+                                    ("absorption of , after named dayJuly", -4.736198448394496),
+                                    ("monthhour", -4.736198448394496),
+                                    ("todayat <time-of-day>", -5.14166355650266),
+                                    ("at <time-of-day>intersect2", -4.736198448394496),
+                                    ("dayday", -5.14166355650266),
+                                    ("mm/ddat <time-of-day>", -4.736198448394496),
+                                    ("<time-of-day> am|pmon <date>", -3.5322256440685593),
+                                    ("dayyear", -4.225372824628505),
+                                    ("Thursdayat <time-of-day>", -5.14166355650266),
+                                    ("August<time-of-day> am|pm", -5.14166355650266),
+                                    ("monthminute", -5.14166355650266),
+                                    ("<time-of-day> am|pmtomorrow", -5.14166355650266),
+                                    ("Thursdayhh:mm", -5.14166355650266),
                                     ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.153291594497779),
-                                    ("minutemonth", -3.013225431001508),
+                                     -5.14166355650266),
+                                    ("minutemonth", -3.001597393006389),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.747826486389615),
+                                     -4.736198448394496),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.747826486389615),
-                                    ("Aprilyear", -5.153291594497779),
+                                     -4.736198448394496),
+                                    ("Aprilyear", -5.14166355650266),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -4.747826486389615),
+                                     -4.736198448394496),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.153291594497779),
-                                    ("yesterday<time-of-day> am|pm", -5.153291594497779),
+                                     -5.14166355650266),
+                                    ("yesterday<time-of-day> am|pm", -5.14166355650266),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -4.747826486389615),
+                                     -4.736198448394496),
                                     ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.153291594497779),
-                                    ("until <time-of-day>on <date>", -4.460144413937834),
-                                    ("at <time-of-day>intersect", -4.747826486389615),
+                                     -5.14166355650266),
+                                    ("until <time-of-day>on <date>", -4.448516375942715),
+                                    ("at <time-of-day>intersect", -4.736198448394496),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.153291594497779),
-                                    ("dayminute", -3.543853682063679),
-                                    ("intersectSeptember", -3.6492141977215047),
-                                    ("minuteday", -2.0397762852874046),
-                                    ("Februaryin|during the <part-of-day>", -5.153291594497779),
-                                    ("yearhh:mm", -5.153291594497779),
-                                    ("hh:mmon <date>", -3.6492141977215047),
-                                    ("year<time-of-day> am|pm", -5.153291594497779),
-                                    ("intersect2September", -3.6492141977215047),
+                                     -5.14166355650266),
+                                    ("dayminute", -3.5322256440685593),
+                                    ("intersectSeptember", -3.6375861597263857),
+                                    ("minuteday", -2.0281482472922856),
+                                    ("Februaryin|during the <part-of-day>", -5.14166355650266),
+                                    ("yearhh:mm", -5.14166355650266),
+                                    ("hh:mmon <date>", -3.6375861597263857),
+                                    ("year<time-of-day> am|pm", -5.14166355650266),
+                                    ("intersect2September", -3.6375861597263857),
                                     ("absorption of , after named daySeptember",
-                                     -4.237000862623624),
-                                    ("on <date>September", -4.747826486389615),
-                                    ("at <time-of-day>on <date>", -4.460144413937834),
-                                    ("<time-of-day> am|pmintersect2", -3.900528626002411),
-                                    ("absorption of , after named dayFebruary", -4.237000862623624),
+                                     -4.225372824628505),
+                                    ("on <date>September", -4.736198448394496),
+                                    ("at <time-of-day>on <date>", -4.448516375942715),
+                                    ("<time-of-day> am|pmintersect2", -3.8889005880072918),
+                                    ("absorption of , after named dayFebruary", -4.225372824628505),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.153291594497779),
-                                    ("tomorrowat <time-of-day>", -5.153291594497779),
-                                    ("at <time-of-day>tomorrow", -5.153291594497779),
-                                    ("tomorrow<time-of-day> am|pm", -5.153291594497779),
-                                    ("after <time-of-day><time-of-day> am|pm", -5.153291594497779),
-                                    ("after <time-of-day>year", -5.153291594497779),
-                                    ("yearminute", -4.747826486389615)],
-                               n = 110}}),
+                                     -5.14166355650266),
+                                    ("tomorrowat <time-of-day>", -5.14166355650266),
+                                    ("tomorrow<time-of-day> am|pm", -5.14166355650266),
+                                    ("after <time-of-day><time-of-day> am|pm", -5.14166355650266),
+                                    ("after <time-of-day>year", -5.14166355650266),
+                                    ("yearminute", -4.736198448394496)],
+                               n = 109}}),
        ("<day-of-month> (ordinal or number) <named-month>",
         Classifier{okData =
                      ClassData{prior = -0.916290731874155, unseen = -2.3978952727983707,
@@ -378,52 +376,53 @@ classifiers
                                n = 3}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628,
-                               unseen = -4.382026634673881,
+                     ClassData{prior = -9.844007281325252e-2,
+                               unseen = -4.454347296253507,
                                likelihoods =
                                  HashMap.fromList
                                    [("<day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.676300671907076),
-                                    ("dayhour", -1.5362345084108053),
-                                    ("Mondayearly morning", -3.270835563798912),
-                                    ("time-of-day (latent)tonight", -3.270835563798912),
-                                    ("hourhour", -2.423537703411708),
+                                     -3.7495040759303713),
+                                    ("dayhour", -1.6094379124341003),
+                                    ("Mondayearly morning", -3.3440389678222067),
+                                    ("time-of-day (latent)tonight", -3.3440389678222067),
+                                    ("hourhour", -2.245426679154097),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -3.676300671907076),
-                                    ("todaypart of days", -3.676300671907076),
-                                    ("intersect2in|during the <part-of-day>", -3.676300671907076),
-                                    ("minutehour", -2.5776883832389665),
+                                     -3.7495040759303713),
+                                    ("todaypart of days", -3.7495040759303713),
+                                    ("intersect2part of days", -3.7495040759303713),
+                                    ("intersect2in|during the <part-of-day>", -3.7495040759303713),
+                                    ("minutehour", -2.6508917872622613),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -3.270835563798912),
-                                    ("time-of-day (latent)this <part-of-day>", -3.676300671907076),
-                                    ("Mondayin|during the <part-of-day>", -3.676300671907076),
-                                    ("intersectin|during the <part-of-day>", -3.676300671907076),
+                                     -3.3440389678222067),
+                                    ("time-of-day (latent)this <part-of-day>", -3.7495040759303713),
+                                    ("Mondayin|during the <part-of-day>", -3.7495040759303713),
+                                    ("intersectpart of days", -3.7495040759303713),
+                                    ("intersectin|during the <part-of-day>", -3.7495040759303713),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -3.676300671907076),
+                                     -3.7495040759303713),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -3.676300671907076),
-                                    ("tomorrowpart of days", -2.5776883832389665),
-                                    ("hh:mmin|during the <part-of-day>", -2.9831534913471307),
+                                     -3.7495040759303713),
+                                    ("tomorrowpart of days", -2.6508917872622613),
+                                    ("hh:mmin|during the <part-of-day>", -3.056356895370426),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -3.676300671907076),
+                                     -3.7495040759303713),
                                     ("hhmm (latent)in|during the <part-of-day>",
-                                     -3.676300671907076),
-                                    ("yesterdaypart of days", -3.676300671907076),
-                                    ("Mondaypart of days", -3.676300671907076)],
-                               n = 27},
+                                     -3.7495040759303713),
+                                    ("yesterdaypart of days", -3.7495040759303713),
+                                    ("Mondaypart of days", -3.7495040759303713)],
+                               n = 29},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
-                               unseen = -3.4657359027997265,
+                     ClassData{prior = -2.367123614131617, unseen = -3.5263605246161616,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -2.740840023925201),
-                                    ("monthhour", -2.740840023925201),
-                                    ("hourhour", -2.740840023925201),
+                                   [("yearhour", -2.803360380906535),
+                                    ("monthhour", -2.803360380906535),
+                                    ("hourhour", -2.803360380906535),
                                     ("past year (latent)in|during the <part-of-day>",
-                                     -2.740840023925201),
-                                    ("Februaryin|during the <part-of-day>", -2.740840023925201),
+                                     -2.803360380906535),
+                                    ("Februaryin|during the <part-of-day>", -2.803360380906535),
                                     ("time-of-day (latent)in|during the <part-of-day>",
-                                     -2.740840023925201)],
+                                     -2.803360380906535)],
                                n = 3}}),
        ("today",
         Classifier{okData =
@@ -689,17 +688,22 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 14}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.995732273553991,
+                     ClassData{prior = -0.4700036292457356, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)quarter (grain)", -0.9985288301111273),
+                                   [("ordinal (digits)quarter (grain)", -1.1786549963416462),
                                     ("ordinals (first..twentieth,thirtieth,...)quarter (grain)",
-                                     -1.845826690498331),
-                                    ("quarter", -0.7472144018302211)],
-                               n = 8},
+                                     -1.466337068793427),
+                                    ("quarter", -0.7731898882334817)],
+                               n = 5},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.9808292530117262,
+                               unseen = -2.3025850929940455,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -0.8109302162163288),
+                                    ("quarter", -0.8109302162163288)],
+                               n = 3}}),
        ("one twenty two",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
@@ -711,207 +715,204 @@ classifiers
                                n = 1}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.5336403015321621, unseen = -6.07993319509559,
+                     ClassData{prior = -0.5379065823686613, unseen = -6.061456918928017,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.468204330914934),
+                                     -4.449685283147696),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.468204330914934),
-                                    ("hourday", -3.775057150354989),
-                                    ("dayhour", -3.0819099697950434),
-                                    ("daymonth", -5.384495062789089),
-                                    ("monthday", -4.979029954680924),
-                                    ("monthyear", -3.775057150354989),
-                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.384495062789089),
-                                    ("Christmasyear", -5.384495062789089),
+                                     -4.449685283147696),
+                                    ("hourday", -3.6612279227834263),
+                                    ("dayhour", -3.0633909220278057),
+                                    ("daymonth", -5.365976015021851),
+                                    ("monthday", -4.9605109069136875),
+                                    ("monthyear", -3.756538102587751),
+                                    ("Tuesdaythe <day-of-month> (ordinal)", -5.365976015021851),
+                                    ("Christmasyear", -5.365976015021851),
                                     ("this|next <day-of-week>hh(:mm) - <time-of-day> am|pm",
-                                     -5.384495062789089),
+                                     -5.365976015021851),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -5.384495062789089),
-                                    ("Marchyear", -5.384495062789089),
+                                     -5.365976015021851),
+                                    ("Marchyear", -5.365976015021851),
                                     ("<named-month>|<named-day> <day-of-month> (ordinal)year",
-                                     -4.979029954680924),
-                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.384495062789089),
-                                    ("monthhour", -4.6913478822291435),
-                                    ("last <day-of-week> of <time>year", -5.384495062789089),
-                                    ("intersect2<time-of-day> am|pm", -5.384495062789089),
-                                    ("todayat <time-of-day>", -5.384495062789089),
-                                    ("Thursday<time> timezone", -4.979029954680924),
-                                    ("at <time-of-day>intersect2", -4.979029954680924),
+                                     -4.9605109069136875),
+                                    ("Thursdayhh(:mm) - <time-of-day> am|pm", -5.365976015021851),
+                                    ("monthhour", -4.672828834461907),
+                                    ("last <day-of-week> of <time>year", -5.365976015021851),
+                                    ("intersect2<time-of-day> am|pm", -5.365976015021851),
+                                    ("todayat <time-of-day>", -5.365976015021851),
+                                    ("Thursday<time> timezone", -4.9605109069136875),
+                                    ("at <time-of-day>intersect2", -4.9605109069136875),
                                     ("this <time>hh(:mm) - <time-of-day> am|pm",
-                                     -5.384495062789089),
-                                    ("dayday", -4.285882774120979),
-                                    ("Thanksgiving Dayyear", -4.979029954680924),
-                                    ("<time> <part-of-day>at <time-of-day>", -5.384495062789089),
-                                    ("Tuesdayin <named-month>", -5.384495062789089),
-                                    ("mm/ddat <time-of-day>", -5.384495062789089),
-                                    ("tonightat <time-of-day>", -5.384495062789089),
+                                     -5.365976015021851),
+                                    ("dayday", -4.267363726353742),
+                                    ("Thanksgiving Dayyear", -4.9605109069136875),
+                                    ("<time> <part-of-day>at <time-of-day>", -5.365976015021851),
+                                    ("Tuesdayin <named-month>", -5.365976015021851),
+                                    ("mm/ddat <time-of-day>", -5.365976015021851),
+                                    ("tonightat <time-of-day>", -5.365976015021851),
                                     ("<time-of-day> am|pmabsorption of , after named day",
-                                     -4.6913478822291435),
-                                    ("today<time-of-day> am|pm", -5.384495062789089),
-                                    ("Februarythe <day-of-month> (ordinal)", -4.979029954680924),
-                                    ("mm/dd<time-of-day> am|pm", -5.384495062789089),
-                                    ("hourhour", -4.285882774120979),
-                                    ("<time-of-day> am|pmon <date>", -3.592735593561034),
-                                    ("Wednesdaythis|last|next <cycle>", -5.384495062789089),
+                                     -4.672828834461907),
+                                    ("today<time-of-day> am|pm", -5.365976015021851),
+                                    ("Februarythe <day-of-month> (ordinal)", -4.9605109069136875),
+                                    ("at <time-of-day><time> <part-of-day>", -5.365976015021851),
+                                    ("mm/dd<time-of-day> am|pm", -5.365976015021851),
+                                    ("hourhour", -4.113213046526484),
+                                    ("<time-of-day> am|pmon <date>", -3.5742165457937967),
+                                    ("Wednesdaythis|last|next <cycle>", -5.365976015021851),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.8804176660128147),
-                                    ("dayyear", -3.0331198056256112),
+                                     -3.8618986182455775),
+                                    ("dayyear", -3.168751437685632),
                                     ("<time-of-day> o'clockin|during the <part-of-day>",
-                                     -5.384495062789089),
-                                    ("quarteryear", -4.979029954680924),
-                                    ("<time-of-day> am|pmtomorrow", -4.6913478822291435),
-                                    ("intersect2in|during the <part-of-day>", -5.384495062789089),
-                                    ("minutehour", -4.468204330914934),
-                                    ("Mother's Dayyear", -5.384495062789089),
+                                     -5.365976015021851),
+                                    ("<time-of-day> am|pmtomorrow", -4.672828834461907),
+                                    ("intersect2in|during the <part-of-day>", -5.365976015021851),
+                                    ("minutehour", -4.449685283147696),
+                                    ("Mother's Dayyear", -5.365976015021851),
                                     ("at <time-of-day>in|during the <part-of-day>",
-                                     -4.979029954680924),
+                                     -4.9605109069136875),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.468204330914934),
-                                    ("tomorrow<time-of-day> sharp|exactly", -5.384495062789089),
+                                     -4.449685283147696),
+                                    ("tomorrow<time-of-day> sharp|exactly", -5.365976015021851),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.468204330914934),
+                                     -4.449685283147696),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.468204330914934),
-                                    ("Mondayin|during the <part-of-day>", -5.384495062789089),
+                                     -4.449685283147696),
+                                    ("Mondayin|during the <part-of-day>", -5.365976015021851),
                                     ("intersect2<named-month> <day-of-month> (non ordinal)",
-                                     -3.8804176660128147),
+                                     -3.8618986182455775),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.979029954680924),
-                                    ("nth <time> of <time>year", -4.6913478822291435),
-                                    ("intersectin|during the <part-of-day>", -5.384495062789089),
+                                     -4.9605109069136875),
+                                    ("intersectin|during the <part-of-day>", -5.365976015021851),
                                     ("<day-of-month> (ordinal or number) of <named-month>in|during the <part-of-day>",
-                                     -5.384495062789089),
+                                     -5.365976015021851),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.6913478822291435),
+                                     -4.672828834461907),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"<time-of-day> am|pm",
-                                     -4.979029954680924),
+                                     -4.9605109069136875),
                                     ("<time-of-day> - <time-of-day> (interval)tomorrow",
-                                     -5.384495062789089),
-                                    ("dayminute", -3.305053521109253),
-                                    ("<ordinal> quarteryear", -4.979029954680924),
+                                     -5.365976015021851),
+                                    ("dayminute", -3.2865344733420154),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.979029954680924),
+                                     -4.9605109069136875),
                                     ("<datetime> - <datetime> (interval)tomorrow",
-                                     -5.384495062789089),
-                                    ("<ordinal> <cycle> of <time>year", -5.384495062789089),
-                                    ("minuteday", -1.9832976811269336),
-                                    ("Octoberyear", -4.131732094293721),
+                                     -5.365976015021851),
+                                    ("<ordinal> <cycle> of <time>year", -5.365976015021851),
+                                    ("minuteday", -1.9647786333596962),
+                                    ("Octoberyear", -4.113213046526484),
                                     ("the <day-of-month> (ordinal)in|during the <part-of-day>",
-                                     -5.384495062789089),
+                                     -5.365976015021851),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -5.384495062789089),
+                                     -5.365976015021851),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -5.384495062789089),
-                                    ("Septemberyear", -4.979029954680924),
-                                    ("at <time-of-day>on <date>", -4.468204330914934),
+                                     -5.365976015021851),
+                                    ("Septemberyear", -4.9605109069136875),
+                                    ("at <time-of-day>on <date>", -4.449685283147696),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -4.6913478822291435),
-                                    ("<time-of-day> am|pmintersect2", -4.131732094293721),
-                                    ("Halloweenyear", -5.384495062789089),
-                                    ("dayweek", -5.384495062789089),
-                                    ("weekyear", -4.979029954680924),
-                                    ("hh:mmin|during the <part-of-day>", -4.6913478822291435),
-                                    ("Father's Dayyear", -5.384495062789089),
+                                     -4.672828834461907),
+                                    ("<time-of-day> am|pmintersect2", -4.113213046526484),
+                                    ("Halloweenyear", -5.365976015021851),
+                                    ("dayweek", -5.365976015021851),
+                                    ("weekyear", -4.9605109069136875),
+                                    ("hh:mmin|during the <part-of-day>", -4.672828834461907),
+                                    ("Father's Dayyear", -5.365976015021851),
                                     ("<cycle> after|before <time><time-of-day> am|pm",
-                                     -4.979029954680924),
-                                    ("February<time> <part-of-day>", -5.384495062789089),
-                                    ("Martin Luther King's Dayyear", -4.979029954680924),
-                                    ("Februaryintersect2", -5.384495062789089),
-                                    ("tomorrowat <time-of-day>", -4.6913478822291435),
-                                    ("between <time> and <time>on <date>", -4.6913478822291435),
-                                    ("at <time-of-day>tomorrow", -5.384495062789089),
-                                    ("tomorrow<time-of-day> am|pm", -5.384495062789089),
+                                     -4.9605109069136875),
+                                    ("February<time> <part-of-day>", -5.365976015021851),
+                                    ("Martin Luther King's Dayyear", -4.9605109069136875),
+                                    ("Februaryintersect2", -5.365976015021851),
+                                    ("tomorrowat <time-of-day>", -4.672828834461907),
+                                    ("between <time> and <time>on <date>", -4.672828834461907),
+                                    ("at <time-of-day>tomorrow", -4.9605109069136875),
+                                    ("tomorrow<time-of-day> am|pm", -5.365976015021851),
                                     ("in|during the <part-of-day>at <time-of-day>",
-                                     -5.384495062789089),
-                                    ("Labor Dayyear", -5.384495062789089),
-                                    ("Februaryintersect", -5.384495062789089),
-                                    ("last <cycle> of <time>year", -4.6913478822291435),
+                                     -5.365976015021851),
+                                    ("Labor Dayyear", -5.365976015021851),
+                                    ("Februaryintersect", -5.365976015021851),
+                                    ("last <cycle> of <time>year", -4.672828834461907),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.384495062789089)],
-                               n = 156},
+                                     -5.365976015021851)],
+                               n = 153},
                    koData =
-                     ClassData{prior = -0.8830159429892829, unseen = -5.84354441703136,
+                     ClassData{prior = -0.8769966215319531, unseen = -5.831882477283517,
                                likelihoods =
                                  HashMap.fromList
-                                   [("in <named-month>year", -5.147494476813453),
+                                   [("in <named-month>year", -5.135798437050262),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.147494476813453),
-                                    ("hourday", -4.742029368705289),
+                                     -5.135798437050262),
+                                    ("hourday", -5.135798437050262),
                                     ("<named-month> <day-of-month> (non ordinal)July",
-                                     -5.147494476813453),
-                                    ("dayhour", -3.355735007585398),
-                                    ("daymonth", -3.132591456271188),
-                                    ("monthday", -4.742029368705289),
-                                    ("monthyear", -4.742029368705289),
-                                    ("until <time-of-day><time-of-day> am|pm", -5.147494476813453),
+                                     -5.135798437050262),
+                                    ("dayhour", -3.3440389678222067),
+                                    ("daymonth", -3.120895416507997),
+                                    ("monthday", -4.7303333289420975),
+                                    ("monthyear", -4.7303333289420975),
+                                    ("until <time-of-day><time-of-day> am|pm", -5.135798437050262),
                                     ("<time-of-day> am|pmintersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -4.454347296253507),
-                                    ("<time-of-day> am|pmintersect", -3.894731508318085),
+                                     -4.442651256490317),
+                                    ("<time-of-day> am|pmintersect", -3.8830354685548936),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"year",
-                                     -4.454347296253507),
-                                    ("Tuesdayafter <time-of-day>", -5.147494476813453),
+                                     -4.442651256490317),
+                                    ("Tuesdayafter <time-of-day>", -5.135798437050262),
                                     ("July<day-of-month> (ordinal or number) <named-month>",
-                                     -5.147494476813453),
-                                    ("intersect2hh:mm", -5.147494476813453),
-                                    ("absorption of , after named dayJuly", -4.742029368705289),
-                                    ("monthhour", -4.742029368705289),
-                                    ("todayat <time-of-day>", -5.147494476813453),
-                                    ("at <time-of-day>intersect2", -4.742029368705289),
-                                    ("dayday", -5.147494476813453),
-                                    ("mm/ddat <time-of-day>", -4.742029368705289),
-                                    ("<time-of-day> am|pmon <date>", -3.5380565643793527),
-                                    ("dayyear", -4.231203744939298),
-                                    ("Thursdayat <time-of-day>", -5.147494476813453),
-                                    ("August<time-of-day> am|pm", -5.147494476813453),
-                                    ("monthminute", -5.147494476813453),
-                                    ("<time-of-day> am|pmtomorrow", -5.147494476813453),
-                                    ("Thursdayhh:mm", -5.147494476813453),
+                                     -5.135798437050262),
+                                    ("intersect2hh:mm", -5.135798437050262),
+                                    ("absorption of , after named dayJuly", -4.7303333289420975),
+                                    ("monthhour", -4.7303333289420975),
+                                    ("todayat <time-of-day>", -5.135798437050262),
+                                    ("at <time-of-day>intersect2", -4.7303333289420975),
+                                    ("dayday", -5.135798437050262),
+                                    ("mm/ddat <time-of-day>", -4.7303333289420975),
+                                    ("<time-of-day> am|pmon <date>", -3.5263605246161616),
+                                    ("dayyear", -4.219507705176107),
+                                    ("Thursdayat <time-of-day>", -5.135798437050262),
+                                    ("August<time-of-day> am|pm", -5.135798437050262),
+                                    ("monthminute", -5.135798437050262),
+                                    ("<time-of-day> am|pmtomorrow", -5.135798437050262),
+                                    ("Thursdayhh:mm", -5.135798437050262),
                                     ("August<day-of-month> (ordinal or number) <named-month>",
-                                     -5.147494476813453),
-                                    ("minutemonth", -3.0074283133171824),
+                                     -5.135798437050262),
+                                    ("minutemonth", -2.995732273553991),
                                     ("Thursdayfrom <datetime> - <datetime> (interval)",
-                                     -4.742029368705289),
+                                     -4.7303333289420975),
                                     ("Thursdayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.742029368705289),
-                                    ("Aprilyear", -5.147494476813453),
+                                     -4.7303333289420975),
+                                    ("Aprilyear", -5.135798437050262),
                                     ("mm/dd<time-of-day> - <time-of-day> (interval)",
-                                     -4.742029368705289),
+                                     -4.7303333289420975),
                                     ("tomorrowfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.147494476813453),
-                                    ("yesterday<time-of-day> am|pm", -5.147494476813453),
+                                     -5.135798437050262),
+                                    ("yesterday<time-of-day> am|pm", -5.135798437050262),
                                     ("intersect by \",\", \"of\", \"from\", \"'s\"hh:mm",
-                                     -4.742029368705289),
+                                     -4.7303333289420975),
                                     ("<named-month> <day-of-month> (non ordinal)August",
-                                     -5.147494476813453),
-                                    ("until <time-of-day>on <date>", -4.454347296253507),
-                                    ("at <time-of-day>intersect", -4.742029368705289),
+                                     -5.135798437050262),
+                                    ("until <time-of-day>on <date>", -4.442651256490317),
+                                    ("at <time-of-day>intersect", -4.7303333289420975),
                                     ("at <time-of-day>intersect by \",\", \"of\", \"from\", \"'s\"",
-                                     -5.147494476813453),
-                                    ("dayminute", -3.5380565643793527),
-                                    ("intersectSeptember", -3.643417080037179),
-                                    ("minuteday", -2.0339791676030785),
-                                    ("Februaryin|during the <part-of-day>", -5.147494476813453),
-                                    ("yearhh:mm", -5.147494476813453),
-                                    ("hh:mmon <date>", -3.643417080037179),
-                                    ("year<time-of-day> am|pm", -5.147494476813453),
-                                    ("intersect2September", -3.643417080037179),
+                                     -5.135798437050262),
+                                    ("dayminute", -3.5263605246161616),
+                                    ("intersectSeptember", -3.631721040273988),
+                                    ("minuteday", -2.0222831278398874),
+                                    ("Februaryin|during the <part-of-day>", -5.135798437050262),
+                                    ("yearhh:mm", -5.135798437050262),
+                                    ("hh:mmon <date>", -3.631721040273988),
+                                    ("year<time-of-day> am|pm", -5.135798437050262),
+                                    ("intersect2September", -3.631721040273988),
                                     ("absorption of , after named daySeptember",
-                                     -4.231203744939298),
-                                    ("on <date>September", -4.742029368705289),
-                                    ("at <time-of-day>on <date>", -4.454347296253507),
-                                    ("<time-of-day> am|pmintersect2", -3.894731508318085),
-                                    ("absorption of , after named dayFebruary", -4.231203744939298),
+                                     -4.219507705176107),
+                                    ("on <date>September", -4.7303333289420975),
+                                    ("at <time-of-day>on <date>", -4.442651256490317),
+                                    ("<time-of-day> am|pmintersect2", -3.8830354685548936),
+                                    ("absorption of , after named dayFebruary", -4.219507705176107),
                                     ("July<integer> to|till|before <hour-of-day>",
-                                     -5.147494476813453),
-                                    ("tomorrowat <time-of-day>", -5.147494476813453),
-                                    ("at <time-of-day>tomorrow", -5.147494476813453),
-                                    ("tomorrow<time-of-day> am|pm", -5.147494476813453),
-                                    ("after <time-of-day><time-of-day> am|pm", -5.147494476813453),
-                                    ("after <time-of-day>year", -5.147494476813453),
-                                    ("yearminute", -4.742029368705289)],
-                               n = 110}}),
+                                     -5.135798437050262),
+                                    ("tomorrowat <time-of-day>", -5.135798437050262),
+                                    ("tomorrow<time-of-day> am|pm", -5.135798437050262),
+                                    ("after <time-of-day><time-of-day> am|pm", -5.135798437050262),
+                                    ("after <time-of-day>year", -5.135798437050262),
+                                    ("yearminute", -4.7303333289420975)],
+                               n = 109}}),
        ("after lunch/work/school",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1164,28 +1165,32 @@ classifiers
                                n = 1}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
+                     ClassData{prior = -0.3184537311185346,
+                               unseen = -3.2188758248682006,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.916290731874155),
-                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
-                                     -2.70805020110221),
+                                   [("daymonth", -0.9808292530117262),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect",
-                                     -2.70805020110221),
+                                     -2.4849066497880004),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect2",
-                                     -2.3025850929940455),
-                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
-                                     -2.3025850929940455),
+                                     -2.0794415416798357),
                                     ("ordinals (first..twentieth,thirtieth,...)Wednesdayintersect",
-                                     -2.3025850929940455),
+                                     -2.0794415416798357),
                                     ("ordinals (first..twentieth,thirtieth,...)TuesdayOctober",
-                                     -2.3025850929940455),
+                                     -2.0794415416798357),
                                     ("ordinals (first..twentieth,thirtieth,...)Tuesdayintersect2",
-                                     -2.70805020110221)],
-                               n = 11},
+                                     -2.4849066497880004)],
+                               n = 8},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.1972245773362196,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.2992829841302609, unseen = -2.70805020110221,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -1.252762968495368),
+                                    ("ordinals (first..twentieth,thirtieth,...)TuesdaySeptember",
+                                     -1.9459101490553135),
+                                    ("ordinals (first..twentieth,thirtieth,...)WednesdayOctober",
+                                     -1.540445040947149)],
+                               n = 3}}),
        ("Valentine's Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1441,15 +1446,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.6094379124341003,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinal (digits)quarter (grain)", -0.6931471805599453),
                                     ("quarter", -0.6931471805599453)],
-                               n = 2},
+                               n = 1},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -1.6094379124341003,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -0.6931471805599453),
+                                    ("quarter", -0.6931471805599453)],
+                               n = 1}}),
        ("time-of-day (latent)",
         Classifier{okData =
                      ClassData{prior = -0.587786664902119, unseen = -4.143134726391533,
@@ -1688,91 +1699,86 @@ classifiers
                                n = 1}}),
        ("intersect by \",\", \"of\", \"from\", \"'s\"",
         Classifier{okData =
-                     ClassData{prior = -0.48550781578170077,
-                               unseen = -5.049856007249537,
+                     ClassData{prior = -0.5020919437972361, unseen = -5.003946305945459,
                                likelihoods =
                                  HashMap.fromList
                                    [("Wednesday<named-month> <day-of-month> (non ordinal)",
-                                     -4.350277936359301),
-                                    ("dayhour", -3.0975149678639333),
-                                    ("daymonth", -2.9639835752394106),
+                                     -4.304065093204169),
+                                    ("dayhour", -3.0513021247088017),
+                                    ("daymonth", -2.917770732084279),
                                     ("<named-month> <day-of-month> (non ordinal)Friday",
-                                     -4.350277936359301),
-                                    ("Wednesdayintersect", -4.350277936359301),
-                                    ("Labor Daythis|last|next <cycle>", -4.350277936359301),
-                                    ("<part-of-day> of <time>February", -4.350277936359301),
-                                    ("Saturday<time-of-day> am|pm", -4.350277936359301),
-                                    ("Wednesdayintersect2", -4.350277936359301),
+                                     -4.304065093204169),
+                                    ("Wednesdayintersect", -4.304065093204169),
+                                    ("Labor Daythis|last|next <cycle>", -4.304065093204169),
+                                    ("<part-of-day> of <time>February", -4.304065093204169),
+                                    ("Saturday<time-of-day> am|pm", -4.304065093204169),
+                                    ("Wednesdayintersect2", -4.304065093204169),
                                     ("Martin Luther King's Daythis|last|next <cycle>",
-                                     -4.350277936359301),
-                                    ("on <date><time-of-day> am|pm", -4.350277936359301),
-                                    ("hourmonth", -4.350277936359301),
-                                    ("dayday", -3.2516656476911914),
-                                    ("the <day-of-month> (ordinal)February", -3.9448128282511368),
-                                    ("WednesdayOctober", -4.350277936359301),
-                                    ("Wednesdaythis|last|next <cycle>", -3.9448128282511368),
+                                     -4.304065093204169),
+                                    ("on <date><time-of-day> am|pm", -4.304065093204169),
+                                    ("hourmonth", -4.304065093204169),
+                                    ("dayday", -3.20545280453606),
+                                    ("the <day-of-month> (ordinal)February", -3.898599985096005),
+                                    ("WednesdayOctober", -4.304065093204169),
+                                    ("Wednesdaythis|last|next <cycle>", -3.898599985096005),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -3.4339872044851463),
-                                    ("the <ordinal> quarteryear", -4.350277936359301),
-                                    ("dayyear", -2.9639835752394106),
-                                    ("quarteryear", -3.9448128282511368),
-                                    ("Thursdayhh:mm", -3.9448128282511368),
-                                    ("Thanksgiving Daythis|last|next <cycle>", -4.350277936359301),
-                                    ("Memorial Daythis|last|next <cycle>", -4.350277936359301),
-                                    ("TuesdayOctober", -4.350277936359301),
-                                    ("the <day-of-month> (ordinal)March", -4.350277936359301),
-                                    ("Mondaythis|last|next <cycle>", -4.350277936359301),
+                                     -3.3877743613300146),
+                                    ("dayyear", -2.917770732084279),
+                                    ("Thursdayhh:mm", -3.898599985096005),
+                                    ("Thanksgiving Daythis|last|next <cycle>", -4.304065093204169),
+                                    ("Memorial Daythis|last|next <cycle>", -4.304065093204169),
+                                    ("TuesdayOctober", -4.304065093204169),
+                                    ("the <day-of-month> (ordinal)March", -4.304065093204169),
+                                    ("Mondaythis|last|next <cycle>", -4.304065093204169),
                                     ("intersect2<named-month> <day-of-month> (non ordinal)",
-                                     -3.4339872044851463),
+                                     -3.3877743613300146),
                                     ("Thursday<datetime> - <datetime> (interval)",
-                                     -3.657130755799356),
+                                     -3.6109179126442243),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.4339872044851463),
-                                    ("Tuesdaythis|last|next <cycle>", -4.350277936359301),
+                                     -3.3877743613300146),
+                                    ("Tuesdaythis|last|next <cycle>", -4.304065093204169),
                                     ("Sunday<named-month> <day-of-month> (non ordinal)",
-                                     -4.350277936359301),
-                                    ("dayminute", -3.0975149678639333),
-                                    ("<ordinal> quarteryear", -4.350277936359301),
-                                    ("minuteday", -2.846200539583027),
-                                    ("this|last|next <cycle>Sunday", -4.350277936359301),
-                                    ("Sundaythis|last|next <cycle>", -4.350277936359301),
-                                    ("weekday", -4.350277936359301),
-                                    ("dayweek", -3.2516656476911914),
-                                    ("intersect2year", -4.350277936359301),
-                                    ("Thursday<time-of-day> am|pm", -4.350277936359301),
+                                     -4.304065093204169),
+                                    ("dayminute", -3.0513021247088017),
+                                    ("minuteday", -2.7999876964278956),
+                                    ("this|last|next <cycle>Sunday", -4.304065093204169),
+                                    ("Sundaythis|last|next <cycle>", -4.304065093204169),
+                                    ("weekday", -4.304065093204169), ("dayweek", -3.20545280453606),
+                                    ("intersect2year", -4.304065093204169),
+                                    ("Thursday<time-of-day> am|pm", -4.304065093204169),
                                     ("Monday<named-month> <day-of-month> (non ordinal)",
-                                     -3.9448128282511368),
+                                     -3.898599985096005),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -3.9448128282511368)],
-                               n = 48},
+                                     -3.898599985096005)],
+                               n = 46},
                    koData =
-                     ClassData{prior = -0.9555114450274363, unseen = -4.787491742782046,
+                     ClassData{prior = -0.9295359586241757, unseen = -4.762173934797756,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -1.7346010553881064),
-                                    ("TuesdaySeptember", -4.085976312551584),
-                                    ("Wednesdayintersect", -4.085976312551584),
-                                    ("Wednesdayintersect2", -4.085976312551584),
-                                    ("SundayFebruary", -4.085976312551584),
-                                    ("WednesdayOctober", -4.085976312551584),
-                                    ("FridayJuly", -3.6805112044434196),
-                                    ("FridaySeptember", -4.085976312551584),
-                                    ("WednesdayFebruary", -4.085976312551584),
-                                    ("minutemonth", -2.58189891577531),
-                                    ("SundayMarch", -4.085976312551584),
-                                    ("MondayFebruary", -3.6805112044434196),
-                                    ("Tuesdayintersect2", -4.085976312551584),
+                                   [("daymonth", -1.7090677533829417),
+                                    ("TuesdaySeptember", -4.060443010546419),
+                                    ("Wednesdayintersect", -4.060443010546419),
+                                    ("Wednesdayintersect2", -4.060443010546419),
+                                    ("SundayFebruary", -4.060443010546419),
+                                    ("WednesdayOctober", -4.060443010546419),
+                                    ("FridayJuly", -3.654977902438255),
+                                    ("FridaySeptember", -4.060443010546419),
+                                    ("WednesdayFebruary", -4.060443010546419),
+                                    ("minutemonth", -2.5563656137701454),
+                                    ("SundayMarch", -4.060443010546419),
+                                    ("MondayFebruary", -3.654977902438255),
+                                    ("Tuesdayintersect2", -4.060443010546419),
                                     ("Thursday<time-of-day> - <time-of-day> (interval)",
-                                     -3.6805112044434196),
-                                    ("dayminute", -3.6805112044434196),
-                                    ("SaturdaySeptember", -4.085976312551584),
-                                    ("intersectSeptember", -3.169685580677429),
-                                    ("MondayMarch", -4.085976312551584),
-                                    ("intersect2September", -3.169685580677429),
-                                    ("on <date>September", -3.6805112044434196),
-                                    ("Sundayintersect2", -4.085976312551584),
-                                    ("Tuesdayintersect", -4.085976312551584),
-                                    ("Sundayintersect", -4.085976312551584)],
+                                     -3.654977902438255),
+                                    ("dayminute", -3.654977902438255),
+                                    ("SaturdaySeptember", -4.060443010546419),
+                                    ("intersectSeptember", -3.144152278672264),
+                                    ("MondayMarch", -4.060443010546419),
+                                    ("intersect2September", -3.144152278672264),
+                                    ("on <date>September", -3.654977902438255),
+                                    ("Sundayintersect2", -4.060443010546419),
+                                    ("Tuesdayintersect", -4.060443010546419),
+                                    ("Sundayintersect", -4.060443010546419)],
                                n = 30}}),
        ("last <time>",
         Classifier{okData =
diff --git a/Duckling/Ranking/Classifiers/FR.hs b/Duckling/Ranking/Classifiers/FR.hs
index 48bc5d35..de95fa31 100644
--- a/Duckling/Ranking/Classifiers/FR.hs
+++ b/Duckling/Ranking/Classifiers/FR.hs
@@ -298,25 +298,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<named-month|named-day> suivant|d'apr\232s",
         Classifier{okData =
-                     ClassData{prior = -0.9490805546971459,
-                               unseen = -3.4965075614664802,
+                     ClassData{prior = -0.10178269430994236,
+                               unseen = -4.174387269895637,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect", -1.8562979903656263),
-                                    ("intersect by 'de' or ','", -1.8562979903656263),
-                                    ("day", -0.9007865453381898),
-                                    ("named-day", -1.8562979903656263)],
-                               n = 12},
+                                   [("intersect", -2.5494451709255714),
+                                    ("en semaine", -1.9616585060234524),
+                                    ("intersect by 'de' or ','", -2.5494451709255714),
+                                    ("day", -0.7915872533731978),
+                                    ("named-day", -2.5494451709255714),
+                                    ("le <time>", -1.9616585060234524)],
+                               n = 28},
                    koData =
-                     ClassData{prior = -0.4895482253187058,
-                               unseen = -3.8501476017100584,
+                     ClassData{prior = -2.3353749158170367, unseen = -2.70805020110221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("en semaine", -1.5260563034950494),
-                                    ("day", -0.8842024173226546), ("hour", -3.1354942159291497),
-                                    ("<time-of-day> heures", -3.1354942159291497),
-                                    ("le <time>", -1.5260563034950494)],
-                               n = 19}}),
+                                   [("en semaine", -1.9459101490553135),
+                                    ("day", -1.540445040947149), ("hour", -1.9459101490553135),
+                                    ("<time-of-day> heures", -1.9459101490553135),
+                                    ("le <time>", -1.9459101490553135)],
+                               n = 3}}),
        ("seconde (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -590,277 +591,280 @@ classifiers
                                n = 2}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.29940553614784016,
-                               unseen = -6.915723448631314,
+                     ClassData{prior = -0.28538586019143075,
+                               unseen = -6.940222469119639,
                                likelihoods =
                                  HashMap.fromList
-                                   [("apr\232s <time-of-day>named-month", -5.816118604050453),
+                                   [("apr\232s <time-of-day>named-month", -5.840641657373398),
                                     ("<day-of-month> <named-month><dim time> <part-of-day>",
-                                     -5.816118604050453),
-                                    ("intersect<dim time> du matin", -5.816118604050453),
+                                     -5.840641657373398),
+                                    ("intersect<dim time> du matin", -5.840641657373398),
                                     ("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -6.221583712158617),
-                                    ("hh(:|h)mm (time-of-day)named-day", -5.816118604050453),
-                                    ("demain<time-of-day> heures", -5.816118604050453),
-                                    ("hourday", -4.612145799724517),
-                                    ("<day-of-month> <named-month>year", -5.528436531598672),
-                                    ("dayhour", -1.667706820558076),
-                                    ("daymonth", -3.0435298818106715),
-                                    ("monthyear", -4.717506315382343),
-                                    ("dernier <cycle> de <time> (latent)year", -5.305292980284462),
-                                    ("named-month<dim time> du matin", -5.816118604050453),
+                                     -6.246106765481563),
+                                    ("hh(:|h)mm (time-of-day)named-day", -5.840641657373398),
+                                    ("demain<time-of-day> heures", -5.840641657373398),
+                                    ("hourday", -4.636668853047462),
+                                    ("<day-of-month> <named-month>year", -5.552959584921617),
+                                    ("dayhour", -1.692229873881022),
+                                    ("daymonth", -3.068052935133617),
+                                    ("monthyear", -4.742029368705289),
+                                    ("dernier <cycle> de <time> (latent)year", -5.329816033607408),
+                                    ("named-month<dim time> du matin", -5.840641657373398),
                                     ("<day-of-month> <named-month>\224|vers <time-of-day>",
-                                     -4.0815175486623465),
-                                    ("dd mmyear", -4.968820743663249),
+                                     -4.106040601985292),
+                                    ("dd mmyear", -4.993343796986195),
                                     ("le <day-of-month> (non ordinal)<dim time> du matin",
-                                     -5.816118604050453),
+                                     -5.840641657373398),
                                     ("hh(:|h)mm (time-of-day)<day-of-week> <day-of-month>",
-                                     -6.221583712158617),
-                                    ("named-month\224|vers <time-of-day>", -4.968820743663249),
-                                    ("named-dayday of month (premier)", -5.528436531598672),
+                                     -6.246106765481563),
+                                    ("named-month\224|vers <time-of-day>", -4.993343796986195),
+                                    ("named-dayday of month (premier)", -5.552959584921617),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -4.717506315382343),
+                                     -4.742029368705289),
                                     ("<hour-of-day> et quart<dim time> <part-of-day>",
-                                     -5.528436531598672),
-                                    ("<day-of-week> <day-of-month>named-month", -5.528436531598672),
-                                    ("le <time>du|dans le <part-of-day>", -5.305292980284462),
-                                    ("\224|vers <time-of-day>ce <part-of-day>", -5.528436531598672),
+                                     -5.552959584921617),
+                                    ("<day-of-week> <day-of-month>named-month", -5.552959584921617),
+                                    ("le <time>du|dans le <part-of-day>", -5.329816033607408),
+                                    ("\224|vers <time-of-day>ce <part-of-day>", -5.552959584921617),
                                     ("le <day-of-month> (non ordinal)<dim time> du soir",
-                                     -4.968820743663249),
+                                     -4.993343796986195),
                                     ("entre <datetime> et <datetime> (interval)named-day",
-                                     -5.816118604050453),
-                                    ("<hour-of-day> et demice <part-of-day>", -5.528436531598672),
+                                     -5.840641657373398),
+                                    ("<hour-of-day> et demice <part-of-day>", -5.552959584921617),
                                     ("le <day-of-month> (non ordinal)<time-of-day> heures",
-                                     -4.612145799724517),
+                                     -4.636668853047462),
                                     ("<hour-of-day> <integer> (as relative minutes)<day-of-week> <day-of-month>",
-                                     -6.221583712158617),
+                                     -6.246106765481563),
                                     ("le <day-of-month> (non ordinal)named-month",
-                                     -4.206680691616352),
-                                    ("monthhour", -4.142142170478781),
-                                    ("le <time><time-of-day> heures", -5.122971423490507),
-                                    ("hourmonth", -5.305292980284462),
-                                    ("<time-of-day> heuresle <time>", -5.305292980284462),
-                                    ("dayday", -4.3497815352570255),
+                                     -4.231203744939298),
+                                    ("monthhour", -4.1666652238017265),
+                                    ("le <time><time-of-day> heures", -5.147494476813453),
+                                    ("hourmonth", -5.329816033607408),
+                                    ("<time-of-day> heuresle <time>", -5.329816033607408),
+                                    ("dayday", -3.894731508318085),
                                     ("aujourd'hui<hour-of-day> <integer> (as relative minutes)",
-                                     -5.528436531598672),
-                                    ("apr\232s <time-of-day>named-day", -5.816118604050453),
+                                     -5.552959584921617),
+                                    ("apr\232s <time-of-day>named-day", -5.840641657373398),
                                     ("named-dayle <cycle> prochain|suivant|d'apr\232s",
-                                     -4.8352893510387265),
-                                    ("named-dayapr\232s <time-of-day>", -5.528436531598672),
-                                    ("hourhour", -3.2011588260142547),
+                                     -4.859812404361672),
+                                    ("named-dayapr\232s <time-of-day>", -5.552959584921617),
+                                    ("hourhour", -3.2256818793372),
                                     ("<day-of-week> <day-of-month>\224|vers <time-of-day>",
-                                     -4.516835619920192),
-                                    ("le <time>intersect", -5.528436531598672),
+                                     -4.5413586732431375),
+                                    ("le <time>intersect", -5.552959584921617),
                                     ("\224|vers <time-of-day><dim time> <part-of-day>",
-                                     -6.221583712158617),
-                                    ("<time-of-day> heuresintersect", -5.816118604050453),
-                                    ("intersectnamed-month", -4.968820743663249),
-                                    ("intersect<time-of-day> heures", -5.528436531598672),
-                                    ("<hour-of-day> et quartce <part-of-day>", -5.528436531598672),
-                                    ("dayyear", -3.8236884393602466),
-                                    ("named-dayce|dans le <cycle>", -5.528436531598672),
-                                    ("apr\232s-demain\224|vers <time-of-day>", -5.305292980284462),
-                                    ("le <ordinal> <cycle> de <time>year", -6.221583712158617),
-                                    ("demain\224|vers <time-of-day>", -5.305292980284462),
+                                     -6.246106765481563),
+                                    ("<time-of-day> heuresintersect", -5.840641657373398),
+                                    ("intersectnamed-month", -4.993343796986195),
+                                    ("intersect<time-of-day> heures", -5.552959584921617),
+                                    ("<hour-of-day> et quartce <part-of-day>", -5.552959584921617),
+                                    ("dayyear", -3.848211492683192),
+                                    ("named-dayce|dans le <cycle>", -5.552959584921617),
+                                    ("apr\232s-demain\224|vers <time-of-day>", -5.329816033607408),
+                                    ("le <ordinal> <cycle> de <time>year", -6.246106765481563),
+                                    ("demain\224|vers <time-of-day>", -5.329816033607408),
                                     ("le <day-of-month> (non ordinal)intersect",
-                                     -3.618894026714233),
-                                    ("hourminute", -6.221583712158617),
-                                    ("dd-dd <month>(interval)year", -6.221583712158617),
-                                    ("intersect<day-of-month> <named-month>", -5.816118604050453),
-                                    ("minutemonth", -5.816118604050453),
-                                    ("minutehour", -4.3497815352570255),
-                                    ("named-daydu|dans le <part-of-day>", -5.528436531598672),
-                                    ("named-monthyear", -4.717506315382343),
+                                     -3.643417080037179),
+                                    ("hourminute", -6.246106765481563),
+                                    ("dd-dd <month>(interval)year", -6.246106765481563),
+                                    ("intersect<day-of-month> <named-month>", -5.840641657373398),
+                                    ("minutemonth", -5.840641657373398),
+                                    ("\224|vers <time-of-day>demain", -6.246106765481563),
+                                    ("minutehour", -4.374304588579971),
+                                    ("named-daydu|dans le <part-of-day>", -5.552959584921617),
+                                    ("named-monthyear", -4.742029368705289),
                                     ("entre <datetime> et <datetime> (interval)named-month",
-                                     -6.221583712158617),
-                                    ("intersectdu|dans le <part-of-day>", -3.870208454995139),
+                                     -6.246106765481563),
+                                    ("intersectdu|dans le <part-of-day>", -3.894731508318085),
                                     ("le <day-of-month> \224 <datetime>du|dans le <part-of-day>",
-                                     -5.816118604050453),
-                                    ("named-month<dim time> <part-of-day>", -5.816118604050453),
+                                     -5.840641657373398),
+                                    ("named-month<dim time> <part-of-day>", -5.840641657373398),
                                     ("le <day-of-month> (non ordinal)apr\232s <time-of-day>",
-                                     -6.221583712158617),
-                                    ("named-day<day-of-month> <named-month>", -5.528436531598672),
-                                    ("named-dayle <time>", -4.3497815352570255),
+                                     -6.246106765481563),
+                                    ("named-day<day-of-month> <named-month>", -5.552959584921617),
+                                    ("named-dayle <time>", -4.106040601985292),
                                     ("le <day-of-month> (non ordinal)<dim time> <part-of-day>",
-                                     -4.516835619920192),
-                                    ("dd/-mm<time-of-day> heures", -5.816118604050453),
+                                     -4.5413586732431375),
+                                    ("dd/-mm<time-of-day> heures", -5.840641657373398),
                                     ("de <datetime> - <datetime> (interval)named-month",
-                                     -5.816118604050453),
-                                    ("apr\232s <time-of-day>le <time>", -5.816118604050453),
-                                    ("named-day<time-of-day> heures", -5.528436531598672),
-                                    ("<time-of-day> heuresce <time>", -6.221583712158617),
+                                     -5.840641657373398),
+                                    ("apr\232s <time-of-day>le <time>", -5.840641657373398),
+                                    ("named-day<time-of-day> heures", -5.552959584921617),
+                                    ("<hour-of-day> et quartdemain", -5.552959584921617),
+                                    ("<time-of-day> heuresce <time>", -6.246106765481563),
                                     ("<day-of-month> <named-month>du|dans le <part-of-day>",
-                                     -5.816118604050453),
-                                    ("named-dayintersect", -6.221583712158617),
-                                    ("le <time><dim time> du matin", -5.816118604050453),
-                                    ("apr\232s <time-of-day>intersect", -6.221583712158617),
+                                     -5.840641657373398),
+                                    ("named-dayintersect", -6.246106765481563),
+                                    ("le <time><dim time> du matin", -5.840641657373398),
+                                    ("apr\232s <time-of-day>intersect", -6.246106765481563),
                                     ("le <day-of-month> (non ordinal)\224|vers <time-of-day>",
-                                     -4.275673563103304),
-                                    ("hierdu|dans le <part-of-day>", -6.221583712158617),
-                                    ("intersect<dim time> <part-of-day>", -5.816118604050453),
-                                    ("dayminute", -4.717506315382343),
-                                    ("<ordinal> <cycle> de <time>year", -5.816118604050453),
-                                    ("le <time>\224|vers <time-of-day>", -4.516835619920192),
+                                     -4.300196616426249),
+                                    ("hierdu|dans le <part-of-day>", -6.246106765481563),
+                                    ("intersect<dim time> <part-of-day>", -5.840641657373398),
+                                    ("dayminute", -4.742029368705289),
+                                    ("<ordinal> <cycle> de <time>year", -5.840641657373398),
+                                    ("le <time>\224|vers <time-of-day>", -4.5413586732431375),
                                     ("<day-of-month> <named-month><dim time> du matin",
-                                     -5.816118604050453),
-                                    ("intersectyear", -5.528436531598672),
+                                     -5.840641657373398),
+                                    ("intersectyear", -5.552959584921617),
                                     ("<day-of-week> <day-of-month><time-of-day> heures",
-                                     -5.122971423490507),
-                                    ("minuteday", -3.418223331252082),
+                                     -5.147494476813453),
+                                    ("minuteday", -3.3283360333972833),
                                     ("<datetime> - <datetime> (interval)named-month",
-                                     -4.968820743663249),
+                                     -4.993343796986195),
                                     ("<day-of-month> <named-month><time-of-day> heures",
-                                     -4.717506315382343),
-                                    ("aujourd'hui\224|vers <time-of-day>", -5.305292980284462),
-                                    ("day of month (premier)intersect", -6.221583712158617),
+                                     -4.742029368705289),
+                                    ("aujourd'hui\224|vers <time-of-day>", -5.329816033607408),
+                                    ("day of month (premier)intersect", -6.246106765481563),
                                     ("entre <time-of-day> et <time-of-day> (interval)named-day",
-                                     -5.816118604050453),
+                                     -5.840641657373398),
+                                    ("named-day<named-month|named-day> suivant|d'apr\232s",
+                                     -5.329816033607408),
                                     ("<dim time> <part-of-day>apr\232s <time-of-day>",
-                                     -6.221583712158617),
-                                    ("named-month<time-of-day> heures", -5.528436531598672),
-                                    ("<time-of-day> heuresce <part-of-day>", -5.528436531598672),
-                                    ("le <time>named-month", -5.122971423490507),
-                                    ("apr\232s le <day-of-month>named-month", -6.221583712158617),
+                                     -6.246106765481563),
+                                    ("named-month<time-of-day> heures", -5.552959584921617),
+                                    ("<time-of-day> heuresce <part-of-day>", -5.552959584921617),
+                                    ("le <time>named-month", -5.147494476813453),
+                                    ("apr\232s le <day-of-month>named-month", -6.246106765481563),
                                     ("\224|vers <time-of-day>du|dans le <part-of-day>",
-                                     -5.122971423490507),
-                                    ("intersectintersect", -5.816118604050453),
+                                     -5.147494476813453),
+                                    ("intersectintersect", -5.840641657373398),
                                     ("de <time-of-day> - <time-of-day> (interval)named-day",
-                                     -5.305292980284462),
+                                     -5.329816033607408),
                                     ("de <datetime> - <datetime> (interval)named-day",
-                                     -5.816118604050453),
+                                     -5.840641657373398),
                                     ("named-dayde <time-of-day> - <time-of-day> (interval)",
-                                     -5.816118604050453),
-                                    ("dayweek", -4.024359134822397),
-                                    ("weekyear", -4.8352893510387265),
+                                     -5.840641657373398),
+                                    ("dayweek", -4.048882188145344),
+                                    ("weekyear", -4.859812404361672),
                                     ("<hour-of-day> <integer> (as relative minutes)named-day",
-                                     -5.816118604050453),
-                                    ("hh(:|h)mm (time-of-day)intersect", -6.221583712158617),
-                                    ("named-monthintersect", -5.816118604050453),
-                                    ("dd/-mm\224|vers <time-of-day>", -5.305292980284462),
-                                    ("day of month (premier)named-month", -4.516835619920192),
-                                    ("named-day\224|vers <time-of-day>", -4.8352893510387265),
-                                    ("<day-of-month> <named-month>intersect", -5.816118604050453),
-                                    ("intersect\224|vers <time-of-day>", -4.968820743663249),
-                                    ("le <time>year", -4.717506315382343),
-                                    ("le <time><dim time> <part-of-day>", -5.816118604050453),
+                                     -5.840641657373398),
+                                    ("hh(:|h)mm (time-of-day)intersect", -6.246106765481563),
+                                    ("named-monthintersect", -5.840641657373398),
+                                    ("dd/-mm\224|vers <time-of-day>", -5.329816033607408),
+                                    ("day of month (premier)named-month", -4.5413586732431375),
+                                    ("named-day\224|vers <time-of-day>", -4.859812404361672),
+                                    ("<day-of-month> <named-month>intersect", -5.840641657373398),
+                                    ("intersect\224|vers <time-of-day>", -4.993343796986195),
+                                    ("le <time>year", -4.742029368705289),
+                                    ("le <time><dim time> <part-of-day>", -5.840641657373398),
                                     ("<time-of-day> - <time-of-day> (interval)named-day",
-                                     -4.968820743663249),
-                                    ("apr\232s-demain<time-of-day> heures", -5.816118604050453),
+                                     -4.993343796986195),
+                                    ("apr\232s-demain<time-of-day> heures", -5.840641657373398),
                                     ("<datetime> - <datetime> (interval)named-day",
-                                     -5.305292980284462)],
-                               n = 424},
+                                     -5.329816033607408)],
+                               n = 436},
                    koData =
-                     ClassData{prior = -1.3519267176156828,
-                               unseen = -6.1224928095143865,
+                     ClassData{prior = -1.3932148039644645,
+                               unseen = -6.1070228877422545,
                                likelihoods =
                                  HashMap.fromList
                                    [("<hour-of-day> <integer> (as relative minutes)intersect",
-                                     -5.427150238391005),
-                                    ("hh(:|h)mm (time-of-day)named-day", -5.427150238391005),
+                                     -5.4116460518550396),
+                                    ("hh(:|h)mm (time-of-day)named-day", -5.4116460518550396),
                                     ("year<time-of-day> - <time-of-day> (interval)",
-                                     -4.7340030578310595),
-                                    ("demain<time-of-day> heures", -4.7340030578310595),
-                                    ("hourday", -3.2299256610547857),
-                                    ("<day-of-month> <named-month>year", -5.427150238391005),
-                                    ("demainavant <time-of-day>", -5.427150238391005),
-                                    ("dayhour", -2.431417964837014),
-                                    ("le lendemain du <time>named-month", -5.427150238391005),
-                                    ("daymonth", -3.817712325956905),
-                                    ("monthday", -5.427150238391005),
-                                    ("monthyear", -4.7340030578310595),
-                                    ("yearhour", -4.7340030578310595),
-                                    ("houryear", -5.021685130282841),
-                                    ("aujourd'hui<time-of-day> heures", -5.427150238391005),
-                                    ("named-month\224|vers <time-of-day>", -3.72240214615258),
+                                     -4.718498871295094),
+                                    ("demain<time-of-day> heures", -4.718498871295094),
+                                    ("hourday", -3.2144214745188204),
+                                    ("<day-of-month> <named-month>year", -5.4116460518550396),
+                                    ("demainavant <time-of-day>", -5.4116460518550396),
+                                    ("dayhour", -2.4159137783010487),
+                                    ("le lendemain du <time>named-month", -5.4116460518550396),
+                                    ("daymonth", -3.8022081394209395),
+                                    ("monthday", -5.4116460518550396),
+                                    ("monthyear", -4.718498871295094),
+                                    ("yearhour", -4.718498871295094),
+                                    ("houryear", -5.006180943746876),
+                                    ("aujourd'hui<time-of-day> heures", -5.4116460518550396),
+                                    ("named-month\224|vers <time-of-day>", -3.7068979596166147),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -4.7340030578310595),
-                                    ("<day-of-week> <day-of-month>named-month", -4.040855877271114),
-                                    ("le <time>du|dans le <part-of-day>", -5.021685130282841),
+                                     -4.718498871295094),
+                                    ("<day-of-week> <day-of-month>named-month", -4.02535169073515),
+                                    ("le <time>du|dans le <part-of-day>", -5.006180943746876),
                                     ("le <day-of-month> (non ordinal)<hour-of-day> <integer> (as relative minutes)",
-                                     -4.7340030578310595),
-                                    ("named-month<day-of-month> <named-month>", -5.427150238391005),
+                                     -4.718498871295094),
+                                    ("named-month<day-of-month> <named-month>",
+                                     -5.4116460518550396),
                                     ("<time-of-day> heuresle <day-of-month> (non ordinal)",
-                                     -5.021685130282841),
+                                     -5.006180943746876),
                                     ("le <day-of-month> (non ordinal)<time-of-day> heures",
-                                     -5.427150238391005),
-                                    ("aujourd'huidu|dans le <part-of-day>", -5.021685130282841),
+                                     -5.4116460518550396),
+                                    ("aujourd'huidu|dans le <part-of-day>", -5.006180943746876),
                                     ("le <day-of-month> (non ordinal)named-month",
-                                     -5.427150238391005),
-                                    ("monthhour", -3.2299256610547857),
-                                    ("hourmonth", -4.174387269895637),
-                                    ("dayday", -4.040855877271114),
-                                    ("named-dayapr\232s <time-of-day>", -5.021685130282841),
-                                    ("hourhour", -3.817712325956905),
+                                     -5.4116460518550396),
+                                    ("monthhour", -3.2144214745188204),
+                                    ("hourmonth", -4.1588830833596715),
+                                    ("dayday", -4.02535169073515),
+                                    ("named-dayapr\232s <time-of-day>", -5.006180943746876),
+                                    ("hourhour", -3.8022081394209395),
                                     ("named-day<hour-of-day> <integer> (as relative minutes)",
-                                     -5.021685130282841),
-                                    ("dayyear", -4.174387269895637),
-                                    ("le <cycle> de <time>named-month", -5.021685130282841),
+                                     -5.006180943746876),
+                                    ("dayyear", -4.1588830833596715),
+                                    ("le <cycle> de <time>named-month", -5.006180943746876),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.7340030578310595),
-                                    ("demain\224|vers <time-of-day>", -4.51085950651685),
+                                     -4.718498871295094),
+                                    ("demain\224|vers <time-of-day>", -4.4953553199808844),
                                     ("<dim time> <part-of-day><hour-of-day> <integer> (as relative minutes)",
-                                     -5.021685130282841),
-                                    ("hourminute", -5.021685130282841),
-                                    ("minutemonth", -4.7340030578310595),
-                                    ("\224|vers <time-of-day>demain", -5.427150238391005),
-                                    ("named-monthyear", -4.7340030578310595),
-                                    ("intersect by 'de' or ','year", -5.021685130282841),
+                                     -5.006180943746876),
+                                    ("hourminute", -5.006180943746876),
+                                    ("minutemonth", -4.718498871295094),
+                                    ("named-monthyear", -4.718498871295094),
+                                    ("intersect by 'de' or ','year", -5.006180943746876),
                                     ("named-day<time-of-day> - <time-of-day> (interval)",
-                                     -3.72240214615258),
+                                     -3.7068979596166147),
                                     ("named-day<datetime> - <datetime> (interval)",
-                                     -5.021685130282841),
-                                    ("named-day<day-of-month> <named-month>", -4.7340030578310595),
-                                    ("weekmonth", -5.021685130282841),
-                                    ("named-dayle <time>", -5.021685130282841),
-                                    ("avant <time-of-day>named-day", -5.427150238391005),
+                                     -5.006180943746876),
+                                    ("named-day<day-of-month> <named-month>", -4.718498871295094),
+                                    ("weekmonth", -5.006180943746876),
+                                    ("named-dayle <time>", -5.006180943746876),
+                                    ("avant <time-of-day>named-day", -5.4116460518550396),
                                     ("de <datetime> - <datetime> (interval)named-month",
-                                     -5.427150238391005),
-                                    ("le <day-of-month> (non ordinal)year", -5.021685130282841),
-                                    ("named-day<time-of-day> heures", -5.427150238391005),
-                                    ("<time-of-day> heuresnamed-day", -3.923072841614731),
+                                     -5.4116460518550396),
+                                    ("le <day-of-month> (non ordinal)year", -5.006180943746876),
+                                    ("named-day<time-of-day> heures", -5.4116460518550396),
+                                    ("<time-of-day> heuresnamed-day", -3.907568655078766),
                                     ("apr\232s <time-of-day><time-of-day> heures",
-                                     -5.021685130282841),
-                                    ("<time-of-day> heuresdd/-mm", -5.427150238391005),
-                                    ("<hour-of-day> et quartdemain", -4.7340030578310595),
+                                     -5.006180943746876),
+                                    ("<time-of-day> heuresdd/-mm", -5.4116460518550396),
                                     ("<time-of-day> - <time-of-day> (interval)du|dans le <part-of-day>",
-                                     -5.021685130282841),
+                                     -5.006180943746876),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -5.021685130282841),
+                                     -5.006180943746876),
                                     ("le <day-of-month> (non ordinal)\224|vers <time-of-day>",
-                                     -4.7340030578310595),
-                                    ("dayminute", -4.328537949722896),
-                                    ("named-monthdu|dans le <part-of-day>", -5.021685130282841),
-                                    ("intersectyear", -5.021685130282841),
-                                    ("minuteday", -4.040855877271114),
-                                    ("aujourd'hui\224|vers <time-of-day>", -4.7340030578310595),
-                                    ("<datetime>-dd <month>(interval)year", -5.021685130282841),
+                                     -4.718498871295094),
+                                    ("dayminute", -4.31303376318693),
+                                    ("named-monthdu|dans le <part-of-day>", -5.006180943746876),
+                                    ("intersectyear", -5.006180943746876),
+                                    ("minuteday", -4.718498871295094),
+                                    ("aujourd'hui\224|vers <time-of-day>", -4.718498871295094),
+                                    ("<datetime>-dd <month>(interval)year", -5.006180943746876),
                                     ("<time-of-day> - <time-of-day> (interval)named-month",
-                                     -4.51085950651685),
+                                     -4.4953553199808844),
                                     ("le <day-of-month> (non ordinal)avant <time-of-day>",
-                                     -5.427150238391005),
+                                     -5.4116460518550396),
                                     ("<dim time> <part-of-day>apr\232s <time-of-day>",
-                                     -5.427150238391005),
-                                    ("named-month<time-of-day> heures", -4.328537949722896),
-                                    ("demainapr\232s <time-of-day>", -5.427150238391005),
+                                     -5.4116460518550396),
+                                    ("named-month<time-of-day> heures", -4.31303376318693),
+                                    ("demainapr\232s <time-of-day>", -5.4116460518550396),
                                     ("<hour-of-day> <integer> (as relative minutes)named-day",
-                                     -5.021685130282841),
+                                     -5.006180943746876),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.51085950651685),
+                                     -4.4953553199808844),
                                     ("<time-of-day> - <time-of-day> (interval)intersect",
-                                     -5.427150238391005),
+                                     -5.4116460518550396),
                                     ("apr\232s <time-of-day>\224|vers <time-of-day>",
-                                     -4.51085950651685),
-                                    ("\224|vers <time-of-day>named-day", -4.7340030578310595),
-                                    ("le <time>year", -5.021685130282841),
+                                     -4.4953553199808844),
+                                    ("\224|vers <time-of-day>named-day", -4.718498871295094),
+                                    ("le <time>year", -5.006180943746876),
                                     ("apr\232s <time-of-day>le <day-of-month> (non ordinal)",
-                                     -5.427150238391005),
+                                     -5.4116460518550396),
                                     ("de <datetime> - <datetime> (interval)<day-of-month> <named-month>",
-                                     -5.427150238391005),
-                                    ("minuteyear", -4.040855877271114),
-                                    ("yearminute", -4.7340030578310595),
+                                     -5.4116460518550396),
+                                    ("minuteyear", -4.02535169073515),
+                                    ("yearminute", -4.718498871295094),
                                     ("<dim time> <part-of-day><time-of-day> heures",
-                                     -5.427150238391005)],
-                               n = 148}}),
+                                     -5.4116460518550396)],
+                               n = 144}}),
        ("season",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1082,37 +1086,39 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by 'de' or ','",
         Classifier{okData =
-                     ClassData{prior = -0.3483066942682157,
-                               unseen = -4.1588830833596715,
+                     ClassData{prior = -0.2719337154836418, unseen = -4.394449154672439,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -3.044522437723423),
-                                    ("hourmonth", -3.4499875458315876),
-                                    ("dayday", -2.3513752571634776),
+                                   [("dayhour", -3.283414346005772),
+                                    ("hourmonth", -3.6888794541139363),
+                                    ("dayday", -1.742969305058623),
                                     ("named-dayle <cycle> prochain|suivant|d'apr\232s",
-                                     -2.063693184711697),
+                                     -2.3025850929940455),
                                     ("named-day<time-of-day> - <time-of-day> (interval)",
-                                     -3.044522437723423),
-                                    ("named-dayle <time>", -1.5040773967762742),
-                                    ("named-dayle <cycle> dernier", -3.4499875458315876),
-                                    ("week-endnamed-month", -3.4499875458315876),
-                                    ("dayweek", -1.3099213823353166)],
-                               n = 24},
+                                     -3.283414346005772),
+                                    ("named-dayle <time>", -1.491654876777717),
+                                    ("named-dayle <cycle> dernier", -3.6888794541139363),
+                                    ("named-day<named-month|named-day> suivant|d'apr\232s",
+                                     -2.772588722239781),
+                                    ("week-endnamed-month", -3.6888794541139363),
+                                    ("dayweek", -1.5488132906176655)],
+                               n = 32},
                    koData =
-                     ClassData{prior = -1.2237754316221157, unseen = -3.58351893845611,
+                     ClassData{prior = -1.4350845252893227,
+                               unseen = -3.6109179126442243,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -2.8622008809294686),
-                                    ("dayhour", -2.8622008809294686),
-                                    ("daymonth", -1.9459101490553135),
-                                    ("du|dans le <part-of-day>noel", -2.8622008809294686),
-                                    ("en semainenamed-month", -2.456735772821304),
-                                    ("hourmonth", -2.456735772821304),
-                                    ("dayday", -2.456735772821304),
-                                    ("en semaineintersect", -2.456735772821304),
-                                    ("named-dayle <time>", -2.456735772821304),
-                                    ("named-day<time-of-day> heures", -2.8622008809294686),
-                                    ("week-endnamed-month", -2.456735772821304)],
+                                   [("hourday", -2.890371757896165),
+                                    ("dayhour", -2.890371757896165),
+                                    ("daymonth", -1.9740810260220096),
+                                    ("du|dans le <part-of-day>noel", -2.890371757896165),
+                                    ("en semainenamed-month", -2.4849066497880004),
+                                    ("hourmonth", -2.4849066497880004),
+                                    ("dayday", -2.4849066497880004),
+                                    ("en semaineintersect", -2.4849066497880004),
+                                    ("named-dayle <time>", -2.4849066497880004),
+                                    ("named-day<time-of-day> heures", -2.890371757896165),
+                                    ("week-endnamed-month", -2.4849066497880004)],
                                n = 10}}),
        ("named-month",
         Classifier{okData =
@@ -1381,55 +1387,55 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.14595391262307983,
-                               unseen = -5.1298987149230735,
+                     ClassData{prior = -0.13858616328614667,
+                               unseen = -5.181783550292085,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.9459101490553135),
+                                   [("dayhour", -1.9980959022258835),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -2.9267394020670396),
-                                    ("le <time>du|dans le <part-of-day>", -3.5145260669691587),
+                                     -2.9789251552376097),
+                                    ("le <time>du|dans le <part-of-day>", -3.5667118201397288),
                                     ("\224|vers <time-of-day>ce <part-of-day>",
-                                     -3.7376696182833684),
-                                    ("named-daymatin", -4.02535169073515),
-                                    ("demainsoir", -4.430816798843313),
-                                    ("<hour-of-day> et demice <part-of-day>", -3.7376696182833684),
-                                    ("hourhour", -1.4350845252893227),
-                                    ("aujourd'huiau d\233jeuner", -4.430816798843313),
-                                    ("<hour-of-day> et quartce <part-of-day>", -3.7376696182833684),
-                                    ("demainapr\232s-midi", -4.430816798843313),
-                                    ("minutehour", -2.9267394020670396),
-                                    ("named-daydu|dans le <part-of-day>", -3.7376696182833684),
-                                    ("intersectdu|dans le <part-of-day>", -2.0794415416798357),
+                                     -3.7898553714539385),
+                                    ("named-daymatin", -4.07753744390572),
+                                    ("demainsoir", -4.483002552013883),
+                                    ("<hour-of-day> et demice <part-of-day>", -3.7898553714539385),
+                                    ("hourhour", -1.4872702784598928),
+                                    ("aujourd'huiau d\233jeuner", -4.483002552013883),
+                                    ("<hour-of-day> et quartce <part-of-day>", -3.7898553714539385),
+                                    ("demainapr\232s-midi", -4.483002552013883),
+                                    ("minutehour", -2.6112003751122925),
+                                    ("named-daydu|dans le <part-of-day>", -3.7898553714539385),
+                                    ("intersectdu|dans le <part-of-day>", -2.1316272948504063),
                                     ("le <day-of-month> \224 <datetime>du|dans le <part-of-day>",
-                                     -4.02535169073515),
-                                    ("named-dayfin d'apr\232s-midi", -4.430816798843313),
+                                     -4.07753744390572),
+                                    ("named-dayfin d'apr\232s-midi", -4.483002552013883),
                                     ("<day-of-month> <named-month>du|dans le <part-of-day>",
-                                     -4.02535169073515),
-                                    ("hierdu|dans le <part-of-day>", -4.430816798843313),
-                                    ("named-daysoir", -4.430816798843313),
-                                    ("aujourd'huid\233but de matin\233e", -3.5145260669691587),
-                                    ("<time-of-day> heuresce <part-of-day>", -3.7376696182833684),
+                                     -4.07753744390572),
+                                    ("hierdu|dans le <part-of-day>", -4.483002552013883),
+                                    ("named-daysoir", -4.483002552013883),
+                                    ("aujourd'huid\233but de matin\233e", -3.5667118201397288),
+                                    ("<time-of-day> heuresce <part-of-day>", -3.7898553714539385),
                                     ("\224|vers <time-of-day>du|dans le <part-of-day>",
-                                     -3.332204510175204),
-                                    ("named-dayapr\232s-midi", -4.430816798843313),
-                                    ("hiersoir", -4.430816798843313)],
-                               n = 70},
+                                     -3.3843902633457743),
+                                    ("named-dayapr\232s-midi", -4.483002552013883),
+                                    ("intersectapr\232s-midi", -3.5667118201397288),
+                                    ("hiersoir", -4.483002552013883)],
+                               n = 74},
                    koData =
-                     ClassData{prior = -1.9965538818740682,
-                               unseen = -3.9318256327243257,
+                     ClassData{prior = -2.044755983691946, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -2.8134107167600364),
+                                   [("dayhour", -2.833213344056216),
                                     ("<time-of-day> heuresdu|dans le <part-of-day>",
-                                     -2.5257286443082556),
-                                    ("le <time>du|dans le <part-of-day>", -2.8134107167600364),
-                                    ("aujourd'huidu|dans le <part-of-day>", -2.8134107167600364),
-                                    ("monthhour", -2.8134107167600364),
-                                    ("hourhour", -1.8325814637483102),
+                                     -2.5455312716044354),
+                                    ("le <time>du|dans le <part-of-day>", -2.833213344056216),
+                                    ("aujourd'huidu|dans le <part-of-day>", -2.833213344056216),
+                                    ("monthhour", -2.833213344056216),
+                                    ("hourhour", -1.8523840910444898),
                                     ("<time-of-day> - <time-of-day> (interval)du|dans le <part-of-day>",
-                                     -2.8134107167600364),
-                                    ("named-monthdu|dans le <part-of-day>", -2.8134107167600364)],
+                                     -2.833213344056216),
+                                    ("named-monthdu|dans le <part-of-day>", -2.833213344056216)],
                                n = 11}}),
        ("jour de l'an",
         Classifier{okData =
@@ -2180,55 +2186,56 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("le <time>",
         Classifier{okData =
-                     ClassData{prior = -0.34609283460819534, unseen = -5.68697535633982,
+                     ClassData{prior = -0.2876820724517809, unseen = -5.739792912179234,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -2.4254832293171997),
-                                    ("<ordinal> <cycle> de <time>", -4.297285406218791),
+                                   [("week", -2.4784757594577096),
+                                    ("<named-month|named-day> suivant|d'apr\232s",
+                                     -3.5393477201429726),
+                                    ("<ordinal> <cycle> de <time>", -4.350277936359301),
                                     ("premi\232re quinzaine de <named-month>(interval)",
-                                     -4.990432586778736),
-                                    ("intersect", -1.9947003132247452),
-                                    ("soir de no\235l", -4.990432586778736),
-                                    ("en semaine", -3.285684494540311),
-                                    ("toussaint", -4.584967478670572), ("day", -1.3931203261902905),
+                                     -5.043425116919247),
+                                    ("intersect", -2.0476928433652555),
+                                    ("soir de no\235l", -5.043425116919247),
+                                    ("en semaine", -3.3386770246808215),
+                                    ("toussaint", -4.637960008811082), ("day", -1.3421231428067533),
                                     ("deuxi\232me quinzaine de <named-month>(interval)",
-                                     -4.990432586778736),
-                                    ("<dim time> <part-of-day>", -4.074141854904581),
-                                    ("dd/-mm", -3.7376696182833684),
-                                    ("dd/-mm/-yyyy", -4.297285406218791),
-                                    ("dd mm yyyy", -3.7376696182833684),
-                                    ("day of month (premier)", -3.891820298110627),
-                                    ("dd mm", -3.7376696182833684), ("hour", -2.1572192427225203),
-                                    ("month", -4.297285406218791),
-                                    ("dernier <cycle> de <time> (latent)", -4.074141854904581),
-                                    ("<day-of-month> <named-month>", -2.9755295662364714),
-                                    ("<cycle> prochain|suivant|d'apr\232s", -2.639057329615259),
-                                    ("dernier week-end de <time>", -4.990432586778736),
-                                    ("<ordinal> week-end de <time>", -4.584967478670572),
-                                    ("<cycle> dernier", -3.891820298110627)],
-                               n = 133},
+                                     -5.043425116919247),
+                                    ("<dim time> <part-of-day>", -4.127134385045092),
+                                    ("dd/-mm", -3.7906621484238787),
+                                    ("dd/-mm/-yyyy", -4.350277936359301),
+                                    ("dd mm yyyy", -3.7906621484238787),
+                                    ("day of month (premier)", -3.9448128282511368),
+                                    ("dd mm", -3.7906621484238787), ("hour", -2.2102117728630306),
+                                    ("month", -4.350277936359301),
+                                    ("dernier <cycle> de <time> (latent)", -4.127134385045092),
+                                    ("<day-of-month> <named-month>", -3.028522096376982),
+                                    ("<cycle> prochain|suivant|d'apr\232s", -2.6920498597557687),
+                                    ("dernier week-end de <time>", -5.043425116919247),
+                                    ("<ordinal> week-end de <time>", -4.637960008811082),
+                                    ("<cycle> dernier", -3.9448128282511368)],
+                               n = 141},
                    koData =
-                     ClassData{prior = -1.2291087775974783,
-                               unseen = -4.9344739331306915,
+                     ClassData{prior = -1.3862943611198906, unseen = -4.812184355372417,
                                likelihoods =
                                  HashMap.fromList
                                    [("<named-month|named-day> suivant|d'apr\232s",
-                                     -2.624668592163159),
-                                    ("intersect", -3.317815772723104),
-                                    ("en semaine", -2.362304327695668), ("day", -1.461517782357478),
-                                    ("<dim time> <part-of-day>", -3.828641396489095),
-                                    ("dd/-mm", -3.5409593240373143),
+                                     -4.110873864173311),
+                                    ("intersect", -3.1945831322991562),
+                                    ("en semaine", -2.23907168727172), ("day", -1.625967214385311),
+                                    ("<dim time> <part-of-day>", -3.7054087560651467),
+                                    ("dd/-mm", -3.417726683613366),
                                     ("<named-month|named-day> dernier|pass\233",
-                                     -3.828641396489095),
-                                    ("day of month (premier)", -4.23410650459726),
-                                    ("dd mm", -3.5409593240373143), ("hour", -2.2192034840549946),
-                                    ("<day-of-month> <named-month>", -4.23410650459726),
+                                     -3.7054087560651467),
+                                    ("day of month (premier)", -4.110873864173311),
+                                    ("dd mm", -3.417726683613366), ("hour", -2.0959708436310467),
+                                    ("<day-of-month> <named-month>", -4.110873864173311),
                                     ("<time-of-day> - <time-of-day> (interval)",
-                                     -2.5293584123588344),
-                                    ("minute", -2.5293584123588344),
+                                     -2.406125771934886),
+                                    ("minute", -2.406125771934886),
                                     ("<hour-of-day> <integer> (as relative minutes)",
-                                     -2.7300291078209855)],
-                               n = 55}}),
+                                     -2.606796467397037)],
+                               n = 47}}),
        ("apr\232s le <day-of-month>",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444,
diff --git a/Duckling/Ranking/Classifiers/IT.hs b/Duckling/Ranking/Classifiers/IT.hs
index 0a5e3c2e..05e22082 100644
--- a/Duckling/Ranking/Classifiers/IT.hs
+++ b/Duckling/Ranking/Classifiers/IT.hs
@@ -77,11 +77,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.6387119740049282, unseen = -5.030437921392435,
+                     ClassData{prior = -0.5510646669461725, unseen = -5.030437921392435,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 151},
                    koData =
-                     ClassData{prior = -0.7507170323814232, unseen = -4.919980925828125,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 135}}),
+                     ClassData{prior = -0.8588143024487628, unseen = -4.727387818712341,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 111}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -239,15 +239,20 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.5649493574615367,
+                     ClassData{prior = -0.916290731874155, unseen = -1.9459101490553135,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (primo..10)trimestre (grain)", -0.6931471805599453),
                                     ("quarter", -0.6931471805599453)],
-                               n = 5},
+                               n = 2},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (primo..10)trimestre (grain)", -0.6931471805599453),
+                                    ("quarter", -0.6931471805599453)],
+                               n = 3}}),
        ("in|entro <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.0794415416798357,
@@ -342,6 +347,18 @@ classifiers
                                     ("<integer> (latent time-of-day)", -1.3217558399823195),
                                     ("hour", -0.916290731874155)],
                                n = 5}}),
+       ("the <ordinal> <cycle> <time>",
+        Classifier{okData =
+                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("quarteryear", -0.6931471805599453),
+                                    ("ordinals (primo..10)trimestre (grain)year (1000-2100 not latent)",
+                                     -0.6931471805599453)],
+                               n = 2},
+                   koData =
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
+                               likelihoods = HashMap.fromList [], n = 0}}),
        ("verso <part-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -381,16 +398,22 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("in the <part-of-day> of <dim time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -0.8472978603872037),
-                                    ("morningnamed-day", -1.252762968495368),
-                                    ("eveningtomorrow", -1.252762968495368)],
+                                   [("hourday", -0.9808292530117262),
+                                    ("morningnamed-day", -1.3862943611198906),
+                                    ("eveningtomorrow", -1.3862943611198906)],
                                n = 2},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.1972245773362196,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hourday", -0.9808292530117262),
+                                    ("nighttomorrow", -0.9808292530117262)],
+                               n = 2}}),
        ("yesterday",
         Classifier{okData =
                      ClassData{prior = -0.40546510810816444,
@@ -497,36 +520,43 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<integer> (latent time-of-day)",
         Classifier{okData =
-                     ClassData{prior = -1.057112557761357, unseen = -3.8066624897703196,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -3.8066624897703196,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)", -0.3184537311185346),
                                     ("number (0..19)", -1.3862943611198906)],
                                n = 41},
                    koData =
-                     ClassData{prior = -0.42687920261198087,
-                               unseen = -4.394449154672439,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -4.454347296253507,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.35667494393873245),
+                                   [("integer (numeric)", -0.3317773923170052),
                                     ("number (21..29 31..39 41..49 51..59 61..69 71..79 81..89 91..99)",
-                                     -3.283414346005772),
-                                    ("number (0..19)", -1.3375041969504586)],
-                               n = 77}}),
+                                     -3.3440389678222067),
+                                    ("number (0..19)", -1.3981288187668934)],
+                               n = 82}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.995732273553991,
+                     ClassData{prior = -0.4700036292457356, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7472144018302211),
+                                   [("daymonth", -0.7731898882334817),
                                     ("ordinals (primo..10)named-daynamed-month",
-                                     -1.1526795099383855),
+                                     -1.466337068793427),
                                     ("ordinals (primo..10)named-daytwo time tokens in a row",
-                                     -1.55814461804655)],
-                               n = 8},
+                                     -1.1786549963416462)],
+                               n = 5},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.9808292530117262,
+                               unseen = -2.3025850929940455,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.8109302162163288),
+                                    ("ordinals (primo..10)named-daynamed-month",
+                                     -0.8109302162163288)],
+                               n = 3}}),
        ("a quart to <integer> (as hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -559,55 +589,54 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("intersect by \"di\", \"della\", \"del\"",
         Classifier{okData =
-                     ClassData{prior = -0.38299225225610584,
-                               unseen = -4.430816798843313,
+                     ClassData{prior = -0.45198512374305727,
+                               unseen = -4.3694478524670215,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh(:|h)mm (time-of-day)named-day", -3.3202283191284883),
-                                    ("named-daynamed-month", -3.3202283191284883),
-                                    ("this <part-of-day>named-day", -3.7256934272366524),
-                                    ("hourday", -2.2216160304603787),
-                                    ("day of month (1st)named-month", -3.7256934272366524),
-                                    ("daymonth", -2.339399066116762),
-                                    ("named-daytwo time tokens in a row", -3.7256934272366524),
-                                    ("at <time-of-day>named-day", -3.3202283191284883),
+                                   [("hh(:|h)mm (time-of-day)named-day", -3.258096538021482),
+                                    ("named-daynamed-month", -3.258096538021482),
+                                    ("hourday", -2.4107986776342782),
+                                    ("day of month (1st)named-month", -3.6635616461296463),
+                                    ("daymonth", -2.277267285009756),
+                                    ("named-daytwo time tokens in a row", -3.6635616461296463),
+                                    ("at <time-of-day>named-day", -3.258096538021482),
                                     ("hh(:|h)mm (time-of-day)<day-of-month> <named-month>",
-                                     -3.7256934272366524),
+                                     -3.6635616461296463),
                                     ("two time tokens in a rowtwo time tokens in a row",
-                                     -3.7256934272366524),
+                                     -3.6635616461296463),
                                     ("dalle <time-of-day> alle <time-of-day> (interval)named-day",
-                                     -3.0325462466767075),
+                                     -2.9704144655697013),
                                     ("<integer 0 12> del <part of day>tomorrow",
-                                     -3.7256934272366524),
+                                     -3.6635616461296463),
                                     ("hh(:|h)mm (time-of-day)two time tokens in a row",
-                                     -3.3202283191284883),
+                                     -3.258096538021482),
                                     ("hh(:|h)mm (time-of-day)<named-day> <day-of-month>",
-                                     -3.3202283191284883),
-                                    ("this <part-of-day>tomorrow", -3.7256934272366524),
+                                     -3.258096538021482),
                                     ("at <time-of-day>two time tokens in a row",
-                                     -3.7256934272366524),
-                                    ("minuteday", -1.853891250335061),
+                                     -3.6635616461296463),
+                                    ("minuteday", -1.791759469228055),
                                     ("at <time-of-day><named-day> <day-of-month>",
-                                     -3.7256934272366524),
-                                    ("dayweek", -3.0325462466767075),
-                                    ("two time tokens in a rownamed-month", -3.3202283191284883),
-                                    ("<dim time> al <part-of-day>tomorrow", -3.7256934272366524),
-                                    ("named-daythis <cycle>", -3.0325462466767075),
+                                     -3.6635616461296463),
+                                    ("dayweek", -2.9704144655697013),
+                                    ("two time tokens in a rownamed-month", -3.258096538021482),
+                                    ("<dim time> al <part-of-day>tomorrow", -3.6635616461296463),
+                                    ("named-daythis <cycle>", -2.9704144655697013),
                                     ("tra il <datetime> e il <datetime> (interval)named-day",
-                                     -3.3202283191284883)],
-                               n = 30},
+                                     -3.258096538021482)],
+                               n = 28},
                    koData =
-                     ClassData{prior = -1.1451323043030026, unseen = -3.951243718581427,
+                     ClassData{prior = -1.0116009116784799, unseen = -4.007333185232471,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh(:|h)mm (time-of-day)named-day", -2.833213344056216),
-                                    ("named-daynamed-month", -2.322387720290225),
-                                    ("hourday", -2.5455312716044354),
-                                    ("daymonth", -1.8523840910444898),
-                                    ("named-daytwo time tokens in a row", -2.5455312716044354),
-                                    ("at <time-of-day>named-day", -2.1400661634962708),
-                                    ("minuteday", -2.322387720290225)],
-                               n = 14}}),
+                                   [("hh(:|h)mm (time-of-day)named-day", -2.890371757896165),
+                                    ("named-daynamed-month", -2.379546134130174),
+                                    ("hourday", -2.1972245773362196),
+                                    ("daymonth", -1.9095425048844386),
+                                    ("named-daytwo time tokens in a row", -2.6026896854443837),
+                                    ("at <time-of-day>named-day", -2.1972245773362196),
+                                    ("stanottetomorrow", -2.890371757896165),
+                                    ("minuteday", -2.379546134130174)],
+                               n = 16}}),
        ("<hour-of-day> and a quart",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -635,10 +664,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:|h)mm (time-of-day)",
         Classifier{okData =
-                     ClassData{prior = -0.10536051565782628, unseen = -4.02535169073515,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 54},
+                     ClassData{prior = -0.13353139262452263,
+                               unseen = -3.784189633918261,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 42},
                    koData =
-                     ClassData{prior = -2.3025850929940455,
+                     ClassData{prior = -2.0794415416798357,
                                unseen = -2.0794415416798357,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 6}}),
        ("EOY|End of year",
@@ -650,16 +680,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("this <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.7612001156935624,
+                     ClassData{prior = -0.4595323293784402, unseen = -3.367295829986474,
                                likelihoods =
                                  HashMap.fromList
-                                   [("afternoon", -3.044522437723423),
-                                    ("hour", -0.7419373447293773), ("evening", -1.3397743454849977),
-                                    ("morning", -1.540445040947149)],
-                               n = 19},
+                                   [("afternoon", -2.639057329615259),
+                                    ("hour", -0.7672551527136672), ("evening", -1.1349799328389845),
+                                    ("morning", -1.9459101490553135)],
+                               n = 12},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.9985288301111273,
+                               unseen = -2.9444389791664407,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hour", -0.8109302162163288), ("evening", -1.791759469228055),
+                                    ("morning", -1.0986122886681098)],
+                               n = 7}}),
        ("circa per le <time-of-day>",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -709,12 +744,12 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.0910424533583156,
+                     ClassData{prior = 0.0, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.15415067982725836),
-                                    ("number (0..19)", -1.9459101490553135)],
-                               n = 19}}),
+                                   [("integer (numeric)", -0.2231435513142097),
+                                    ("number (0..19)", -1.6094379124341003)],
+                               n = 13}}),
        ("entro le <time-of-day>",
         Classifier{okData =
                      ClassData{prior = -0.11778303565638351,
@@ -871,29 +906,32 @@ classifiers
                                    [("monthday", -1.252762968495368),
                                     ("mois (grain)christmas", -1.252762968495368)],
                                n = 1}}),
+       ("night",
+        Classifier{okData =
+                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                               likelihoods = HashMap.fromList [], n = 0},
+                   koData =
+                     ClassData{prior = 0.0, unseen = -1.791759469228055,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 4}}),
        ("tra il <datetime> e il <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.70805020110221,
+                     ClassData{prior = -0.8109302162163288, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.540445040947149),
-                                    ("at <time-of-day>at <time-of-day>", -1.0296194171811581),
-                                    ("hourhour", -1.540445040947149)],
+                                   [("minuteminute", -1.466337068793427),
+                                    ("at <time-of-day>at <time-of-day>", -0.9555114450274363),
+                                    ("hourhour", -1.466337068793427)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.5108256237659907,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.587786664902119, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.791759469228055),
-                                    ("at <time-of-day>at <time-of-day>", -1.791759469228055),
-                                    ("hourhour", -1.791759469228055),
-                                    ("minutehour", -1.791759469228055),
-                                    ("at <time-of-day>intersect by \"di\", \"della\", \"del\"",
-                                     -1.791759469228055),
-                                    ("at <time-of-day>two time tokens separated by `di`",
-                                     -1.791759469228055)],
-                               n = 6}}),
+                                   [("<integer> (latent time-of-day)<integer> (latent time-of-day)",
+                                     -1.3217558399823195),
+                                    ("at <time-of-day>at <time-of-day>", -1.6094379124341003),
+                                    ("hourhour", -1.3217558399823195),
+                                    ("minutehour", -1.6094379124341003)],
+                               n = 5}}),
        ("gli ultimi <n> <cycle>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -4.343805421853684,
@@ -938,46 +976,46 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("the <ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
+                     ClassData{prior = -1.0986122886681098,
+                               unseen = -1.6094379124341003,
                                likelihoods =
                                  HashMap.fromList
                                    [("ordinals (primo..10)trimestre (grain)", -0.6931471805599453),
                                     ("quarter", -0.6931471805599453)],
-                               n = 3},
+                               n = 1},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -1.9459101490553135,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinals (primo..10)trimestre (grain)", -0.6931471805599453),
+                                    ("quarter", -0.6931471805599453)],
+                               n = 2}}),
        ("<dim time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.1823215567939546,
-                               unseen = -3.8501476017100584,
+                     ClassData{prior = -0.5389965007326869, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("il <time>this <part-of-day>", -3.1354942159291497),
-                                    ("dayhour", -1.0560526742493137),
-                                    ("named-daythis <part-of-day>", -2.7300291078209855),
-                                    ("<day-of-month> <named-month>morning", -3.1354942159291497),
-                                    ("<day-of-month> <named-month>this <part-of-day>",
-                                     -2.7300291078209855),
-                                    ("two time tokens in a rowthis <part-of-day>",
-                                     -3.1354942159291497),
-                                    ("tomorrowevening", -3.1354942159291497),
-                                    ("named-daymorning", -2.7300291078209855),
-                                    ("tomorrowmorning", -3.1354942159291497),
-                                    ("tomorrowthis <part-of-day>", -3.1354942159291497),
-                                    ("tomorrowlunch", -3.1354942159291497),
-                                    ("il <day-of-month> <named-month>this <part-of-day>",
-                                     -3.1354942159291497),
-                                    ("yesterdayevening", -3.1354942159291497)],
-                               n = 15},
+                                   [("dayhour", -1.1786549963416462),
+                                    ("<day-of-month> <named-month>morning", -2.5649493574615367),
+                                    ("tomorrowevening", -2.5649493574615367),
+                                    ("named-daymorning", -2.159484249353372),
+                                    ("tomorrowmorning", -2.5649493574615367),
+                                    ("tomorrowlunch", -2.5649493574615367),
+                                    ("yesterdayevening", -2.5649493574615367)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -1.791759469228055, unseen = -3.1354942159291497,
+                     ClassData{prior = -0.8754687373538999,
+                               unseen = -3.1354942159291497,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthhour", -1.7047480922384253),
+                                   [("dayhour", -1.9924301646902063),
+                                    ("tomorrownight", -2.3978952727983707),
+                                    ("monthhour", -1.7047480922384253),
                                     ("named-monththis <part-of-day>", -1.9924301646902063),
+                                    ("tomorrowstanotte", -2.3978952727983707),
                                     ("named-monthmorning", -2.3978952727983707)],
-                               n = 3}}),
+                               n = 5}}),
        ("<hour-of-day> and <relative minutes>",
         Classifier{okData =
                      ClassData{prior = -1.0116009116784799, unseen = -2.639057329615259,
@@ -1077,34 +1115,34 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<dim time> al <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.3101549283038396,
-                               unseen = -3.6109179126442243,
+                     ClassData{prior = -0.3746934494414107,
+                               unseen = -3.6375861597263857,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.3862943611198906),
-                                    ("<integer> (latent time-of-day)afternoon", -2.890371757896165),
-                                    ("hh(:|h)mm (time-of-day)afternoon", -2.890371757896165),
-                                    ("<day-of-month> <named-month>morning", -2.4849066497880004),
-                                    ("il <day-of-month> <named-month>morning", -2.890371757896165),
-                                    ("hourhour", -2.890371757896165),
-                                    ("two time tokens in a rowmorning", -2.890371757896165),
-                                    ("minutehour", -2.4849066497880004),
-                                    ("tomorrowevening", -2.890371757896165),
-                                    ("named-daymorning", -2.4849066497880004),
-                                    ("il <time>morning", -2.890371757896165),
-                                    ("hh(:|h)mm (time-of-day)morning", -2.890371757896165)],
+                                   [("dayhour", -1.413693335308005),
+                                    ("<integer> (latent time-of-day)afternoon", -2.917770732084279),
+                                    ("hh(:|h)mm (time-of-day)afternoon", -2.917770732084279),
+                                    ("<day-of-month> <named-month>morning", -2.512305623976115),
+                                    ("il <day-of-month> <named-month>morning", -2.917770732084279),
+                                    ("hourhour", -2.917770732084279),
+                                    ("two time tokens in a rowmorning", -2.917770732084279),
+                                    ("minutehour", -2.512305623976115),
+                                    ("tomorrowevening", -2.917770732084279),
+                                    ("named-daymorning", -2.512305623976115),
+                                    ("il <time>morning", -2.917770732084279),
+                                    ("hh(:|h)mm (time-of-day)morning", -2.917770732084279)],
                                n = 11},
                    koData =
-                     ClassData{prior = -1.3217558399823195,
-                               unseen = -3.1354942159291497,
+                     ClassData{prior = -1.1631508098056809, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<integer> (latent time-of-day)afternoon",
-                                     -1.9924301646902063),
-                                    ("monthhour", -1.9924301646902063),
-                                    ("hourhour", -1.9924301646902063),
-                                    ("named-monthmorning", -1.9924301646902063)],
-                               n = 4}}),
+                                   [("dayhour", -2.5257286443082556),
+                                    ("<integer> (latent time-of-day)afternoon", -2.120263536200091),
+                                    ("tomorrownight", -2.5257286443082556),
+                                    ("monthhour", -2.120263536200091),
+                                    ("hourhour", -2.120263536200091),
+                                    ("named-monthmorning", -2.120263536200091)],
+                               n = 5}}),
        ("named-day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -4.290459441148391,
@@ -1188,38 +1226,36 @@ classifiers
                                n = 4}}),
        ("il <time>",
         Classifier{okData =
-                     ClassData{prior = -0.11778303565638351,
-                               unseen = -4.204692619390966,
+                     ClassData{prior = -0.1823215567939546, unseen = -4.060443010546419,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dd[/-]mm", -3.4965075614664802),
-                                    ("<ordinal> quarter", -3.0910424533583156),
-                                    ("<cycle> next", -3.4965075614664802),
-                                    ("<ordinal> <cycle> of <time>", -3.4965075614664802),
-                                    ("<ordinal> quarter <year>", -3.4965075614664802),
-                                    ("day", -1.4816045409242156), ("quarter", -2.580216829592325),
-                                    ("<dim time> <part-of-day>", -3.4965075614664802),
-                                    ("<dim time> al <part-of-day>", -3.4965075614664802),
-                                    ("named-day", -3.4965075614664802),
-                                    ("day of month (1st)", -3.4965075614664802),
-                                    ("two time tokens in a row", -2.3978952727983707),
-                                    ("hour", -2.580216829592325), ("month", -3.4965075614664802),
-                                    ("next <time>", -3.0910424533583156),
-                                    ("<day-of-month> <named-month>", -2.243744592971112),
-                                    ("minute", -3.4965075614664802),
-                                    ("week-end", -3.4965075614664802)],
-                               n = 24},
+                                   [("dd[/-]mm", -3.349904087274605),
+                                    ("<ordinal> quarter", -3.349904087274605),
+                                    ("<cycle> next", -3.349904087274605),
+                                    ("<ordinal> <cycle> of <time>", -3.349904087274605),
+                                    ("<ordinal> quarter <year>", -3.349904087274605),
+                                    ("day", -1.3350010667323402), ("quarter", -2.9444389791664407),
+                                    ("<dim time> al <part-of-day>", -3.349904087274605),
+                                    ("named-day", -3.349904087274605),
+                                    ("day of month (1st)", -3.349904087274605),
+                                    ("two time tokens in a row", -2.6567569067146595),
+                                    ("hour", -2.9444389791664407), ("month", -3.349904087274605),
+                                    ("next <time>", -2.9444389791664407),
+                                    ("<day-of-month> <named-month>", -2.097141118779237),
+                                    ("minute", -3.349904087274605),
+                                    ("week-end", -3.349904087274605)],
+                               n = 20},
                    koData =
-                     ClassData{prior = -2.1972245773362196,
-                               unseen = -3.2188758248682006,
+                     ClassData{prior = -1.791759469228055, unseen = -3.258096538021482,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day", -2.4849066497880004),
-                                    ("two time tokens in a row", -2.4849066497880004),
-                                    ("hour", -2.0794415416798357),
-                                    ("<day-of-month> <named-month>", -2.4849066497880004),
-                                    ("week-end", -2.4849066497880004)],
-                               n = 3}}),
+                                   [("<ordinal> quarter", -2.5257286443082556),
+                                    ("day", -2.5257286443082556), ("quarter", -2.5257286443082556),
+                                    ("two time tokens in a row", -2.5257286443082556),
+                                    ("hour", -2.120263536200091),
+                                    ("<day-of-month> <named-month>", -2.5257286443082556),
+                                    ("week-end", -2.5257286443082556)],
+                               n = 4}}),
        ("entro <time>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836,
@@ -1315,191 +1351,180 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("two time tokens in a row",
         Classifier{okData =
-                     ClassData{prior = -0.34542306714129756,
-                               unseen = -5.950642552587727,
+                     ClassData{prior = -0.4001600558784712, unseen = -5.83773044716594,
                                likelihoods =
                                  HashMap.fromList
-                                   [("il <time>named-month", -5.2548878086207),
-                                    ("hh(:|h)mm (time-of-day)named-day", -5.2548878086207),
-                                    ("il <time>this <part-of-day>", -5.2548878086207),
+                                   [("il <time>named-month", -5.14166355650266),
+                                    ("hh(:|h)mm (time-of-day)named-day", -5.14166355650266),
                                     ("intersect by \"di\", \"della\", \"del\"year (1000-2100 not latent)",
-                                     -4.8494227005125365),
-                                    ("named-monthyear (1000-2100 not latent)", -3.5501397163822754),
-                                    ("day of month (1st)named-month", -4.561740628060756),
-                                    ("dayhour", -2.8125407732514964),
-                                    ("daymonth", -2.4822990863809196),
-                                    ("named-daythis <part-of-day>", -4.8494227005125365),
+                                     -4.736198448394496),
+                                    ("named-monthyear (1000-2100 not latent)", -3.4369154642642346),
+                                    ("day of month (1st)named-month", -4.448516375942715),
+                                    ("dayhour", -3.126760535960395),
+                                    ("daymonth", -2.3690748342628787),
                                     ("day of month (1st)intersect by \"di\", \"della\", \"del\"",
-                                     -4.8494227005125365),
-                                    ("monthyear", -3.5501397163822754),
+                                     -4.736198448394496),
+                                    ("monthyear", -3.4369154642642346),
                                     ("day of month (1st)two time tokens in a row",
-                                     -4.561740628060756),
-                                    ("named-dayentro <time>", -5.2548878086207),
-                                    ("<ordinal> quarteryear (1000-2100 not latent)",
-                                     -4.561740628060756),
+                                     -4.448516375942715),
+                                    ("named-dayentro <time>", -5.14166355650266),
                                     ("<ordinal> <cycle> of <time>year (1000-2100 not latent)",
-                                     -5.2548878086207),
-                                    ("christmasyear (1000-2100 not latent)", -4.8494227005125365),
+                                     -5.14166355650266),
+                                    ("christmasyear (1000-2100 not latent)", -4.736198448394496),
                                     ("tra il <integer> e il <integer> (interval)named-month",
-                                     -4.8494227005125365),
-                                    ("tomorrowdopo <time>", -5.2548878086207),
-                                    ("at <time-of-day>named-day", -5.2548878086207),
-                                    ("<day-of-month> <named-month>this <part-of-day>",
-                                     -4.8494227005125365),
+                                     -4.736198448394496),
+                                    ("tomorrowdopo <time>", -5.14166355650266),
+                                    ("at <time-of-day>named-day", -5.14166355650266),
                                     ("intersect by \"di\", \"della\", \"del\"<day-of-month> <named-month>",
-                                     -4.561740628060756),
-                                    ("entro il <integer>named-month", -5.2548878086207),
-                                    ("day of month (1st)named-day", -4.156275519952591),
-                                    ("dayday", -3.11482164512443),
+                                     -4.448516375942715),
+                                    ("entro il <integer>named-month", -5.14166355650266),
+                                    ("day of month (1st)named-day", -4.04305126783455),
+                                    ("dayday", -3.001597393006389),
                                     ("named-daydalle <time-of-day> alle <time-of-day> (interval)",
-                                     -4.8494227005125365),
-                                    ("il <time>year (1000-2100 not latent)", -4.8494227005125365),
+                                     -4.736198448394496),
+                                    ("il <time>year (1000-2100 not latent)", -5.14166355650266),
                                     ("intersect by \"di\", \"della\", \"del\"named-month",
-                                     -4.561740628060756),
-                                    ("dayyear", -2.9523027156266552),
+                                     -4.448516375942715),
+                                    ("dayyear", -3.001597393006389),
                                     ("tomorrowdalle <time-of-day> alle <time-of-day> (interval)",
-                                     -5.2548878086207),
+                                     -5.14166355650266),
                                     ("hh(:|h)mm (time-of-day)two time tokens in a row",
-                                     -5.2548878086207),
-                                    ("dd[/-]mmat <time-of-day>", -5.2548878086207),
-                                    ("two time tokens in a rowthis <part-of-day>",
-                                     -5.2548878086207),
-                                    ("quarteryear", -4.002124840125332),
-                                    ("tomorrowdopo le <time-of-day>", -4.8494227005125365),
-                                    ("minutemonth", -3.7508104118444265),
-                                    ("named-day<time> timezone", -5.2548878086207),
+                                     -5.14166355650266),
+                                    ("dd[/-]mmat <time-of-day>", -5.14166355650266),
+                                    ("tomorrowdopo le <time-of-day>", -4.736198448394496),
+                                    ("minutemonth", -3.6375861597263857),
+                                    ("named-day<time> timezone", -5.14166355650266),
                                     ("hh(:|h)mm (time-of-day)<named-day> <day-of-month>",
-                                     -5.2548878086207),
+                                     -5.14166355650266),
                                     ("il <day-of-month> <named-month>at <time-of-day>",
-                                     -5.2548878086207),
-                                    ("nth <time> of <time>year (1000-2100 not latent)",
-                                     -4.561740628060756),
-                                    ("named-dayin <named-month>", -4.561740628060756),
-                                    ("named-day<day-of-month> <named-month>", -4.338597076746546),
+                                     -5.14166355650266),
+                                    ("named-dayin <named-month>", -4.448516375942715),
+                                    ("named-day<day-of-month> <named-month>", -4.225372824628505),
                                     ("<day-of-month> <named-month>at <time-of-day>",
-                                     -4.561740628060756),
+                                     -4.448516375942715),
                                     ("il <day-of-month> <named-month>year (1000-2100 not latent)",
-                                     -5.2548878086207),
+                                     -5.14166355650266),
                                     ("two time tokens separated by `di`year (1000-2100 not latent)",
-                                     -4.8494227005125365),
+                                     -4.736198448394496),
                                     ("last <cycle> of <time>year (1000-2100 not latent)",
-                                     -4.561740628060756),
+                                     -4.448516375942715),
                                     ("day of month (1st)two time tokens separated by `di`",
-                                     -4.8494227005125365),
+                                     -4.736198448394496),
                                     ("dal <integer> al <integer> (interval)named-month",
-                                     -4.8494227005125365),
-                                    ("il <day-of-month>named-month", -4.002124840125332),
-                                    ("the day after tomorrowat <time-of-day>", -4.8494227005125365),
+                                     -4.736198448394496),
+                                    ("il <day-of-month>named-month", -3.8889005880072918),
+                                    ("the day after tomorrowat <time-of-day>", -4.736198448394496),
                                     ("two time tokens in a rowyear (1000-2100 not latent)",
-                                     -4.561740628060756),
-                                    ("tomorrowthis <part-of-day>", -5.2548878086207),
-                                    ("il <day-of-month>two time tokens in a row", -5.2548878086207),
-                                    ("at <time-of-day>two time tokens in a row", -5.2548878086207),
-                                    ("dayminute", -3.239984788078436),
+                                     -4.448516375942715),
+                                    ("il <day-of-month>two time tokens in a row",
+                                     -5.14166355650266),
+                                    ("at <time-of-day>two time tokens in a row", -5.14166355650266),
+                                    ("dayminute", -3.126760535960395),
                                     ("two time tokens in a rowat <time-of-day>",
-                                     -4.561740628060756),
-                                    ("minuteday", -3.175446266940865),
+                                     -4.448516375942715),
+                                    ("minuteday", -3.062222014822824),
                                     ("two time tokens separated by `di`<day-of-month> <named-month>",
-                                     -4.561740628060756),
-                                    ("il <time>at <time-of-day>", -5.2548878086207),
-                                    ("named-dayat <time-of-day>", -4.8494227005125365),
+                                     -4.448516375942715),
+                                    ("il <time>at <time-of-day>", -5.14166355650266),
+                                    ("named-dayat <time-of-day>", -4.736198448394496),
                                     ("last <day-of-week> of <time>year (1000-2100 not latent)",
-                                     -5.2548878086207),
-                                    ("immacolata concezioneat <time-of-day>", -5.2548878086207),
+                                     -5.14166355650266),
+                                    ("immacolata concezioneat <time-of-day>", -5.14166355650266),
                                     ("at <time-of-day><named-day> <day-of-month>",
-                                     -5.2548878086207),
-                                    ("il <day-of-month> <named-month>this <part-of-day>",
-                                     -5.2548878086207),
+                                     -5.14166355650266),
                                     ("two time tokens separated by `di`named-month",
-                                     -4.561740628060756),
-                                    ("weekyear", -4.8494227005125365),
-                                    ("named-dayentro le <time-of-day>", -5.2548878086207),
-                                    ("two time tokens in a rownamed-month", -4.8494227005125365),
-                                    ("tomorrowat <time-of-day>", -5.2548878086207),
-                                    ("the <ordinal> quarteryear (1000-2100 not latent)",
-                                     -4.8494227005125365),
+                                     -4.448516375942715),
+                                    ("weekyear", -4.736198448394496),
+                                    ("named-dayentro le <time-of-day>", -5.14166355650266),
+                                    ("two time tokens in a rownamed-month", -4.736198448394496),
+                                    ("tomorrowat <time-of-day>", -5.14166355650266),
                                     ("two time tokens in a row<day-of-month> <named-month>",
-                                     -4.8494227005125365),
+                                     -4.736198448394496),
                                     ("named-daytra il <datetime> e il <datetime> (interval)",
-                                     -4.8494227005125365),
+                                     -4.736198448394496),
                                     ("two time tokens in a rowin <named-month>",
-                                     -4.561740628060756),
-                                    ("<named-day> <day-of-month>named-month", -3.6454498961866),
+                                     -4.448516375942715),
+                                    ("<named-day> <day-of-month>named-month", -3.5322256440685593),
                                     ("the day after tomorrowentro le <time-of-day>",
-                                     -5.2548878086207),
+                                     -5.14166355650266),
                                     ("<day-of-month> <named-month>year (1000-2100 not latent)",
-                                     -4.8494227005125365),
+                                     -4.736198448394496),
                                     ("commemorazione dei defuntiat <time-of-day>",
-                                     -5.2548878086207),
+                                     -5.14166355650266),
                                     ("<datetime> - <datetime> (interval)named-day",
-                                     -5.2548878086207)],
-                               n = 143},
+                                     -5.14166355650266)],
+                               n = 126},
                    koData =
-                     ClassData{prior = -1.2307302534954854, unseen = -5.375278407684165,
+                     ClassData{prior = -1.1093075777848578,
+                               unseen = -5.3706380281276624,
                                likelihoods =
                                  HashMap.fromList
                                    [("at <time-of-day>prossimi <unit-of-duration>",
-                                     -4.272025739459553),
-                                    ("hh(:|h)mm (time-of-day)named-day", -4.677490847567718),
+                                     -4.267363726353742),
+                                    ("hh(:|h)mm (time-of-day)named-day", -4.672828834461907),
                                     ("intersect by \"di\", \"della\", \"del\"year (1000-2100 not latent)",
-                                     -3.984343667007772),
-                                    ("named-monthyear (1000-2100 not latent)", -4.677490847567718),
-                                    ("dayhour", -2.374905754573672),
-                                    ("daymonth", -4.677490847567718),
-                                    ("monthday", -4.272025739459553),
-                                    ("monthyear", -4.677490847567718),
+                                     -3.979681653901961),
+                                    ("named-monthyear (1000-2100 not latent)", -4.672828834461907),
+                                    ("dayhour", -2.3214535772984286),
+                                    ("daymonth", -4.672828834461907),
+                                    ("monthday", -4.267363726353742),
+                                    ("monthyear", -4.672828834461907),
+                                    ("tra il <datetime> e il <datetime> (interval)named-month",
+                                     -4.267363726353742),
                                     ("<named-day> <day-of-month>two time tokens in a row",
-                                     -4.272025739459553),
-                                    ("named-month<day-of-month> <named-month>", -4.272025739459553),
-                                    ("monthhour", -3.578878558899608),
-                                    ("dayday", -4.677490847567718),
+                                     -4.267363726353742),
+                                    ("named-month<day-of-month> <named-month>", -4.267363726353742),
+                                    ("monthhour", -3.5742165457937967),
+                                    ("hourmonth", -4.267363726353742),
+                                    ("dayday", -4.672828834461907),
                                     ("named-daydalle <time-of-day> alle <time-of-day> (interval)",
-                                     -4.677490847567718),
-                                    ("named-monththis <part-of-day>", -4.272025739459553),
-                                    ("dayyear", -3.1734134507914433),
+                                     -4.672828834461907),
+                                    ("named-monththis <part-of-day>", -4.267363726353742),
+                                    ("dayyear", -3.168751437685632),
                                     ("tomorrowdalle <time-of-day> alle <time-of-day> (interval)",
-                                     -4.677490847567718),
+                                     -4.672828834461907),
+                                    ("tomorrowstanotte", -4.672828834461907),
                                     ("year (1000-2100 not latent)<hour-of-day> <integer> (as relative minutes)",
-                                     -4.272025739459553),
-                                    ("the <cycle> of <time>named-month", -4.272025739459553),
-                                    ("dd[/-]mmat <time-of-day>", -4.677490847567718),
-                                    ("tomorrowdopo le <time-of-day>", -4.272025739459553),
-                                    ("monthminute", -3.7612001156935624),
-                                    ("minutemonth", -4.272025739459553),
-                                    ("named-daydopo <time>", -4.677490847567718),
+                                     -4.267363726353742),
+                                    ("the <cycle> of <time>named-month", -4.267363726353742),
+                                    ("dd[/-]mmat <time-of-day>", -4.672828834461907),
+                                    ("tomorrowdopo le <time-of-day>", -4.267363726353742),
+                                    ("monthminute", -3.756538102587751),
+                                    ("minutemonth", -4.267363726353742),
+                                    ("named-daydopo <time>", -4.672828834461907),
                                     ("il <day-of-month> <named-month>at <time-of-day>",
-                                     -4.677490847567718),
-                                    ("dopo <time>at <time-of-day>", -4.677490847567718),
+                                     -4.672828834461907),
+                                    ("dopo <time>at <time-of-day>", -4.672828834461907),
                                     ("<day-of-month> <named-month>at <time-of-day>",
-                                     -3.7612001156935624),
-                                    ("weekmonth", -4.272025739459553),
+                                     -3.756538102587751),
+                                    ("weekmonth", -4.267363726353742),
                                     ("two time tokens separated by `di`year (1000-2100 not latent)",
-                                     -3.984343667007772),
-                                    ("hourweek", -4.272025739459553),
-                                    ("il <day-of-month>named-month", -4.677490847567718),
-                                    ("the day after tomorrowat <time-of-day>", -4.677490847567718),
+                                     -3.979681653901961),
+                                    ("hourweek", -4.267363726353742),
+                                    ("il <day-of-month>named-month", -4.672828834461907),
+                                    ("the day after tomorrowat <time-of-day>", -4.672828834461907),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.677490847567718),
+                                     -4.672828834461907),
                                     ("il <day-of-month>two time tokens in a row",
-                                     -4.677490847567718),
-                                    ("dayminute", -3.1734134507914433),
+                                     -4.672828834461907),
+                                    ("dayminute", -3.168751437685632),
                                     ("two time tokens in a rowat <time-of-day>",
-                                     -3.7612001156935624),
-                                    ("minuteday", -4.272025739459553),
-                                    ("il <time>at <time-of-day>", -4.677490847567718),
-                                    ("named-daydopo le <time-of-day>", -3.984343667007772),
-                                    ("named-dayat <time-of-day>", -4.272025739459553),
+                                     -3.756538102587751),
+                                    ("minuteday", -4.267363726353742),
+                                    ("il <time>at <time-of-day>", -4.672828834461907),
+                                    ("named-daydopo le <time-of-day>", -3.979681653901961),
+                                    ("named-dayat <time-of-day>", -4.267363726353742),
                                     ("<hour-of-day> <integer> (as relative minutes)named-day",
-                                     -4.677490847567718),
-                                    ("tomorrowat <time-of-day>", -4.677490847567718),
+                                     -4.672828834461907),
+                                    ("tomorrowat <time-of-day>", -4.672828834461907),
                                     ("named-daytra il <datetime> e il <datetime> (interval)",
-                                     -4.677490847567718),
-                                    ("dopo <time>year (1000-2100 not latent)", -4.272025739459553),
+                                     -4.672828834461907),
+                                    ("dopo <time>year (1000-2100 not latent)", -4.267363726353742),
                                     ("<hour-of-day> and <relative minutes>named-month",
-                                     -4.677490847567718),
-                                    ("named-monthat <time-of-day>", -3.2911964864478267),
-                                    ("yearminute", -4.272025739459553)],
-                               n = 59}}),
+                                     -4.672828834461907),
+                                    ("named-monthat <time-of-day>", -3.2865344733420154),
+                                    ("yearminute", -4.267363726353742)],
+                               n = 62}}),
        ("heure (grain)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.0910424533583156,
@@ -1715,19 +1740,18 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<datetime> - <datetime> (interval)",
         Classifier{okData =
-                     ClassData{prior = -0.3746934494414107,
-                               unseen = -3.4657359027997265,
+                     ClassData{prior = -0.6931471805599453, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("minuteminute", -1.1314021114911006),
+                                   [("minuteminute", -1.55814461804655),
                                     ("<day-of-month> <named-month><day-of-month> <named-month>",
-                                     -2.3353749158170367),
+                                     -1.845826690498331),
                                     ("hh(:|h)mm (time-of-day)hh(:|h)mm (time-of-day)",
-                                     -1.1314021114911006),
-                                    ("dayday", -2.3353749158170367)],
-                               n = 11},
+                                     -1.55814461804655),
+                                    ("dayday", -1.845826690498331)],
+                               n = 5},
                    koData =
-                     ClassData{prior = -1.1631508098056809, unseen = -2.995732273553991,
+                     ClassData{prior = -0.6931471805599453, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
                                    [("monthday", -1.845826690498331),
@@ -1804,24 +1828,23 @@ classifiers
                                n = 1}}),
        ("<part-of-day> of <dim time>",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809, unseen = -2.995732273553991,
+                     ClassData{prior = -0.916290731874155, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("this <part-of-day>named-day", -2.2512917986064953),
-                                    ("hourday", -0.9985288301111273),
-                                    ("morningnamed-day", -2.2512917986064953),
-                                    ("this <part-of-day>tomorrow", -2.2512917986064953),
-                                    ("morning<day-of-month> <named-month>", -1.845826690498331),
-                                    ("eveningtomorrow", -2.2512917986064953)],
-                               n = 6},
+                                   [("hourday", -1.0986122886681098),
+                                    ("morningnamed-day", -2.0149030205422647),
+                                    ("morning<day-of-month> <named-month>", -1.6094379124341003),
+                                    ("eveningtomorrow", -2.0149030205422647)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -2.4849066497880004,
+                     ClassData{prior = -0.5108256237659907, unseen = -2.995732273553991,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hourday", -1.2992829841302609),
-                                    ("afternoontomorrow", -1.2992829841302609)],
-                               n = 2}}),
+                                   [("hourday", -0.9985288301111273),
+                                    ("stanottetomorrow", -1.845826690498331),
+                                    ("nighttomorrow", -1.845826690498331),
+                                    ("afternoontomorrow", -1.845826690498331)],
+                               n = 6}}),
        ("<dim time> del mattino",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1860,53 +1883,52 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("two time tokens separated by `di`",
         Classifier{okData =
-                     ClassData{prior = -0.3939042857070884, unseen = -4.394449154672439,
+                     ClassData{prior = -0.4653632496892333, unseen = -4.330733340286331,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh(:|h)mm (time-of-day)named-day", -3.283414346005772),
-                                    ("named-daynamed-month", -3.283414346005772),
-                                    ("this <part-of-day>named-day", -3.6888794541139363),
-                                    ("hourday", -2.184802057337662),
-                                    ("day of month (1st)named-month", -3.6888794541139363),
-                                    ("daymonth", -2.3025850929940455),
-                                    ("named-daytwo time tokens in a row", -3.6888794541139363),
-                                    ("at <time-of-day>named-day", -3.283414346005772),
+                                   [("hh(:|h)mm (time-of-day)named-day", -3.2188758248682006),
+                                    ("named-daynamed-month", -3.2188758248682006),
+                                    ("hourday", -2.371577964480997),
+                                    ("day of month (1st)named-month", -3.624340932976365),
+                                    ("daymonth", -2.2380465718564744),
+                                    ("named-daytwo time tokens in a row", -3.624340932976365),
+                                    ("at <time-of-day>named-day", -3.2188758248682006),
                                     ("two time tokens in a rowtwo time tokens in a row",
-                                     -3.6888794541139363),
+                                     -3.624340932976365),
                                     ("dalle <time-of-day> alle <time-of-day> (interval)named-day",
-                                     -2.995732273553991),
+                                     -2.9311937524164198),
                                     ("<integer 0 12> del <part of day>tomorrow",
-                                     -3.6888794541139363),
+                                     -3.624340932976365),
                                     ("hh(:|h)mm (time-of-day)two time tokens in a row",
-                                     -3.283414346005772),
+                                     -3.2188758248682006),
                                     ("hh(:|h)mm (time-of-day)<named-day> <day-of-month>",
-                                     -3.283414346005772),
-                                    ("this <part-of-day>tomorrow", -3.6888794541139363),
+                                     -3.2188758248682006),
                                     ("at <time-of-day>two time tokens in a row",
-                                     -3.6888794541139363),
-                                    ("minuteday", -1.8971199848858813),
+                                     -3.624340932976365),
+                                    ("minuteday", -1.8325814637483102),
                                     ("at <time-of-day><named-day> <day-of-month>",
-                                     -3.6888794541139363),
-                                    ("dayweek", -2.995732273553991),
-                                    ("two time tokens in a rownamed-month", -3.283414346005772),
-                                    ("<dim time> al <part-of-day>tomorrow", -3.6888794541139363),
-                                    ("named-daythis <cycle>", -2.995732273553991),
+                                     -3.624340932976365),
+                                    ("dayweek", -2.9311937524164198),
+                                    ("two time tokens in a rownamed-month", -3.2188758248682006),
+                                    ("<dim time> al <part-of-day>tomorrow", -3.624340932976365),
+                                    ("named-daythis <cycle>", -2.9311937524164198),
                                     ("tra il <datetime> e il <datetime> (interval)named-day",
-                                     -3.283414346005772)],
-                               n = 29},
+                                     -3.2188758248682006)],
+                               n = 27},
                    koData =
-                     ClassData{prior = -1.1221427860783038,
-                               unseen = -3.9318256327243257,
+                     ClassData{prior = -0.9886113934537812,
+                               unseen = -3.9889840465642745,
                                likelihoods =
                                  HashMap.fromList
-                                   [("hh(:|h)mm (time-of-day)named-day", -2.8134107167600364),
-                                    ("named-daynamed-month", -2.3025850929940455),
-                                    ("hourday", -2.5257286443082556),
-                                    ("daymonth", -1.8325814637483102),
-                                    ("named-daytwo time tokens in a row", -2.5257286443082556),
-                                    ("at <time-of-day>named-day", -2.120263536200091),
-                                    ("minuteday", -2.3025850929940455)],
-                               n = 14}}),
+                                   [("hh(:|h)mm (time-of-day)named-day", -2.871679624884012),
+                                    ("named-daynamed-month", -2.3608540011180215),
+                                    ("hourday", -2.178532444324067),
+                                    ("daymonth", -1.890850371872286),
+                                    ("named-daytwo time tokens in a row", -2.583997552432231),
+                                    ("at <time-of-day>named-day", -2.178532444324067),
+                                    ("stanottetomorrow", -2.871679624884012),
+                                    ("minuteday", -2.3608540011180215)],
+                               n = 16}}),
        ("il <day-of-month> <named-month>",
         Classifier{okData =
                      ClassData{prior = -0.15415067982725836, unseen = -2.70805020110221,
diff --git a/Duckling/Ranking/Classifiers/KO.hs b/Duckling/Ranking/Classifiers/KO.hs
index 8bec3afe..2aaf9698 100644
--- a/Duckling/Ranking/Classifiers/KO.hs
+++ b/Duckling/Ranking/Classifiers/KO.hs
@@ -114,18 +114,23 @@ classifiers
                                n = 24}}),
        ("<time> nth <time> - 3\50900 \52395\51704 \54868\50836\51068",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.4011973816621555,
+                     ClassData{prior = -0.6190392084062235, unseen = -2.890371757896165,
                                likelihoods =
                                  HashMap.fromList
-                                   [("monthday", -0.7282385003712154),
+                                   [("monthday", -0.7537718023763802),
                                     ("intersectordinals (\52395\48264\51704)day-of-week",
-                                     -1.4213856809311607),
+                                     -0.8873031950009028),
                                     ("monthordinals (\52395\48264\51704)day-of-week",
-                                     -1.2878542883066382)],
-                               n = 13},
+                                     -2.1400661634962708)],
+                               n = 7},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.7731898882334817, unseen = -2.772588722239781,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("monthday", -0.7621400520468967),
+                                    ("monthordinals (\52395\48264\51704)day-of-week",
+                                     -0.7621400520468967)],
+                               n = 6}}),
        ("the day before yesterday - \50634\44536\51228",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.791759469228055,
@@ -203,143 +208,137 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 32}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.4453978184435353,
-                               unseen = -6.0063531596017325,
+                     ClassData{prior = -0.45983651189029134,
+                               unseen = -5.958424693029782,
                                likelihoods =
                                  HashMap.fromList
                                    [("intersect<hour-of-day> <integer> (as relative minutes)",
-                                     -5.310739886546594),
-                                    ("intersectday-of-week", -4.212127597878484),
-                                    ("year<time> \47560\51648\47561 <cycle>", -4.90527477843843),
-                                    ("next <cycle>day-of-week", -4.394449154672439),
-                                    ("year<1..4> quarter", -5.310739886546594),
-                                    ("dayhour", -2.0720614343822135),
-                                    ("monthday", -2.4775265424903776),
-                                    ("yearhour", -3.6059917943081685),
-                                    ("<time> <part-of-day>time-of-day", -4.394449154672439),
-                                    ("intersectam|pm <time-of-day>", -3.1135153092103742),
-                                    ("next <cycle><time-of-day> am|pm", -5.310739886546594),
-                                    ("next <cycle>am|pm <time-of-day>", -4.90527477843843),
-                                    ("yearintersect", -3.0081547935525483),
+                                     -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.394449154672439),
+                                     -4.3463994570307305),
                                     ("day-of-week<time-of-day> - <time-of-day> (interval)",
-                                     -4.394449154672439),
+                                     -4.3463994570307305),
                                     ("monthday with korean number - \51068\51068..\44396\51068",
-                                     -5.310739886546594),
-                                    ("dayday-of-week", -4.394449154672439),
-                                    ("this <cycle>day-of-week", -4.90527477843843),
-                                    ("day-of-week<time> timezone", -5.310739886546594),
-                                    ("monthhour", -3.6059917943081685),
-                                    ("mm/ddam|pm <time-of-day>", -4.617592705986649),
-                                    ("todayam|pm <time-of-day>", -4.617592705986649),
+                                     -5.262690188904886),
+                                    ("dayday-of-week", -4.3463994570307305),
+                                    ("this <cycle>day-of-week", -4.857225080796721),
+                                    ("day-of-week<time> timezone", -5.262690188904886),
+                                    ("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.394449154672439),
-                                    ("dayday", -3.7013019741124937),
-                                    ("year<time> nth <time> - 3\50900 \52395\51704 \54868\50836\51068",
-                                     -4.057976918051226),
-                                    ("hourhour", -3.8066624897703196),
-                                    ("year<time> <ordinal> <cycle>", -5.310739886546594),
-                                    ("month<datetime> - <datetime> (interval)", -4.90527477843843),
-                                    ("dayam|pm <time-of-day>", -5.310739886546594),
-                                    ("day-of-weekam|pm <time-of-day>", -4.617592705986649),
-                                    ("time-of-dayafter <time-of-day>", -5.310739886546594),
-                                    ("monthminute", -4.90527477843843),
-                                    ("hourminute", -4.617592705986649),
-                                    ("intersectday", -4.212127597878484),
-                                    ("am|pm <time-of-day>after <time-of-day>", -5.310739886546594),
-                                    ("last <cycle>day-of-week", -4.617592705986649),
-                                    ("month<time> <part-of-day>", -4.90527477843843),
-                                    ("yearmonth", -3.170673723050323),
-                                    ("dayminute", -3.7013019741124937),
-                                    ("today<date>\50640", -5.310739886546594),
-                                    ("mm/dd<date>\50640", -5.310739886546594),
+                                     -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.653252276470785),
+                                    ("today<date>\50640", -5.262690188904886),
+                                    ("mm/dd<date>\50640", -5.262690188904886),
                                     ("<hour-of-day> <integer> (as relative minutes)seconds",
-                                     -5.310739886546594),
-                                    ("<time> <part-of-day><date>\50640", -4.90527477843843),
-                                    ("monthintersect", -3.7013019741124937),
+                                     -5.262690188904886),
+                                    ("<time> <part-of-day><date>\50640", -4.857225080796721),
+                                    ("monthintersect", -3.653252276470785),
                                     ("year<time> \47560\51648\47561 <day-of-week>",
-                                     -5.310739886546594),
-                                    ("intersectintersect", -3.518980417318539),
-                                    ("weekday", -3.7013019741124937),
+                                     -5.262690188904886),
+                                    ("intersectintersect", -3.4709307196768306),
+                                    ("weekday", -3.653252276470785),
                                     ("intersectday with korean number - \51068\51068..\44396\51068",
-                                     -4.90527477843843),
-                                    ("yearday", -3.1135153092103742),
-                                    ("day-of-weekhh:mm", -4.90527477843843),
-                                    ("yearquarter", -5.310739886546594),
-                                    ("yearweek", -4.90527477843843),
-                                    ("minutesecond", -5.310739886546594),
+                                     -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.90527477843843),
-                                    ("tomorrow<time-of-day> am|pm", -5.310739886546594),
-                                    ("tomorrowam|pm <time-of-day>", -4.90527477843843),
-                                    ("dayintersect", -4.90527477843843),
-                                    ("day-of-weektime-of-day", -5.310739886546594)],
-                               n = 180},
+                                     -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 = 173},
                    koData =
-                     ClassData{prior = -1.0232341524924864, unseen = -5.634789603169249,
+                     ClassData{prior = -0.9980075895468108, unseen = -5.616771097666572,
                                likelihoods =
                                  HashMap.fromList
-                                   [("year<time> \47560\51648\47561 <cycle>", -4.93806460126142),
-                                    ("day-of-weekintersect", -4.93806460126142),
-                                    ("dayhour", -2.2990072716461616),
-                                    ("daymonth", -4.532599493153256),
-                                    ("monthday", -3.146305132033365),
-                                    ("yearhour", -3.233316509022995),
-                                    ("<time> <part-of-day>time-of-day", -3.8394523125933104),
-                                    ("nowday-of-week", -4.532599493153256),
-                                    ("houryear", -4.244917420701475),
-                                    ("day-of-weekafter <time-of-day>", -4.93806460126142),
+                                   [("year<time> \47560\51648\47561 <cycle>", -4.919980925828125),
+                                    ("day-of-weekintersect", -4.919980925828125),
+                                    ("dayhour", -2.2809235962128662),
+                                    ("daymonth", -4.5145158177199605),
+                                    ("monthday", -3.1282214566000697),
+                                    ("yearhour", -3.2152328335897),
+                                    ("<time> <part-of-day>time-of-day", -3.821368637160015),
+                                    ("houryear", -4.22683374526818),
+                                    ("day-of-weekafter <time-of-day>", -4.919980925828125),
                                     ("after <time-of-day>by <time> - \44620\51648",
-                                     -4.93806460126142),
-                                    ("intersectam|pm <time-of-day>", -4.532599493153256),
-                                    ("intersect<time> <part-of-day>", -4.021773869387265),
-                                    ("yearintersect", -3.0662624243598287),
+                                     -4.919980925828125),
+                                    ("intersectam|pm <time-of-day>", -4.5145158177199605),
+                                    ("intersect<time> <part-of-day>", -4.00369019395397),
+                                    ("yearintersect", -3.0481787489265337),
                                     ("day-of-week<time-of-day> - <time-of-day> (interval)",
-                                     -4.021773869387265),
-                                    ("intersectmonth", -4.93806460126142),
-                                    ("this <cycle>day-of-week", -4.532599493153256),
-                                    ("intersecttime-of-day", -4.532599493153256),
-                                    ("monthhour", -3.0662624243598287),
-                                    ("intersectlast <time>", -4.93806460126142),
-                                    ("dayday", -4.021773869387265),
-                                    ("hourhour", -3.146305132033365),
-                                    ("month<datetime> - <datetime> (interval)", -4.021773869387265),
-                                    ("dayam|pm <time-of-day>", -4.532599493153256),
-                                    ("day-of-weekam|pm <time-of-day>", -4.93806460126142),
-                                    ("hourminute", -4.244917420701475),
+                                     -4.00369019395397),
+                                    ("intersectmonth", -4.919980925828125),
+                                    ("time-of-day<duration> ago", -4.919980925828125),
+                                    ("this <cycle>day-of-week", -4.5145158177199605),
+                                    ("intersecttime-of-day", -4.5145158177199605),
+                                    ("monthhour", -3.0481787489265337),
+                                    ("intersectlast <time>", -4.919980925828125),
+                                    ("dayday", -4.00369019395397),
+                                    ("hourhour", -2.9740707767728116),
+                                    ("month<datetime> - <datetime> (interval)", -4.00369019395397),
+                                    ("dayam|pm <time-of-day>", -4.5145158177199605),
+                                    ("day-of-weekam|pm <time-of-day>", -4.919980925828125),
+                                    ("hourminute", -4.22683374526818),
                                     ("<time-of-day> - <time-of-day> (interval)last <time>",
-                                     -4.532599493153256),
-                                    ("intersectday", -4.532599493153256),
-                                    ("about <time-of-day>in <duration>", -4.93806460126142),
-                                    ("secondday", -4.532599493153256),
-                                    ("<datetime> - <datetime> (interval)day", -4.021773869387265),
-                                    ("month<time> <part-of-day>", -4.532599493153256),
-                                    ("yearmonth", -4.532599493153256),
-                                    ("dayminute", -4.244917420701475),
+                                     -4.00369019395397),
+                                    ("intersectday", -4.5145158177199605),
+                                    ("<datetime> - <datetime> (interval)day", -4.00369019395397),
+                                    ("month<time> <part-of-day>", -4.5145158177199605),
+                                    ("yearmonth", -4.5145158177199605),
+                                    ("dayminute", -4.22683374526818),
                                     ("<hour-of-day> <integer> (as relative minutes)seconds",
-                                     -4.244917420701475),
-                                    ("<time> <part-of-day><date>\50640", -4.93806460126142),
-                                    ("last <time>time-of-day", -4.93806460126142),
-                                    ("monthintersect", -3.32862668882732),
-                                    ("hoursecond", -4.93806460126142),
-                                    ("year<time> <part-of-day>", -4.532599493153256),
-                                    ("intersectintersect", -3.6853016327660524),
-                                    ("weekday", -4.532599493153256),
+                                     -4.22683374526818),
+                                    ("<time> <part-of-day><date>\50640", -4.919980925828125),
+                                    ("last <time>time-of-day", -4.919980925828125),
+                                    ("monthintersect", -3.3105430133940246),
+                                    ("hoursecond", -4.919980925828125),
+                                    ("year<time> <part-of-day>", -4.5145158177199605),
+                                    ("intersectintersect", -3.667217957332757),
+                                    ("weekday", -4.5145158177199605),
                                     ("intersectday with korean number - \51068\51068..\44396\51068",
-                                     -4.532599493153256),
-                                    ("day<time> <part-of-day>", -4.93806460126142),
-                                    ("yearday", -3.8394523125933104),
-                                    ("day-of-weekhh:mm", -4.93806460126142),
+                                     -4.5145158177199605),
+                                    ("day<time> <part-of-day>", -4.919980925828125),
+                                    ("yearday", -3.821368637160015),
+                                    ("day-of-weekhh:mm", -4.919980925828125),
                                     ("<time-of-day> - <time-of-day> (interval)time-of-day",
-                                     -4.532599493153256),
-                                    ("intersectafter <time-of-day>", -3.4339872044851463),
-                                    ("minutesecond", -4.244917420701475),
+                                     -4.5145158177199605),
+                                    ("intersectafter <time-of-day>", -3.415903529051851),
+                                    ("minutesecond", -4.22683374526818),
                                     ("<time> <part-of-day><hour-of-day> <integer> (as relative minutes)",
-                                     -4.532599493153256),
-                                    ("dayintersect", -4.93806460126142),
-                                    ("mm/ddafter <time-of-day>", -4.93806460126142),
-                                    ("todayafter <time-of-day>", -4.93806460126142)],
+                                     -4.5145158177199605),
+                                    ("dayintersect", -4.919980925828125),
+                                    ("mm/ddafter <time-of-day>", -4.919980925828125),
+                                    ("todayafter <time-of-day>", -4.919980925828125)],
                                n = 101}}),
        ("season",
         Classifier{okData =
@@ -1240,16 +1239,19 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<1..4> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer - TYPE 1quarter (grain)", -1.252762968495368),
-                                    ("integer (numeric)quarter (grain)", -1.252762968495368),
-                                    ("quarter", -0.8472978603872037)],
-                               n = 2},
+                                   [("integer - TYPE 1quarter (grain)", -0.916290731874155),
+                                    ("quarter", -0.916290731874155)],
+                               n = 1},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)quarter (grain)", -0.916290731874155),
+                                    ("quarter", -0.916290731874155)],
+                               n = 1}}),
        ("Children's Day",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
diff --git a/Duckling/Ranking/Classifiers/NB.hs b/Duckling/Ranking/Classifiers/NB.hs
index 6ab129ad..b135cf66 100644
--- a/Duckling/Ranking/Classifiers/NB.hs
+++ b/Duckling/Ranking/Classifiers/NB.hs
@@ -64,172 +64,161 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect2",
         Classifier{okData =
-                     ClassData{prior = -0.5532259898366517, unseen = -5.991464547107982,
+                     ClassData{prior = -0.4690908039883759, unseen = -5.869296913133774,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.197201947661808),
+                                     -4.074708587705242),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.197201947661808),
-                                    ("hourday", -5.295814236329918),
-                                    ("dayhour", -3.044522437723423),
-                                    ("daymonth", -2.6216655869033896),
-                                    ("monthyear", -3.0985896589936988),
-                                    ("the <day-of-month> (ordinal)named-month", -4.04305126783455),
+                                     -4.074708587705242),
+                                    ("hourday", -5.173320876373351),
+                                    ("dayhour", -2.9220290777668563),
+                                    ("daymonth", -2.7309738410041473),
+                                    ("monthyear", -3.0938793346935154),
+                                    ("the <day-of-month> (ordinal)named-month",
+                                     -3.9205579078779835),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.890349128221754),
-                                    ("intersect2hh:mm", -5.295814236329918),
-                                    ("last <day-of-week> of <time>year", -4.890349128221754),
-                                    ("todayat <time-of-day>", -4.890349128221754),
-                                    ("dayday", -3.044522437723423),
-                                    ("dd/mmat <time-of-day>", -4.379523504455763),
-                                    ("intersect by \",\"hh:mm", -4.890349128221754),
-                                    ("intersectnamed-month", -4.890349128221754),
-                                    ("dayyear", -2.8534672009607136),
-                                    ("named-daythis <time>", -3.686376323895818),
-                                    ("quarteryear", -4.890349128221754),
-                                    ("tomorrow<time-of-day> sharp", -4.890349128221754),
+                                     -4.767855768265187),
+                                    ("intersect2hh:mm", -5.173320876373351),
+                                    ("last <day-of-week> of <time>year", -4.767855768265187),
+                                    ("todayat <time-of-day>", -4.767855768265187),
+                                    ("dayday", -2.9220290777668563),
+                                    ("dd/mmat <time-of-day>", -4.257030144499196),
+                                    ("intersect by \",\"hh:mm", -4.767855768265187),
+                                    ("intersectnamed-month", -4.767855768265187),
+                                    ("dayyear", -3.3015186994717602),
+                                    ("named-daythis <time>", -3.787026515253461),
+                                    ("tomorrow<time-of-day> sharp", -4.767855768265187),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.890349128221754),
-                                    ("named-day<time> timezone", -4.602667055769973),
-                                    ("named-monthyear", -3.216372694650082),
+                                     -4.767855768265187),
+                                    ("named-day<time> timezone", -4.480173695813406),
+                                    ("named-monthyear", -3.0938793346935154),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.197201947661808),
-                                    ("on <date>named-month", -4.04305126783455),
-                                    ("tomorrowuntil <time-of-day>", -4.890349128221754),
+                                     -4.074708587705242),
+                                    ("on <date>named-month", -3.9205579078779835),
+                                    ("tomorrowuntil <time-of-day>", -4.767855768265187),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.602667055769973),
-                                    ("intersect2named-month", -4.890349128221754),
-                                    ("after <time-of-day>at <time-of-day>", -4.890349128221754),
+                                     -4.480173695813406),
+                                    ("intersect2named-month", -4.767855768265187),
+                                    ("after <time-of-day>at <time-of-day>", -4.767855768265187),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.890349128221754),
+                                     -4.767855768265187),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.295814236329918),
+                                     -5.173320876373351),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.295814236329918),
-                                    ("nth <time> of <time>year", -4.04305126783455),
+                                     -5.173320876373351),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.890349128221754),
-                                    ("named-daynext <cycle>", -5.295814236329918),
-                                    ("named-dayintersect", -4.379523504455763),
+                                     -4.767855768265187),
+                                    ("named-daynext <cycle>", -5.173320876373351),
+                                    ("named-dayintersect", -4.767855768265187),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.890349128221754),
-                                    ("tomorrowafter <time-of-day>", -4.890349128221754),
+                                     -4.767855768265187),
+                                    ("tomorrowafter <time-of-day>", -4.767855768265187),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.379523504455763),
-                                    ("dayminute", -3.1557480728336476),
-                                    ("<ordinal> quarteryear", -4.890349128221754),
+                                     -4.257030144499196),
+                                    ("dayminute", -3.033254712877081),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.602667055769973),
-                                    ("intersectyear", -4.890349128221754),
-                                    ("<ordinal> <cycle> of <time>year", -4.890349128221754),
-                                    ("minuteday", -2.6931245508855346),
+                                     -4.480173695813406),
+                                    ("<ordinal> <cycle> of <time>year", -4.767855768265187),
+                                    ("minuteday", -2.570631190928968),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.295814236329918),
-                                    ("named-dayon <date>", -4.890349128221754),
-                                    ("named-dayat <time-of-day>", -4.890349128221754),
-                                    ("named-dayintersect2", -4.379523504455763),
+                                     -5.173320876373351),
+                                    ("named-dayon <date>", -4.767855768265187),
+                                    ("named-dayat <time-of-day>", -4.767855768265187),
+                                    ("named-dayintersect2", -4.767855768265187),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.295814236329918),
+                                     -5.173320876373351),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -5.295814236329918),
-                                    ("dd/mmyear", -4.890349128221754),
-                                    ("at <time-of-day>on <date>", -5.295814236329918),
+                                     -5.173320876373351),
+                                    ("dd/mmyear", -4.767855768265187),
+                                    ("at <time-of-day>on <date>", -5.173320876373351),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.295814236329918),
+                                     -5.173320876373351),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.295814236329918),
-                                    ("dayweek", -4.197201947661808),
-                                    ("intersect2year", -4.890349128221754),
-                                    ("weekyear", -4.379523504455763),
-                                    ("hh:mmtomorrow", -4.602667055769973),
-                                    ("tomorrowat <time-of-day>", -4.04305126783455),
-                                    ("named-daythis <cycle>", -4.602667055769973),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.295814236329918),
-                                    ("at <time-of-day>tomorrow", -4.890349128221754),
-                                    ("this <time>year", -4.890349128221754),
-                                    ("last <cycle> of <time>year", -4.379523504455763),
+                                     -5.173320876373351),
+                                    ("dayweek", -4.074708587705242),
+                                    ("weekyear", -4.257030144499196),
+                                    ("hh:mmtomorrow", -4.480173695813406),
+                                    ("tomorrowat <time-of-day>", -3.9205579078779835),
+                                    ("named-daythis <cycle>", -4.480173695813406),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.173320876373351),
+                                    ("at <time-of-day>tomorrow", -4.767855768265187),
+                                    ("last <cycle> of <time>year", -4.257030144499196),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.890349128221754)],
-                               n = 157},
+                                     -4.767855768265187)],
+                               n = 137},
                    koData =
-                     ClassData{prior = -0.8558816040785951, unseen = -5.762051382780177,
+                     ClassData{prior = -0.9823524825522477, unseen = -5.497168225293202,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -5.065754593317335),
-                                    ("dayhour", -3.561677196541061),
-                                    ("daymonth", -1.9977016581837184),
-                                    ("monthday", -4.149463861443181),
-                                    ("monthyear", -2.9256884298210646),
+                                   [("named-daynamed-month", -4.799914262780603),
+                                    ("dayhour", -3.295836866004329),
+                                    ("daymonth", -1.9965538818740682),
+                                    ("monthday", -3.883623530906448),
+                                    ("monthyear", -3.883623530906448),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.8129916248219673),
-                                    ("named-dayhh:mm", -5.065754593317335),
-                                    ("dd/mmat <time-of-day>", -4.149463861443181),
-                                    ("hourhour", -3.8129916248219673),
-                                    ("dayyear", -2.81446279471084),
-                                    ("named-daythis <time>", -2.7143793361538577),
+                                     -3.5471512942852352),
+                                    ("named-dayhh:mm", -4.799914262780603),
+                                    ("dd/mmat <time-of-day>", -3.883623530906448),
+                                    ("hourhour", -3.5471512942852352),
+                                    ("dayyear", -3.5471512942852352),
+                                    ("named-daythis <time>", -2.3575672274113986),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.660289485209171),
-                                    ("minutemonth", -4.660289485209171),
-                                    ("named-monthyear", -4.149463861443181),
+                                     -4.394449154672439),
+                                    ("minutemonth", -4.394449154672439),
+                                    ("named-monthyear", -3.883623530906448),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.660289485209171),
+                                     -4.394449154672439),
                                     ("absorption of , after named daynamed-month",
-                                     -3.967142304649226),
+                                     -3.7013019741124937),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -5.065754593317335),
-                                    ("named-dayintersect", -3.8129916248219673),
+                                     -4.799914262780603),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.660289485209171),
+                                     -4.394449154672439),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.065754593317335),
-                                    ("until <time-of-day>on <date>", -5.065754593317335),
-                                    ("dayminute", -3.6794602321974446),
-                                    ("intersectyear", -3.8129916248219673),
-                                    ("minuteday", -3.561677196541061),
+                                     -4.799914262780603),
+                                    ("until <time-of-day>on <date>", -4.799914262780603),
+                                    ("dayminute", -3.4136199016607125),
+                                    ("minuteday", -3.295836866004329),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.065754593317335),
-                                    ("named-dayon <date>", -5.065754593317335),
-                                    ("named-dayat <time-of-day>", -4.149463861443181),
-                                    ("named-dayintersect2", -3.8129916248219673),
-                                    ("yearhh:mm", -5.065754593317335),
-                                    ("hh:mmon <date>", -3.6794602321974446),
+                                     -4.799914262780603),
+                                    ("named-dayon <date>", -4.799914262780603),
+                                    ("named-dayat <time-of-day>", -3.883623530906448),
+                                    ("yearhh:mm", -4.799914262780603),
+                                    ("hh:mmon <date>", -3.4136199016607125),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.065754593317335),
+                                     -4.799914262780603),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.149463861443181),
+                                     -3.883623530906448),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.149463861443181),
-                                    ("intersect2year", -3.8129916248219673),
-                                    ("this <part-of-day>until <time-of-day>", -4.660289485209171),
+                                     -3.883623530906448),
+                                    ("this <part-of-day>until <time-of-day>", -4.394449154672439),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.660289485209171),
-                                    ("this <time>year", -3.193952416415744),
-                                    ("tomorrownoon", -5.065754593317335),
-                                    ("this <time>until <time-of-day>", -4.660289485209171),
-                                    ("minuteyear", -4.660289485209171),
-                                    ("yearminute", -4.37260741275739)],
-                               n = 116}}),
+                                     -4.394449154672439),
+                                    ("tomorrownoon", -4.799914262780603),
+                                    ("this <time>until <time-of-day>", -4.394449154672439),
+                                    ("minuteyear", -4.394449154672439),
+                                    ("yearminute", -4.1067670822206574)],
+                               n = 82}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.916290731874155, unseen = -2.833213344056216,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -1.1631508098056809),
-                                    ("tomorrowevening", -2.0794415416798357),
-                                    ("named-daymorning", -2.0794415416798357),
-                                    ("tomorrowlunch", -2.0794415416798357),
-                                    ("yesterdayevening", -2.0794415416798357)],
+                                   [("dayhour", -1.0986122886681098),
+                                    ("tomorrowevening", -2.0149030205422647),
+                                    ("named-daymorning", -2.0149030205422647),
+                                    ("tomorrowlunch", -2.0149030205422647),
+                                    ("yesterdayevening", -2.0149030205422647)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.5108256237659907, unseen = -3.044522437723423,
+                     ClassData{prior = -0.8472978603872037, unseen = -2.639057329615259,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -1.0498221244986778),
-                                    ("year (latent)this <part-of-day>", -1.6094379124341003),
+                                   [("yearhour", -1.1786549963416462),
                                     ("year (latent)in|during the <part-of-day>",
-                                     -1.6094379124341003)],
-                               n = 6}}),
+                                     -1.1786549963416462)],
+                               n = 3}}),
        ("dd/mm",
         Classifier{okData =
                      ClassData{prior = -0.2231435513142097,
@@ -394,16 +383,23 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.4849066497880004,
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.0794415416798357,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)quarter (grain)", -1.2992829841302609),
-                                    ("quarter", -0.7884573603642702),
-                                    ("ordinals (first..31st)quarter (grain)", -1.2992829841302609)],
-                               n = 4},
+                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
+                                    ("quarter", -0.8472978603872037),
+                                    ("ordinals (first..31st)quarter (grain)", -1.252762968495368)],
+                               n = 2},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453,
+                               unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
+                                    ("quarter", -0.8472978603872037),
+                                    ("ordinals (first..31st)quarter (grain)", -1.252762968495368)],
+                               n = 2}}),
        ("Last year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -413,150 +409,139 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.5642734582094036, unseen = -5.968707559985366,
+                     ClassData{prior = -0.480288899905909, unseen = -5.84354441703136,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.174387269895637),
+                                     -4.048882188145344),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.174387269895637),
-                                    ("hourday", -5.272999558563747),
-                                    ("dayhour", -3.0217077599572515),
-                                    ("daymonth", -2.598850909137218),
-                                    ("monthyear", -3.0757749812275272),
-                                    ("the <day-of-month> (ordinal)named-month", -4.020236590068379),
+                                     -4.048882188145344),
+                                    ("hourday", -5.147494476813453),
+                                    ("dayhour", -2.896202678206958),
+                                    ("daymonth", -2.705147441444249),
+                                    ("monthyear", -3.068052935133617),
+                                    ("the <day-of-month> (ordinal)named-month", -3.894731508318085),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.867534450455582),
-                                    ("intersect2hh:mm", -5.272999558563747),
-                                    ("last <day-of-week> of <time>year", -4.867534450455582),
-                                    ("todayat <time-of-day>", -4.867534450455582),
-                                    ("dayday", -3.258096538021482),
-                                    ("dd/mmat <time-of-day>", -4.356708826689592),
-                                    ("intersect by \",\"hh:mm", -4.867534450455582),
-                                    ("intersectnamed-month", -4.867534450455582),
-                                    ("dayyear", -2.8306525231945425),
-                                    ("named-daythis <time>", -3.6635616461296463),
-                                    ("quarteryear", -4.867534450455582),
-                                    ("tomorrow<time-of-day> sharp", -4.867534450455582),
+                                     -4.742029368705289),
+                                    ("intersect2hh:mm", -5.147494476813453),
+                                    ("last <day-of-week> of <time>year", -4.742029368705289),
+                                    ("todayat <time-of-day>", -4.742029368705289),
+                                    ("dayday", -3.132591456271188),
+                                    ("dd/mmat <time-of-day>", -4.231203744939298),
+                                    ("intersect by \",\"hh:mm", -4.742029368705289),
+                                    ("intersectnamed-month", -4.742029368705289),
+                                    ("dayyear", -3.275692299911862),
+                                    ("named-daythis <time>", -3.7612001156935624),
+                                    ("tomorrow<time-of-day> sharp", -4.742029368705289),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.867534450455582),
-                                    ("named-day<time> timezone", -4.579852378003801),
-                                    ("named-monthyear", -3.193558016883911),
+                                     -4.742029368705289),
+                                    ("named-day<time> timezone", -4.454347296253507),
+                                    ("named-monthyear", -3.068052935133617),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.579852378003801),
-                                    ("on <date>named-month", -4.020236590068379),
-                                    ("tomorrowuntil <time-of-day>", -4.867534450455582),
+                                     -4.454347296253507),
+                                    ("on <date>named-month", -3.894731508318085),
+                                    ("tomorrowuntil <time-of-day>", -4.742029368705289),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.867534450455582),
-                                    ("intersect2named-month", -4.867534450455582),
-                                    ("after <time-of-day>at <time-of-day>", -4.867534450455582),
+                                     -4.742029368705289),
+                                    ("intersect2named-month", -4.742029368705289),
+                                    ("after <time-of-day>at <time-of-day>", -4.742029368705289),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.867534450455582),
+                                     -4.742029368705289),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.272999558563747),
+                                     -5.147494476813453),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.272999558563747),
-                                    ("nth <time> of <time>year", -4.020236590068379),
+                                     -5.147494476813453),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.867534450455582),
-                                    ("named-daynext <cycle>", -5.272999558563747),
-                                    ("named-dayintersect", -4.356708826689592),
+                                     -4.742029368705289),
+                                    ("named-daynext <cycle>", -5.147494476813453),
+                                    ("named-dayintersect", -4.742029368705289),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.867534450455582),
-                                    ("tomorrowafter <time-of-day>", -4.867534450455582),
+                                     -4.742029368705289),
+                                    ("tomorrowafter <time-of-day>", -4.742029368705289),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.356708826689592),
-                                    ("dayminute", -3.132933395067476),
-                                    ("<ordinal> quarteryear", -4.867534450455582),
+                                     -4.231203744939298),
+                                    ("dayminute", -3.0074283133171824),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.579852378003801),
-                                    ("intersectyear", -4.867534450455582),
-                                    ("<ordinal> <cycle> of <time>year", -4.867534450455582),
-                                    ("minuteday", -2.670309873119363),
+                                     -4.454347296253507),
+                                    ("<ordinal> <cycle> of <time>year", -4.742029368705289),
+                                    ("minuteday", -2.5448047913690695),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.272999558563747),
-                                    ("named-dayon <date>", -4.867534450455582),
-                                    ("named-dayat <time-of-day>", -4.867534450455582),
-                                    ("named-dayintersect2", -4.356708826689592),
+                                     -5.147494476813453),
+                                    ("named-dayon <date>", -4.742029368705289),
+                                    ("named-dayat <time-of-day>", -4.742029368705289),
+                                    ("named-dayintersect2", -4.742029368705289),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.272999558563747),
-                                    ("dd/mmyear", -4.867534450455582),
-                                    ("at <time-of-day>on <date>", -5.272999558563747),
+                                     -5.147494476813453),
+                                    ("dd/mmyear", -4.742029368705289),
+                                    ("at <time-of-day>on <date>", -5.147494476813453),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.272999558563747),
+                                     -5.147494476813453),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.272999558563747),
-                                    ("dayweek", -4.174387269895637),
-                                    ("intersect2year", -4.867534450455582),
-                                    ("weekyear", -4.356708826689592),
-                                    ("hh:mmtomorrow", -4.579852378003801),
-                                    ("tomorrowat <time-of-day>", -4.020236590068379),
-                                    ("named-daythis <cycle>", -4.579852378003801),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.272999558563747),
-                                    ("at <time-of-day>tomorrow", -4.867534450455582),
-                                    ("this <time>year", -4.867534450455582),
-                                    ("last <cycle> of <time>year", -4.356708826689592),
+                                     -5.147494476813453),
+                                    ("dayweek", -4.048882188145344),
+                                    ("weekyear", -4.231203744939298),
+                                    ("hh:mmtomorrow", -4.454347296253507),
+                                    ("tomorrowat <time-of-day>", -3.894731508318085),
+                                    ("named-daythis <cycle>", -4.454347296253507),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.147494476813453),
+                                    ("at <time-of-day>tomorrow", -4.742029368705289),
+                                    ("last <cycle> of <time>year", -4.231203744939298),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.867534450455582)],
-                               n = 153},
+                                     -4.742029368705289)],
+                               n = 133},
                    koData =
-                     ClassData{prior = -0.8411211884954745, unseen = -5.75890177387728,
+                     ClassData{prior = -0.9639187808634097, unseen = -5.493061443340548,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -5.062595033026967),
-                                    ("dayhour", -3.5585176362506927),
-                                    ("daymonth", -1.9945420978933497),
-                                    ("monthday", -4.146304301152812),
-                                    ("monthyear", -2.922528869530696),
+                                   [("named-daynamed-month", -4.795790545596741),
+                                    ("dayhour", -3.291713148820467),
+                                    ("daymonth", -1.9924301646902063),
+                                    ("monthday", -3.879499813722586),
+                                    ("monthyear", -3.879499813722586),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -3.809832064531599),
-                                    ("named-dayhh:mm", -5.062595033026967),
-                                    ("dd/mmat <time-of-day>", -4.146304301152812),
-                                    ("hourhour", -3.809832064531599),
-                                    ("dayyear", -2.8113032344204716),
-                                    ("named-daythis <time>", -2.7112197758634893),
+                                     -3.5430275771013733),
+                                    ("named-dayhh:mm", -4.795790545596741),
+                                    ("dd/mmat <time-of-day>", -3.879499813722586),
+                                    ("hourhour", -3.5430275771013733),
+                                    ("dayyear", -3.5430275771013733),
+                                    ("named-daythis <time>", -2.3534435102275366),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.657129924918802),
-                                    ("minutemonth", -4.657129924918802),
-                                    ("named-monthyear", -4.146304301152812),
+                                     -4.390325437488577),
+                                    ("minutemonth", -4.390325437488577),
+                                    ("named-monthyear", -3.879499813722586),
                                     ("in|during the <part-of-day>until <time-of-day>",
-                                     -4.657129924918802),
+                                     -4.390325437488577),
                                     ("absorption of , after named daynamed-month",
-                                     -3.963982744358857),
+                                     -3.6971782569286313),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -5.062595033026967),
-                                    ("named-dayintersect", -3.809832064531599),
+                                     -4.795790545596741),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.657129924918802),
+                                     -4.390325437488577),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("until <time-of-day>on <date>", -5.062595033026967),
-                                    ("dayminute", -3.676300671907076),
-                                    ("intersectyear", -3.809832064531599),
-                                    ("minuteday", -3.5585176362506927),
+                                     -4.795790545596741),
+                                    ("until <time-of-day>on <date>", -4.795790545596741),
+                                    ("dayminute", -3.4094961844768505),
+                                    ("minuteday", -3.291713148820467),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.062595033026967),
-                                    ("named-dayon <date>", -5.062595033026967),
-                                    ("named-dayat <time-of-day>", -4.146304301152812),
-                                    ("named-dayintersect2", -3.809832064531599),
-                                    ("yearhh:mm", -5.062595033026967),
-                                    ("hh:mmon <date>", -3.676300671907076),
+                                     -4.795790545596741),
+                                    ("named-dayon <date>", -4.795790545596741),
+                                    ("named-dayat <time-of-day>", -3.879499813722586),
+                                    ("yearhh:mm", -4.795790545596741),
+                                    ("hh:mmon <date>", -3.4094961844768505),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.062595033026967),
+                                     -4.795790545596741),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.146304301152812),
+                                     -3.879499813722586),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.146304301152812),
-                                    ("intersect2year", -3.809832064531599),
-                                    ("this <part-of-day>until <time-of-day>", -4.657129924918802),
+                                     -3.879499813722586),
+                                    ("this <part-of-day>until <time-of-day>", -4.390325437488577),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.657129924918802),
-                                    ("this <time>year", -3.1907928561253756),
-                                    ("tomorrownoon", -5.062595033026967),
-                                    ("this <time>until <time-of-day>", -4.657129924918802),
-                                    ("minuteyear", -4.657129924918802),
-                                    ("yearminute", -4.3694478524670215)],
-                               n = 116}}),
+                                     -4.390325437488577),
+                                    ("tomorrownoon", -4.795790545596741),
+                                    ("this <time>until <time-of-day>", -4.390325437488577),
+                                    ("minuteyear", -4.390325437488577),
+                                    ("yearminute", -4.102643365036796)],
+                               n = 82}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -742,20 +727,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.8066624897703196,
+                     ClassData{prior = -0.35667494393873245,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7396671961948381),
+                                   [("daymonth", -0.7576857016975165),
                                     ("ordinals (first..31st)named-dayintersect2",
-                                     -1.8382794848629478),
+                                     -1.5198257537444133),
                                     ("ordinals (first..31st)named-dayintersect",
-                                     -1.8382794848629478),
+                                     -1.5198257537444133),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -1.5869650565820417)],
-                               n = 20},
+                                     -2.367123614131617)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.2039728043259361, unseen = -2.833213344056216,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.8266785731844679),
+                                    ("ordinals (first..31st)named-daynamed-month",
+                                     -0.8266785731844679)],
+                               n = 6}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1705,32 +1696,33 @@ classifiers
                                n = 9}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -1.318240897874875, unseen = -3.9318256327243257,
+                     ClassData{prior = -1.4294665329850993,
+                               unseen = -3.8501476017100584,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.2188758248682006),
-                                    ("intersect2", -2.8134107167600364),
-                                    ("intersect", -2.8134107167600364),
-                                    ("season", -2.3025850929940455),
-                                    ("next <cycle>", -3.2188758248682006),
-                                    ("named-month", -2.3025850929940455),
-                                    ("day", -2.3025850929940455), ("hour", -1.9661128563728327),
-                                    ("evening", -3.2188758248682006),
-                                    ("month", -1.7147984280919266),
-                                    ("morning", -3.2188758248682006),
-                                    ("week-end", -2.3025850929940455)],
-                               n = 19},
+                                   [("week", -3.1354942159291497),
+                                    ("intersect2", -2.7300291078209855),
+                                    ("intersect", -2.7300291078209855),
+                                    ("season", -2.2192034840549946),
+                                    ("next <cycle>", -3.1354942159291497),
+                                    ("named-month", -2.7300291078209855),
+                                    ("day", -2.2192034840549946), ("hour", -1.8827312474337816),
+                                    ("evening", -3.1354942159291497),
+                                    ("month", -1.8827312474337816),
+                                    ("morning", -3.1354942159291497),
+                                    ("week-end", -2.2192034840549946)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -0.31143615845988804,
-                               unseen = -4.762173934797756,
+                     ClassData{prior = -0.27369583047704105,
+                               unseen = -4.795790545596741,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.1886408336448278),
-                                    ("intersect", -2.1886408336448278),
-                                    ("named-month", -1.9203768470501485),
-                                    ("hour", -2.1886408336448278), ("month", -1.040018124402057),
-                                    ("morning", -2.1886408336448278)],
-                               n = 52}}),
+                                   [("intersect2", -2.222542385320509),
+                                    ("intersect", -2.222542385320509),
+                                    ("named-month", -1.8430527636156055),
+                                    ("hour", -2.222542385320509), ("month", -1.0262916270884836),
+                                    ("morning", -2.222542385320509)],
+                               n = 54}}),
        ("within <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
diff --git a/Duckling/Ranking/Classifiers/PL.hs b/Duckling/Ranking/Classifiers/PL.hs
index a0b61b32..c5eea541 100644
--- a/Duckling/Ranking/Classifiers/PL.hs
+++ b/Duckling/Ranking/Classifiers/PL.hs
@@ -87,75 +87,74 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.7659065348423736,
-                               unseen = -5.0106352940962555,
+                     ClassData{prior = -0.7392382877602123, unseen = -5.003946305945459,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<ordinal> (as hour)after <time-of-day>", -3.6176519448255684),
-                                    ("dayhour", -3.0580361568901457),
-                                    ("<ordinal> (as hour)evening|night", -2.6060510331470885),
-                                    ("<ordinal> (as hour)on <date>", -4.310799125385514),
-                                    ("yesterdayevening|night", -4.310799125385514),
-                                    ("hourhour", -1.1537987042354005),
-                                    ("after <time-of-day>after <time-of-day>", -3.9053340172773496),
-                                    ("until <time-of-day>morning", -3.9053340172773496),
-                                    ("until <time-of-day>after <time-of-day>", -4.310799125385514),
-                                    ("minutehour", -4.310799125385514),
-                                    ("named-daymorning", -4.310799125385514),
-                                    ("todayevening|night", -4.310799125385514),
-                                    ("at <time-of-day>evening|night", -4.310799125385514),
-                                    ("named-dayevening|night", -4.310799125385514),
-                                    ("intersecton <date>", -4.310799125385514),
+                                   [("<ordinal> (as hour)after <time-of-day>", -3.6109179126442243),
+                                    ("dayhour", -3.0513021247088017),
+                                    ("<ordinal> (as hour)evening|night", -2.5993170009657445),
+                                    ("<ordinal> (as hour)on <date>", -4.304065093204169),
+                                    ("yesterdayevening|night", -4.304065093204169),
+                                    ("hourhour", -1.1470646720540565),
+                                    ("after <time-of-day>after <time-of-day>", -3.898599985096005),
+                                    ("until <time-of-day>morning", -3.898599985096005),
+                                    ("until <time-of-day>after <time-of-day>", -4.304065093204169),
+                                    ("minutehour", -4.304065093204169),
+                                    ("named-daymorning", -4.304065093204169),
+                                    ("todayevening|night", -4.304065093204169),
+                                    ("at <time-of-day>evening|night", -4.304065093204169),
+                                    ("named-dayevening|night", -4.304065093204169),
+                                    ("intersecton <date>", -4.304065093204169),
                                     ("<integer> (latent time-of-day)this <part-of-day>",
-                                     -4.310799125385514),
-                                    ("hh:mmon <date>", -4.310799125385514),
-                                    ("<integer> (latent time-of-day)morning", -3.2121868367174042),
-                                    ("at <time-of-day>on <date>", -4.310799125385514),
-                                    ("intersectmorning", -3.0580361568901457),
+                                     -4.304065093204169),
+                                    ("hh:mmon <date>", -4.304065093204169),
+                                    ("<integer> (latent time-of-day)morning", -3.20545280453606),
+                                    ("at <time-of-day>on <date>", -4.304065093204169),
+                                    ("intersectmorning", -3.0513021247088017),
                                     ("<integer> (latent time-of-day)evening|night",
-                                     -3.0580361568901457),
+                                     -3.0513021247088017),
                                     ("from <datetime> - <datetime> (interval)morning",
-                                     -3.9053340172773496),
+                                     -3.898599985096005),
                                     ("from <time-of-day> - <time-of-day> (interval)morning",
-                                     -4.310799125385514),
-                                    ("on <date>morning", -4.310799125385514),
-                                    ("at <time-of-day>morning", -3.9053340172773496),
-                                    ("tomorrowevening|night", -3.9053340172773496)],
+                                     -4.304065093204169),
+                                    ("on <date>morning", -4.304065093204169),
+                                    ("at <time-of-day>morning", -3.898599985096005),
+                                    ("tomorrowevening|night", -3.898599985096005)],
                                n = 53},
                    koData =
-                     ClassData{prior = -0.6253245842211842, unseen = -5.111987788356543,
+                     ClassData{prior = -0.6490871907659148,
+                               unseen = -5.0689042022202315,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -2.0149030205422647),
-                                    ("yearhour", -1.927891643552635),
-                                    ("year (latent)on <date>", -4.412798293340635),
-                                    ("<day-of-month> (ordinal)on <date>", -4.412798293340635),
+                                   [("dayhour", -1.971552579668651),
+                                    ("yearhour", -1.9271008170978172),
+                                    ("year (latent)on <date>", -4.3694478524670215),
+                                    ("<day-of-month> (ordinal)on <date>", -4.3694478524670215),
                                     ("<time-of-day> - <time-of-day> (interval)morning",
-                                     -4.412798293340635),
-                                    ("<day-of-month> (ordinal)evening|night", -2.70805020110221),
-                                    ("by the end of <time>morning", -4.007333185232471),
-                                    ("year (latent)evening|night", -3.1600353248452673),
-                                    ("hourhour", -2.803360380906535),
-                                    ("after <time-of-day>after <time-of-day>", -4.007333185232471),
-                                    ("<day-of-month> (ordinal)morning", -4.007333185232471),
+                                     -4.3694478524670215),
+                                    ("<day-of-month> (ordinal)evening|night", -2.6646997602285962),
+                                    ("by the end of <time>morning", -4.3694478524670215),
+                                    ("year (latent)evening|night", -3.1166848839716534),
+                                    ("hourhour", -2.760009940032921),
+                                    ("after <time-of-day>after <time-of-day>", -3.963982744358857),
+                                    ("<day-of-month> (ordinal)morning", -3.963982744358857),
                                     ("<day-of-month> (ordinal)after <time-of-day>",
-                                     -3.3141860046725258),
-                                    ("until <time-of-day>morning", -3.4965075614664802),
-                                    ("year (latent)this <part-of-day>", -4.412798293340635),
-                                    ("until <time-of-day>after <time-of-day>", -4.412798293340635),
-                                    ("about <time-of-day>after <time-of-day>", -4.412798293340635),
-                                    ("by <time>morning", -4.007333185232471),
+                                     -3.270835563798912),
+                                    ("until <time-of-day>morning", -3.4531571205928664),
+                                    ("until <time-of-day>after <time-of-day>", -4.3694478524670215),
+                                    ("about <time-of-day>after <time-of-day>", -4.3694478524670215),
+                                    ("by <time>morning", -4.3694478524670215),
                                     ("<integer> (latent time-of-day)after <time-of-day>",
-                                     -4.007333185232471),
-                                    ("<integer> (latent time-of-day)morning", -4.412798293340635),
-                                    ("secondhour", -2.908720896564361),
-                                    ("intersectmorning", -3.4965075614664802),
+                                     -3.963982744358857),
+                                    ("<integer> (latent time-of-day)morning", -4.3694478524670215),
+                                    ("secondhour", -3.1166848839716534),
+                                    ("intersectmorning", -3.4531571205928664),
                                     ("from <datetime> - <datetime> (interval)morning",
-                                     -4.007333185232471),
-                                    ("year (latent)morning", -2.70805020110221),
-                                    ("year (latent)after <time-of-day>", -4.007333185232471),
-                                    ("at <time-of-day>after <time-of-day>", -4.412798293340635)],
-                               n = 61}}),
+                                     -3.963982744358857),
+                                    ("year (latent)morning", -2.6646997602285962),
+                                    ("year (latent)after <time-of-day>", -3.963982744358857),
+                                    ("at <time-of-day>after <time-of-day>", -4.3694478524670215)],
+                               n = 58}}),
        ("today",
         Classifier{okData =
                      ClassData{prior = -0.2876820724517809,
@@ -297,35 +296,40 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> <time>",
         Classifier{okData =
-                     ClassData{prior = -0.19671029424605427,
-                               unseen = -4.1588830833596715,
+                     ClassData{prior = -0.4989911661189879, unseen = -3.951243718581427,
                                likelihoods =
                                  HashMap.fromList
-                                   [("third ordinalnamed-daynamed-month", -3.4499875458315876),
-                                    ("second ordinalnamed-dayintersect", -3.044522437723423),
-                                    ("first ordinalnamed-dayon <date>", -2.7568403652716422),
-                                    ("daymonth", -1.252762968495368),
-                                    ("dayyear", -2.1972245773362196),
-                                    ("second ordinalnamed-daynamed-month", -3.4499875458315876),
-                                    ("third ordinalnamed-dayintersect", -3.044522437723423),
-                                    ("third ordinalintersectyear", -3.044522437723423),
-                                    ("third ordinalnamed-dayon <date>", -3.044522437723423),
-                                    ("first ordinalnamed-daynamed-month", -3.044522437723423),
-                                    ("first ordinalintersectyear", -3.044522437723423),
-                                    ("first ordinalnamed-dayintersect", -3.044522437723423),
-                                    ("second ordinalnamed-dayon <date>", -3.044522437723423),
-                                    ("second ordinalintersectyear", -3.044522437723423)],
-                               n = 23},
+                                   [("second ordinalnamed-dayintersect", -2.833213344056216),
+                                    ("first ordinalnamed-dayon <date>", -2.833213344056216),
+                                    ("daymonth", -1.4469189829363254),
+                                    ("dayyear", -1.9859154836690123),
+                                    ("third ordinalnamed-dayintersect", -2.833213344056216),
+                                    ("third ordinalintersectyear", -2.833213344056216),
+                                    ("third ordinalnamed-dayon <date>", -3.2386784521643803),
+                                    ("first ordinalnamed-daynamed-month", -3.2386784521643803),
+                                    ("first ordinalintersectyear", -2.833213344056216),
+                                    ("first ordinalnamed-dayintersect", -2.833213344056216),
+                                    ("second ordinalnamed-dayon <date>", -3.2386784521643803),
+                                    ("second ordinalintersectyear", -2.833213344056216)],
+                               n = 17},
                    koData =
-                     ClassData{prior = -1.7227665977411035, unseen = -3.332204510175204,
+                     ClassData{prior = -0.9343092373768334,
+                               unseen = -3.6888794541139363,
                                likelihoods =
                                  HashMap.fromList
-                                   [("14th ordinalnamed-month<integer> (latent time-of-day)",
-                                     -2.1972245773362196),
-                                    ("monthhour", -1.5040773967762742),
+                                   [("third ordinalnamed-daynamed-month", -2.9704144655697013),
+                                    ("first ordinalnamed-dayon <date>", -2.9704144655697013),
+                                    ("daymonth", -1.717651497074333),
+                                    ("14th ordinalnamed-month<integer> (latent time-of-day)",
+                                     -2.5649493574615367),
+                                    ("monthhour", -1.8718021769015913),
+                                    ("second ordinalnamed-daynamed-month", -2.9704144655697013),
+                                    ("third ordinalnamed-dayon <date>", -2.9704144655697013),
+                                    ("first ordinalnamed-daynamed-month", -2.9704144655697013),
                                     ("ordinal (digits)named-month<integer> (latent time-of-day)",
-                                     -1.9095425048844386)],
-                               n = 5}}),
+                                     -2.277267285009756),
+                                    ("second ordinalnamed-dayon <date>", -2.9704144655697013)],
+                               n = 11}}),
        ("<ordinal> (as hour)",
         Classifier{okData =
                      ClassData{prior = -0.5773153650348236, unseen = -4.454347296253507,
@@ -381,242 +385,235 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
-                                    ("quarter", -0.8472978603872037),
-                                    ("third ordinalquarter (grain)", -1.252762968495368)],
-                               n = 2},
+                                   [("quarter", -0.916290731874155),
+                                    ("third ordinalquarter (grain)", -0.916290731874155)],
+                               n = 1},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.6931471805599453, unseen = -1.791759469228055,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -0.916290731874155),
+                                    ("quarter", -0.916290731874155)],
+                               n = 1}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.8131499729546416, unseen = -6.302618975744905,
+                     ClassData{prior = -0.7908468477616516, unseen = -6.249975242259483,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -5.202173505995134),
+                                     -5.149430585840319),
                                     ("mm/dd<time-of-day> popo\322udniu/wieczorem/w nocy",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("<hour-of-day> - <hour-of-day> (interval)on <date>",
-                                     -5.202173505995134),
-                                    ("named-daynamed-month", -4.6913478822291435),
+                                     -5.149430585840319),
+                                    ("named-daynamed-month", -4.638604962074329),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.202173505995134),
-                                    ("hourday", -3.8158791448752436),
-                                    ("dayhour", -2.6119063405493077),
-                                    ("daymonth", -3.8158791448752436),
+                                     -5.149430585840319),
+                                    ("hourday", -3.7631362247204287),
+                                    ("dayhour", -2.559163420394493),
+                                    ("daymonth", -3.7631362247204287),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyabsorption of , after named day",
-                                     -4.6913478822291435),
-                                    ("monthyear", -3.122731964315298),
+                                     -4.638604962074329),
+                                    ("monthyear", -3.0699890441604833),
                                     ("from <hour-of-day> - <hour-of-day> (interval)on a named-day",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("from <time-of-day> - <time-of-day> (interval)on a named-day",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("from <datetime> - <datetime> (interval)on a named-day",
-                                     -5.607638614103299),
-                                    ("at <time-of-day>intersect by \",\" 2", -5.202173505995134),
-                                    ("named-daylast <cycle>", -5.202173505995134),
-                                    ("named-day<time-of-day> rano", -5.607638614103299),
-                                    ("on a named-dayat <time-of-day>", -5.202173505995134),
-                                    ("at <time-of-day>named-day", -5.202173505995134),
-                                    ("at <time-of-day>on a named-day", -5.607638614103299),
-                                    ("<time> <part-of-day>on a named-day", -5.202173505995134),
-                                    ("on a named-day<time> <part-of-day>", -5.607638614103299),
-                                    ("last <day-of-week> of <time>year", -5.607638614103299),
-                                    ("today<time> <part-of-day>", -5.607638614103299),
-                                    ("todayat <time-of-day>", -5.607638614103299),
-                                    ("on <date>at <time-of-day>", -5.202173505995134),
-                                    ("dayday", -3.122731964315298),
-                                    ("on <date><time> <part-of-day>", -5.607638614103299),
-                                    ("intersect by \",\"hh:mm", -5.202173505995134),
-                                    ("mm/ddat <time-of-day>", -4.914491433543353),
-                                    ("last <cycle> <time>year", -4.6913478822291435),
+                                     -5.554895693948484),
+                                    ("at <time-of-day>intersect by \",\" 2", -5.149430585840319),
+                                    ("named-daylast <cycle>", -5.149430585840319),
+                                    ("named-day<time-of-day> rano", -5.554895693948484),
+                                    ("on a named-dayat <time-of-day>", -5.149430585840319),
+                                    ("at <time-of-day>named-day", -5.149430585840319),
+                                    ("at <time-of-day>on a named-day", -5.554895693948484),
+                                    ("<time> <part-of-day>on a named-day", -5.149430585840319),
+                                    ("on a named-day<time> <part-of-day>", -5.554895693948484),
+                                    ("last <day-of-week> of <time>year", -5.554895693948484),
+                                    ("today<time> <part-of-day>", -5.554895693948484),
+                                    ("todayat <time-of-day>", -5.554895693948484),
+                                    ("on <date>at <time-of-day>", -5.149430585840319),
+                                    ("dayday", -3.0699890441604833),
+                                    ("on <date><time> <part-of-day>", -5.554895693948484),
+                                    ("intersect by \",\"hh:mm", -5.149430585840319),
+                                    ("mm/ddat <time-of-day>", -4.861748513388538),
+                                    ("last <cycle> <time>year", -4.638604962074329),
                                     ("intersect<named-month> <day-of-month> (non ordinal)",
-                                     -4.914491433543353),
+                                     -4.861748513388538),
                                     ("intersect<day-of-month> (non ordinal) <named-month>",
-                                     -4.914491433543353),
-                                    ("dayyear", -3.122731964315298),
-                                    ("quarteryear", -5.607638614103299),
+                                     -4.861748513388538),
+                                    ("dayyear", -3.539992673406219),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -5.202173505995134),
+                                     -5.149430585840319),
                                     ("day-after-tomorrow (single-word)at <time-of-day>",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.103561217327025),
+                                     -4.05081829717221),
                                     ("tomorrow<time-of-day> popo\322udniu/wieczorem/w nocy",
-                                     -5.607638614103299),
-                                    ("named-monthyear", -3.467572450607028),
+                                     -5.554895693948484),
+                                    ("named-monthyear", -3.414829530452213),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.509026325435189),
-                                    ("tomorrowuntil <time-of-day>", -5.202173505995134),
+                                     -4.456283405280374),
+                                    ("tomorrowuntil <time-of-day>", -5.149430585840319),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.221344252983408),
-                                    ("named-dayin <duration>", -5.607638614103299),
-                                    ("last <day-of-week> <time>year", -5.202173505995134),
-                                    ("nth <time> of <time>year", -4.914491433543353),
-                                    ("<time-of-day> ranoon <date>", -5.202173505995134),
+                                     -4.168601332828593),
+                                    ("named-dayin <duration>", -5.554895693948484),
+                                    ("last <day-of-week> <time>year", -5.149430585840319),
+                                    ("<time-of-day> ranoon <date>", -5.149430585840319),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.221344252983408),
-                                    ("named-daynext <cycle>", -4.6913478822291435),
-                                    ("named-dayintersect", -5.202173505995134),
+                                     -4.168601332828593),
+                                    ("named-daynext <cycle>", -4.638604962074329),
+                                    ("named-dayintersect", -5.149430585840319),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.914491433543353),
-                                    ("on <date><time-of-day> rano", -5.607638614103299),
+                                     -4.861748513388538),
+                                    ("on <date><time-of-day> rano", -5.554895693948484),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocytomorrow",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -5.607638614103299),
-                                    ("dayminute", -4.103561217327025),
-                                    ("<ordinal> quarteryear", -5.607638614103299),
-                                    ("intersect by \",\" 2hh:mm", -4.6913478822291435),
-                                    ("<time-of-day> ranoon a named-day", -5.202173505995134),
+                                     -5.554895693948484),
+                                    ("dayminute", -4.05081829717221),
+                                    ("intersect by \",\" 2hh:mm", -4.638604962074329),
+                                    ("<time-of-day> ranoon a named-day", -5.149430585840319),
                                     ("from <hour-of-day> - <hour-of-day> (interval)on <date>",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -5.607638614103299),
-                                    ("intersectyear", -5.202173505995134),
-                                    ("on a named-day<time-of-day> rano", -5.607638614103299),
-                                    ("<ordinal> <cycle> of <time>year", -5.607638614103299),
-                                    ("minuteday", -2.5395856789696816),
-                                    ("nth <time> <time>year", -4.3548756456079305),
-                                    ("named-dayon <date>", -3.9982007016691985),
-                                    ("named-day<time> <part-of-day>", -4.6913478822291435),
-                                    ("named-dayat <time-of-day>", -5.202173505995134),
-                                    ("tomorrowexactly <time-of-day>", -4.914491433543353),
+                                     -5.554895693948484),
+                                    ("intersectyear", -5.149430585840319),
+                                    ("on a named-day<time-of-day> rano", -5.554895693948484),
+                                    ("<ordinal> <cycle> of <time>year", -5.554895693948484),
+                                    ("minuteday", -2.4868427588148667),
+                                    ("named-dayon <date>", -3.945457781514383),
+                                    ("named-day<time> <part-of-day>", -4.638604962074329),
+                                    ("named-dayat <time-of-day>", -5.149430585840319),
+                                    ("tomorrowexactly <time-of-day>", -4.861748513388538),
                                     ("at <time-of-day>absorption of , after named day",
-                                     -5.202173505995134),
-                                    ("at <time-of-day>on <date>", -5.607638614103299),
-                                    ("on <date>year", -4.221344252983408),
-                                    ("dayweek", -3.6617284650479855),
-                                    ("<time> <part-of-day>on <date>", -5.202173505995134),
-                                    ("weekyear", -4.3548756456079305),
+                                     -5.149430585840319),
+                                    ("at <time-of-day>on <date>", -5.554895693948484),
+                                    ("on <date>year", -4.168601332828593),
+                                    ("dayweek", -3.6089855448931707),
+                                    ("<time> <part-of-day>on <date>", -5.149430585840319),
+                                    ("weekyear", -4.302132725453116),
                                     ("named-day<day-of-month>(ordinal) <named-month>",
-                                     -4.914491433543353),
-                                    ("<ordinal> <cycle> <time>year", -5.202173505995134),
+                                     -4.861748513388538),
+                                    ("<ordinal> <cycle> <time>year", -5.149430585840319),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect by \",\" 2",
-                                     -4.6913478822291435),
-                                    ("tomorrowat <time-of-day>", -5.607638614103299),
-                                    ("named-daythis <cycle>", -5.202173505995134),
-                                    ("tomorrow<time> <part-of-day>", -5.607638614103299),
+                                     -4.638604962074329),
+                                    ("tomorrowat <time-of-day>", -5.554895693948484),
+                                    ("named-daythis <cycle>", -5.149430585840319),
+                                    ("tomorrow<time> <part-of-day>", -5.554895693948484),
                                     ("<named-month> <day-of-month> (ordinal)year",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocynamed-day",
-                                     -4.6913478822291435),
-                                    ("tomorrow<time-of-day> rano", -5.607638614103299),
+                                     -4.638604962074329),
+                                    ("tomorrow<time-of-day> rano", -5.554895693948484),
                                     ("<datetime> - <datetime> (interval)on a named-day",
-                                     -5.202173505995134),
-                                    ("last <cycle> of <time>year", -5.202173505995134),
+                                     -5.149430585840319),
+                                    ("last <cycle> of <time>year", -5.149430585840319),
                                     ("<named-month> <day-of-month> (non ordinal)year",
-                                     -5.607638614103299),
+                                     -5.554895693948484),
                                     ("<time-of-day> - <time-of-day> (interval)on a named-day",
-                                     -5.202173505995134),
+                                     -5.149430585840319),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -5.202173505995134),
+                                     -5.149430585840319),
                                     ("<hour-of-day> - <hour-of-day> (interval)on a named-day",
-                                     -5.202173505995134)],
-                               n = 200},
+                                     -5.149430585840319)],
+                               n = 190},
                    koData =
-                     ClassData{prior = -0.5860144003708945, unseen = -6.473890696352274,
+                     ClassData{prior = -0.604148916367898, unseen = -6.39024066706535,
                                likelihoods =
                                  HashMap.fromList
                                    [("<ordinal> (as hour)<named-month> <day-of-month> (non ordinal)",
-                                     -4.6805868252728455),
-                                    ("<time-of-day> ranoby <time>", -5.7791991139409555),
-                                    ("intersect by \",\"named-month", -4.275121717164681),
-                                    ("named-daynamed-month", -5.373734005832791),
-                                    ("hourday", -2.861428381856676),
-                                    ("<time> <part-of-day>in <duration>", -5.08605193338101),
-                                    ("at <time-of-day>in <duration>", -5.7791991139409555),
-                                    ("dayhour", -3.1765094284965714),
-                                    ("daymonth", -3.381303841142585),
-                                    ("monthday", -5.373734005832791),
-                                    ("monthyear", -4.8629083820668),
+                                     -4.596801936317575),
+                                    ("<time-of-day> ranoby <time>", -5.695414224985685),
+                                    ("intersect by \",\"named-month", -4.19133682820941),
+                                    ("named-daynamed-month", -5.28994911687752),
+                                    ("hourday", -2.7776434929014053),
+                                    ("dayhour", -3.0927245395413006),
+                                    ("daymonth", -3.297518952187314),
+                                    ("monthday", -5.28994911687752),
+                                    ("monthyear", -4.77912349311153),
                                     ("named-month<hour-of-day> <integer> (as relative minutes)",
-                                     -5.7791991139409555),
-                                    ("at <time-of-day>intersect by \",\" 2", -5.7791991139409555),
-                                    ("houryear", -3.6391329504446843),
-                                    ("<time> <part-of-day>until <time-of-day>", -5.373734005832791),
-                                    ("<ordinal> (as hour)intersect", -3.2142497564794184),
-                                    ("monthhour", -4.6805868252728455),
+                                     -5.695414224985685),
+                                    ("at <time-of-day>intersect by \",\" 2", -5.695414224985685),
+                                    ("houryear", -3.5553480614894135),
+                                    ("<time> <part-of-day>until <time-of-day>", -5.28994911687752),
+                                    ("<ordinal> (as hour)intersect", -3.130464867524148),
+                                    ("monthhour", -4.596801936317575),
                                     ("<time> <part-of-day><time> <part-of-day>",
-                                     -4.392904752821065),
-                                    ("hourmonth", -2.15485818096459),
-                                    ("mm/ddat <time-of-day>", -5.7791991139409555),
-                                    ("hourhour", -4.8629083820668),
-                                    ("<time> <part-of-day>by <time>", -4.6805868252728455),
-                                    ("intersectnamed-month", -3.5279073153344602),
-                                    ("dayyear", -4.5264361454455875),
-                                    ("<time-of-day> ranoin <duration>", -5.373734005832791),
-                                    ("<time-of-day> ranoby the end of <time>", -5.7791991139409555),
+                                     -5.002267044425739),
+                                    ("hourmonth", -2.0710732920093196),
+                                    ("mm/ddat <time-of-day>", -5.695414224985685),
+                                    ("hourhour", -4.77912349311153),
+                                    ("<time> <part-of-day>by <time>", -5.695414224985685),
+                                    ("intersectnamed-month", -3.4441224263791894),
+                                    ("dayyear", -4.442651256490317),
+                                    ("<time-of-day> ranoby the end of <time>", -5.695414224985685),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -5.373734005832791),
-                                    ("intersect by \",\" 2named-month", -4.275121717164681),
-                                    ("monthminute", -5.373734005832791),
-                                    ("last <time>in <duration>", -5.7791991139409555),
-                                    ("minutemonth", -5.08605193338101),
-                                    ("named-monthyear", -4.8629083820668),
+                                     -5.28994911687752),
+                                    ("intersect by \",\" 2named-month", -4.19133682820941),
+                                    ("monthminute", -5.28994911687752),
+                                    ("minutemonth", -5.002267044425739),
+                                    ("named-monthyear", -4.77912349311153),
                                     ("absorption of , after named daynamed-month",
-                                     -4.392904752821065),
+                                     -4.309119863865794),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect by \",\"",
-                                     -5.373734005832791),
-                                    ("named-dayin <duration>", -5.7791991139409555),
-                                    ("after <time-of-day>at <time-of-day>", -5.7791991139409555),
-                                    ("hh:mmby the end of <time>", -5.7791991139409555),
-                                    ("<ordinal> (as hour)named-month", -3.1050504645144263),
-                                    ("daysecond", -4.8629083820668),
+                                     -5.28994911687752),
+                                    ("after <time-of-day>at <time-of-day>", -5.695414224985685),
+                                    ("hh:mmby the end of <time>", -5.695414224985685),
+                                    ("<ordinal> (as hour)named-month", -3.0212655755591555),
+                                    ("daysecond", -5.28994911687752),
                                     ("<time> <part-of-day>by the end of <time>",
-                                     -4.6805868252728455),
-                                    ("named-month<ordinal> (as hour)", -4.8629083820668),
-                                    ("<time> <part-of-day><time-of-day> rano", -5.7791991139409555),
+                                     -5.695414224985685),
+                                    ("named-month<ordinal> (as hour)", -4.77912349311153),
+                                    ("<time> <part-of-day><time-of-day> rano", -5.695414224985685),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -5.7791991139409555),
-                                    ("named-dayintersect", -4.169761201506855),
+                                     -5.695414224985685),
+                                    ("named-dayintersect", -4.085976312551584),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.7791991139409555),
-                                    ("<time-of-day> rano<time> <part-of-day>", -5.373734005832791),
-                                    ("at <time-of-day>intersect", -5.7791991139409555),
-                                    ("dayminute", -4.8629083820668),
+                                     -5.695414224985685),
+                                    ("<time-of-day> rano<time> <part-of-day>", -5.28994911687752),
+                                    ("at <time-of-day>intersect", -5.695414224985685),
+                                    ("dayminute", -5.28994911687752),
                                     ("<named-month> <day-of-month> (non ordinal)by <time>",
-                                     -5.373734005832791),
-                                    ("intersecton <date>", -4.392904752821065),
-                                    ("intersectyear", -3.381303841142585),
-                                    ("minuteday", -3.833288964885642),
-                                    ("absorption of , after named dayintersect",
-                                     -4.275121717164681),
-                                    ("<ordinal> (as hour)year", -5.7791991139409555),
-                                    ("named-dayon <date>", -4.8629083820668),
-                                    ("yearhh:mm", -5.7791991139409555),
-                                    ("hh:mmon <date>", -5.373734005832791),
+                                     -5.695414224985685),
+                                    ("intersecton <date>", -4.309119863865794),
+                                    ("intersectyear", -3.297518952187314),
+                                    ("minuteday", -3.7495040759303713),
+                                    ("absorption of , after named dayintersect", -4.19133682820941),
+                                    ("<ordinal> (as hour)year", -5.695414224985685),
+                                    ("named-dayon <date>", -4.77912349311153),
+                                    ("yearhh:mm", -5.695414224985685),
+                                    ("hh:mmon <date>", -5.28994911687752),
                                     ("absorption of , after named day<ordinal> (as hour)",
-                                     -4.275121717164681),
-                                    ("at <time-of-day>intersect by \",\"", -5.7791991139409555),
+                                     -4.19133682820941),
+                                    ("at <time-of-day>intersect by \",\"", -5.695414224985685),
                                     ("<named-month> <day-of-month> (non ordinal)by the end of <time>",
-                                     -5.373734005832791),
-                                    ("tomorrowexactly <time-of-day>", -5.7791991139409555),
-                                    ("hoursecond", -3.1765094284965714),
+                                     -5.695414224985685),
+                                    ("tomorrowexactly <time-of-day>", -5.695414224985685),
+                                    ("hoursecond", -4.19133682820941),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -5.373734005832791),
-                                    ("named-day<ordinal> (as hour)", -5.08605193338101),
-                                    ("<ordinal> (as hour)named-day", -4.275121717164681),
+                                     -5.28994911687752),
+                                    ("named-day<ordinal> (as hour)", -5.002267044425739),
+                                    ("<ordinal> (as hour)named-day", -4.19133682820941),
                                     ("named-monthrelative minutes to|till|before <integer> (hour-of-day)",
-                                     -5.7791991139409555),
+                                     -5.695414224985685),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -5.373734005832791),
-                                    ("intersectintersect", -4.5264361454455875),
-                                    ("hh:mmon a named-day", -5.373734005832791),
-                                    ("named-monthintersect", -5.7791991139409555),
+                                     -5.28994911687752),
+                                    ("intersectintersect", -4.442651256490317),
+                                    ("hh:mmon a named-day", -5.28994911687752),
+                                    ("named-monthintersect", -5.695414224985685),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect by \",\" 2",
-                                     -5.373734005832791),
-                                    ("hh:mmby <time>", -5.7791991139409555),
-                                    ("tomorrowat <time-of-day>", -5.7791991139409555),
-                                    ("minutesecond", -5.373734005832791),
+                                     -5.28994911687752),
+                                    ("hh:mmby <time>", -5.695414224985685),
+                                    ("tomorrowat <time-of-day>", -5.695414224985685),
+                                    ("minutesecond", -5.28994911687752),
                                     ("<time-of-day> popo\322udniu/wieczorem/w nocyintersect",
-                                     -5.373734005832791),
-                                    ("yearminute", -5.08605193338101)],
-                               n = 251}}),
+                                     -5.28994911687752),
+                                    ("yearminute", -5.002267044425739)],
+                               n = 229}}),
        ("half after|past <integer> (hour-of-day)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.6094379124341003,
@@ -799,12 +796,12 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.332204510175204,
+                     ClassData{prior = 0.0, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -7.696104113612832e-2),
-                                    ("one", -2.6026896854443837)],
-                               n = 25}}),
+                                   [("integer (numeric)", -8.004270767353637e-2),
+                                    ("one", -2.5649493574615367)],
+                               n = 24}}),
        ("mm/dd/yyyy",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.9459101490553135,
@@ -924,20 +921,24 @@ classifiers
                                n = 24}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.0910424533583156,
+                     ClassData{prior = -0.5596157879354228, unseen = -2.772588722239781,
                                likelihoods =
                                  HashMap.fromList
-                                   [("third ordinalnamed-daynamed-month", -2.3513752571634776),
-                                    ("second ordinalnamed-dayintersect", -2.3513752571634776),
-                                    ("daymonth", -0.9650808960435872),
-                                    ("second ordinalnamed-daynamed-month", -2.3513752571634776),
-                                    ("third ordinalnamed-dayintersect", -2.3513752571634776),
-                                    ("first ordinalnamed-daynamed-month", -1.9459101490553135),
-                                    ("first ordinalnamed-dayintersect", -2.3513752571634776)],
-                               n = 7},
+                                   [("second ordinalnamed-dayintersect", -2.0149030205422647),
+                                    ("daymonth", -1.0986122886681098),
+                                    ("third ordinalnamed-dayintersect", -2.0149030205422647),
+                                    ("first ordinalnamed-daynamed-month", -2.0149030205422647),
+                                    ("first ordinalnamed-dayintersect", -2.0149030205422647)],
+                               n = 4},
                    koData =
-                     ClassData{prior = -infinity, unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.8472978603872037, unseen = -2.639057329615259,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("third ordinalnamed-daynamed-month", -1.8718021769015913),
+                                    ("daymonth", -1.1786549963416462),
+                                    ("second ordinalnamed-daynamed-month", -1.8718021769015913),
+                                    ("first ordinalnamed-daynamed-month", -1.8718021769015913)],
+                               n = 3}}),
        ("named-month",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -4.51085950651685,
@@ -1177,20 +1178,21 @@ classifiers
                      ClassData{prior = -infinity, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.784189633918261,
+                     ClassData{prior = 0.0, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> <part-of-day>", -3.068052935133617),
-                                    ("<ordinal> (as hour)", -2.662587827025453),
-                                    ("year (latent)", -2.662587827025453),
-                                    ("<integer> (latent time-of-day)", -2.151762203259462),
-                                    ("day", -2.662587827025453), ("afternoon", -3.068052935133617),
-                                    ("year", -2.662587827025453), ("hh:mm", -3.068052935133617),
-                                    ("<day-of-month> (ordinal)", -2.662587827025453),
-                                    ("noon", -3.068052935133617),
-                                    ("<time-of-day> rano", -3.068052935133617),
-                                    ("hour", -1.363304842895192), ("minute", -3.068052935133617)],
-                               n = 15}}),
+                                   [("<time> <part-of-day>", -3.0204248861443626),
+                                    ("<ordinal> (as hour)", -2.6149597780361984),
+                                    ("year (latent)", -3.0204248861443626),
+                                    ("<integer> (latent time-of-day)", -2.1041341542702074),
+                                    ("day", -2.6149597780361984),
+                                    ("afternoon", -3.0204248861443626),
+                                    ("year", -3.0204248861443626), ("hh:mm", -3.0204248861443626),
+                                    ("<day-of-month> (ordinal)", -2.6149597780361984),
+                                    ("noon", -3.0204248861443626),
+                                    ("<time-of-day> rano", -3.0204248861443626),
+                                    ("hour", -1.3156767939059373), ("minute", -3.0204248861443626)],
+                               n = 14}}),
        ("seventh ordinal",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1570,24 +1572,24 @@ classifiers
                                n = 5}}),
        ("last <time>",
         Classifier{okData =
-                     ClassData{prior = -1.6582280766035324, unseen = -2.890371757896165,
+                     ClassData{prior = -1.6094379124341003, unseen = -2.833213344056216,
                                likelihoods =
                                  HashMap.fromList
-                                   [("day", -1.2237754316221157),
-                                    ("named-day", -1.2237754316221157)],
+                                   [("day", -1.1631508098056809),
+                                    ("named-day", -1.1631508098056809)],
                                n = 4},
                    koData =
-                     ClassData{prior = -0.2113090936672069, unseen = -3.784189633918261,
+                     ClassData{prior = -0.2231435513142097, unseen = -3.713572066704308,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time-of-day> o'clock", -2.662587827025453),
-                                    ("intersect", -2.151762203259462),
-                                    ("year (latent)", -2.151762203259462),
-                                    ("<integer> (latent time-of-day)", -2.151762203259462),
-                                    ("day", -1.8152899666382492), ("year", -2.151762203259462),
-                                    ("named-day", -2.374905754573672),
-                                    ("hour", -1.8152899666382492), ("minute", -3.068052935133617)],
-                               n = 17}}),
+                                   [("<time-of-day> o'clock", -2.5902671654458267),
+                                    ("intersect", -2.3025850929940455),
+                                    ("year (latent)", -2.0794415416798357),
+                                    ("<integer> (latent time-of-day)", -2.0794415416798357),
+                                    ("day", -1.742969305058623), ("year", -2.0794415416798357),
+                                    ("named-day", -2.3025850929940455),
+                                    ("hour", -1.742969305058623)],
+                               n = 16}}),
        ("sixth ordinal",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1793,20 +1795,21 @@ classifiers
                      ClassData{prior = -infinity, unseen = -2.639057329615259,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -3.784189633918261,
+                     ClassData{prior = 0.0, unseen = -3.7376696182833684,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> <part-of-day>", -3.068052935133617),
-                                    ("<ordinal> (as hour)", -2.662587827025453),
-                                    ("year (latent)", -2.662587827025453),
-                                    ("<integer> (latent time-of-day)", -2.151762203259462),
-                                    ("day", -2.662587827025453), ("afternoon", -3.068052935133617),
-                                    ("year", -2.662587827025453), ("hh:mm", -3.068052935133617),
-                                    ("<day-of-month> (ordinal)", -2.662587827025453),
-                                    ("noon", -3.068052935133617),
-                                    ("<time-of-day> rano", -3.068052935133617),
-                                    ("hour", -1.363304842895192), ("minute", -3.068052935133617)],
-                               n = 15}}),
+                                   [("<time> <part-of-day>", -3.0204248861443626),
+                                    ("<ordinal> (as hour)", -2.6149597780361984),
+                                    ("year (latent)", -3.0204248861443626),
+                                    ("<integer> (latent time-of-day)", -2.1041341542702074),
+                                    ("day", -2.6149597780361984),
+                                    ("afternoon", -3.0204248861443626),
+                                    ("year", -3.0204248861443626), ("hh:mm", -3.0204248861443626),
+                                    ("<day-of-month> (ordinal)", -2.6149597780361984),
+                                    ("noon", -3.0204248861443626),
+                                    ("<time-of-day> rano", -3.0204248861443626),
+                                    ("hour", -1.3156767939059373), ("minute", -3.0204248861443626)],
+                               n = 14}}),
        ("in <duration>",
         Classifier{okData =
                      ClassData{prior = -0.2231435513142097, unseen = -4.0943445622221,
diff --git a/Duckling/Ranking/Classifiers/SV.hs b/Duckling/Ranking/Classifiers/SV.hs
index 7ea7da80..19dbe4bc 100644
--- a/Duckling/Ranking/Classifiers/SV.hs
+++ b/Duckling/Ranking/Classifiers/SV.hs
@@ -66,169 +66,161 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect2",
         Classifier{okData =
-                     ClassData{prior = -0.5441620440335825, unseen = -6.100318952020064,
+                     ClassData{prior = -0.4889316391312544, unseen = -5.991464547107982,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.306314812938186),
+                                     -4.197201947661808),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.306314812938186),
-                                    ("hourday", -5.404927101606295), ("dayhour", -3.1536353029998),
-                                    ("daymonth", -2.664087077681094),
-                                    ("monthyear", -3.264860938110024),
-                                    ("named-daylast <cycle>", -5.404927101606295),
-                                    ("the <day-of-month> (ordinal)named-month", -4.018632740486404),
+                                     -4.197201947661808),
+                                    ("hourday", -5.295814236329918),
+                                    ("dayhour", -3.044522437723423),
+                                    ("daymonth", -2.7700855920216627),
+                                    ("monthyear", -3.2809112157876537),
+                                    ("named-daylast <cycle>", -5.295814236329918),
+                                    ("the <day-of-month> (ordinal)named-month",
+                                     -3.9095198752100275),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.99946199349813),
-                                    ("intersect2hh:mm", -4.99946199349813),
-                                    ("last <day-of-week> of <time>year", -5.404927101606295),
-                                    ("todayat <time-of-day>", -4.99946199349813),
-                                    ("dayday", -2.664087077681094),
-                                    ("dd/mmat <time-of-day>", -4.48863636973214),
-                                    ("intersect by \",\"hh:mm", -4.48863636973214),
+                                     -4.890349128221754),
+                                    ("intersect2hh:mm", -4.890349128221754),
+                                    ("last <day-of-week> of <time>year", -5.295814236329918),
+                                    ("todayat <time-of-day>", -4.890349128221754),
+                                    ("dayday", -2.5549742124047174),
+                                    ("dd/mmat <time-of-day>", -4.379523504455763),
+                                    ("intersect by \",\"hh:mm", -4.379523504455763),
                                     ("named-day<named-month> <day-of-month> (ordinal)",
-                                     -5.404927101606295),
-                                    ("intersectnamed-month", -4.99946199349813),
-                                    ("dayyear", -2.9200204518182944),
-                                    ("named-daythis <time>", -3.7954891891721947),
-                                    ("quarteryear", -4.99946199349813),
-                                    ("tomorrow<time-of-day> sharp", -4.99946199349813),
+                                     -5.295814236329918),
+                                    ("intersectnamed-month", -4.890349128221754),
+                                    ("dayyear", -3.349904087274605),
+                                    ("named-daythis <time>", -3.9095198752100275),
+                                    ("tomorrow<time-of-day> sharp", -4.890349128221754),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.48863636973214),
+                                     -4.379523504455763),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.711779921046349),
+                                     -4.602667055769973),
                                     ("absorption of , after named day<named-month> <day-of-month> (ordinal)",
-                                     -4.306314812938186),
-                                    ("named-day<time> timezone", -4.711779921046349),
-                                    ("named-monthyear", -3.39002408106403),
+                                     -4.197201947661808),
+                                    ("named-day<time> timezone", -4.602667055769973),
+                                    ("named-monthyear", -3.2809112157876537),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.306314812938186),
-                                    ("on <date>named-month", -4.018632740486404),
-                                    ("tomorrowuntil <time-of-day>", -4.99946199349813),
+                                     -4.197201947661808),
+                                    ("on <date>named-month", -3.9095198752100275),
+                                    ("tomorrowuntil <time-of-day>", -4.890349128221754),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.711779921046349),
-                                    ("intersect2named-month", -4.99946199349813),
-                                    ("after <time-of-day>at <time-of-day>", -4.99946199349813),
+                                     -4.602667055769973),
+                                    ("intersect2named-month", -4.890349128221754),
+                                    ("after <time-of-day>at <time-of-day>", -4.890349128221754),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.99946199349813),
+                                     -4.890349128221754),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.404927101606295),
+                                     -5.295814236329918),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.404927101606295),
-                                    ("nth <time> of <time>year", -4.152164133110927),
+                                     -5.295814236329918),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.99946199349813),
-                                    ("named-daynext <cycle>", -5.404927101606295),
-                                    ("named-dayintersect", -4.48863636973214),
+                                     -4.890349128221754),
+                                    ("named-daynext <cycle>", -5.295814236329918),
+                                    ("named-dayintersect", -4.890349128221754),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.99946199349813),
-                                    ("tomorrowafter <time-of-day>", -4.99946199349813),
+                                     -4.890349128221754),
+                                    ("tomorrowafter <time-of-day>", -4.890349128221754),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.48863636973214),
-                                    ("dayminute", -3.1023420086122493),
-                                    ("<ordinal> quarteryear", -4.99946199349813),
+                                     -4.379523504455763),
+                                    ("dayminute", -2.9932291433358724),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.711779921046349),
-                                    ("intersectyear", -4.99946199349813),
-                                    ("<ordinal> <cycle> of <time>year", -4.99946199349813),
-                                    ("minuteday", -2.730778452179766),
+                                     -4.602667055769973),
+                                    ("<ordinal> <cycle> of <time>year", -4.890349128221754),
+                                    ("minuteday", -2.6216655869033896),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.404927101606295),
-                                    ("named-dayon <date>", -4.711779921046349),
-                                    ("named-dayat <time-of-day>", -4.99946199349813),
-                                    ("named-dayintersect2", -4.48863636973214),
+                                     -5.295814236329918),
+                                    ("named-dayon <date>", -4.602667055769973),
+                                    ("named-dayat <time-of-day>", -4.890349128221754),
+                                    ("named-dayintersect2", -4.890349128221754),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.404927101606295),
+                                     -5.295814236329918),
                                     ("absorption of , after named dayintersect by \",\"",
-                                     -4.99946199349813),
-                                    ("dd/mmyear", -4.99946199349813),
-                                    ("at <time-of-day>on <date>", -5.404927101606295),
+                                     -4.890349128221754),
+                                    ("dd/mmyear", -4.890349128221754),
+                                    ("at <time-of-day>on <date>", -5.295814236329918),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.404927101606295),
+                                     -5.295814236329918),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.404927101606295),
-                                    ("dayweek", -4.152164133110927),
-                                    ("intersect2year", -4.99946199349813),
+                                     -5.295814236329918),
+                                    ("dayweek", -4.04305126783455),
                                     ("intersect by \",\"<day-of-month>(ordinal) <named-month>",
-                                     -4.99946199349813),
-                                    ("weekyear", -4.48863636973214),
-                                    ("hh:mmtomorrow", -4.711779921046349),
+                                     -4.890349128221754),
+                                    ("weekyear", -4.379523504455763),
+                                    ("hh:mmtomorrow", -4.602667055769973),
                                     ("named-day<day-of-month>(ordinal) <named-month>",
-                                     -5.404927101606295),
-                                    ("tomorrowat <time-of-day>", -4.152164133110927),
-                                    ("named-daythis <cycle>", -4.711779921046349),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.404927101606295),
-                                    ("at <time-of-day>tomorrow", -4.99946199349813),
-                                    ("this <time>year", -4.99946199349813),
-                                    ("last <cycle> of <time>year", -4.48863636973214),
+                                     -5.295814236329918),
+                                    ("tomorrowat <time-of-day>", -4.04305126783455),
+                                    ("named-daythis <cycle>", -4.602667055769973),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.295814236329918),
+                                    ("at <time-of-day>tomorrow", -4.890349128221754),
+                                    ("last <cycle> of <time>year", -4.379523504455763),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.99946199349813)],
-                               n = 177},
+                                     -4.890349128221754)],
+                               n = 157},
                    koData =
-                     ClassData{prior = -0.8682815126877944,
-                               unseen = -5.8522024797744745,
+                     ClassData{prior = -0.9500575943449725, unseen = -5.648974238161206,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -5.156177599386914),
-                                    ("dayhour", -3.4514295071484886),
-                                    ("daymonth", -1.9575044818362326),
-                                    ("monthday", -3.6521002026106397),
-                                    ("monthyear", -3.076736057707078),
+                                   [("named-daynamed-month", -4.952299717083292),
+                                    ("dayhour", -3.247551624844867),
+                                    ("daymonth", -1.9318748309389298),
+                                    ("monthday", -3.448222320307018),
+                                    ("monthyear", -4.036008985209137),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.057565310718804),
-                                    ("hourmonth", -4.4630304188269685),
-                                    ("named-dayhh:mm", -5.156177599386914),
-                                    ("dayday", -4.750712491278749),
-                                    ("dd/mmat <time-of-day>", -4.239886867512759),
-                                    ("intersectnamed-month", -4.750712491278749),
-                                    ("dayyear", -2.9589530220506943),
-                                    ("named-daythis <time>", -3.016111435890643),
+                                     -3.8536874284151827),
+                                    ("hourmonth", -4.259152536523347),
+                                    ("named-dayhh:mm", -4.952299717083292),
+                                    ("dayday", -4.546834608975128),
+                                    ("dd/mmat <time-of-day>", -4.036008985209137),
+                                    ("intersectnamed-month", -4.546834608975128),
+                                    ("dayyear", -3.5660053559634015),
+                                    ("named-daythis <time>", -2.701007918476797),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.750712491278749),
-                                    ("minutemonth", -4.750712491278749),
-                                    ("named-monthyear", -4.239886867512759),
-                                    ("on <date>named-month", -4.750712491278749),
+                                     -4.546834608975128),
+                                    ("minutemonth", -4.546834608975128),
+                                    ("named-monthyear", -4.036008985209137),
+                                    ("on <date>named-month", -4.546834608975128),
                                     ("absorption of , after named daynamed-month",
-                                     -4.057565310718804),
-                                    ("intersect2named-month", -4.750712491278749),
+                                     -3.8536874284151827),
+                                    ("intersect2named-month", -4.546834608975128),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -3.903414630891546),
-                                    ("named-dayintersect", -3.7698832382670235),
+                                     -3.6995367485879243),
+                                    ("named-dayintersect", -4.546834608975128),
                                     ("named-month<day-of-month>(ordinal) <named-month>",
-                                     -4.239886867512759),
+                                     -4.036008985209137),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.750712491278749),
+                                     -4.546834608975128),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.156177599386914),
-                                    ("yearmonth", -5.156177599386914),
-                                    ("until <time-of-day>on <date>", -5.156177599386914),
+                                     -4.952299717083292),
+                                    ("yearmonth", -4.952299717083292),
+                                    ("until <time-of-day>on <date>", -4.952299717083292),
                                     ("<named-month> <day-of-month> (ordinal)named-month",
-                                     -4.239886867512759),
-                                    ("dayminute", -3.5467396869528134),
-                                    ("intersectyear", -4.057565310718804),
-                                    ("minuteday", -3.6521002026106397),
+                                     -4.036008985209137),
+                                    ("dayminute", -3.342861804649192),
+                                    ("minuteday", -3.448222320307018),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.156177599386914),
-                                    ("named-dayon <date>", -4.750712491278749),
-                                    ("named-dayat <time-of-day>", -4.239886867512759),
-                                    ("named-dayintersect2", -3.7698832382670235),
-                                    ("yearhh:mm", -5.156177599386914),
-                                    ("hh:mmon <date>", -3.7698832382670235),
+                                     -4.952299717083292),
+                                    ("named-dayon <date>", -4.546834608975128),
+                                    ("named-dayat <time-of-day>", -4.036008985209137),
+                                    ("named-dayintersect2", -4.546834608975128),
+                                    ("yearhh:mm", -4.952299717083292),
+                                    ("hh:mmon <date>", -3.5660053559634015),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.750712491278749),
+                                     -4.546834608975128),
                                     ("<day-of-month>(ordinal) <named-month> yearnamed-month",
-                                     -4.239886867512759),
+                                     -4.036008985209137),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.239886867512759),
+                                     -4.036008985209137),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.239886867512759),
-                                    ("intersect2year", -4.057565310718804),
+                                     -4.036008985209137),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.750712491278749),
-                                    ("this <time>year", -3.364418130158859),
-                                    ("minuteyear", -4.750712491278749),
-                                    ("yearminute", -4.4630304188269685)],
-                               n = 128}}),
+                                     -4.546834608975128),
+                                    ("minuteyear", -4.546834608975128),
+                                    ("yearminute", -4.259152536523347)],
+                               n = 99}}),
        ("<time> <part-of-day>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.639057329615259,
@@ -419,16 +411,22 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("<ordinal> quarter",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                     ClassData{prior = -0.5108256237659907,
+                               unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("ordinal (digits)quarter (grain)", -1.1786549963416462),
-                                    ("quarter", -0.7731898882334817),
-                                    ("ordinals (first..31st)quarter (grain)", -1.466337068793427)],
-                               n = 5},
+                                   [("ordinal (digits)quarter (grain)", -1.0986122886681098),
+                                    ("quarter", -0.8109302162163288),
+                                    ("ordinals (first..31st)quarter (grain)", -1.5040773967762742)],
+                               n = 3},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -0.916290731874155, unseen = -2.0794415416798357,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("ordinal (digits)quarter (grain)", -1.252762968495368),
+                                    ("quarter", -0.8472978603872037),
+                                    ("ordinals (first..31st)quarter (grain)", -1.252762968495368)],
+                               n = 2}}),
        ("Last year",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.0986122886681098,
@@ -438,167 +436,158 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -0.560460739400987, unseen = -6.061456918928017,
+                     ClassData{prior = -0.505442030682518, unseen = -5.948034989180646,
                                likelihoods =
                                  HashMap.fromList
                                    [("<datetime> - <datetime> (interval)on <date>",
-                                     -4.267363726353742),
+                                     -4.15366113937852),
                                     ("<time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.267363726353742),
-                                    ("hourday", -5.365976015021851),
-                                    ("dayhour", -3.1146842164153563),
-                                    ("daymonth", -2.6251359910966507),
-                                    ("monthyear", -3.225909851525581),
-                                    ("named-daylast <cycle>", -5.365976015021851),
-                                    ("the <day-of-month> (ordinal)named-month", -3.979681653901961),
+                                     -4.15366113937852),
+                                    ("hourday", -5.25227342804663),
+                                    ("dayhour", -3.0009816294401346),
+                                    ("daymonth", -2.7265447837383743),
+                                    ("monthyear", -3.237370407504365),
+                                    ("named-daylast <cycle>", -5.25227342804663),
+                                    ("the <day-of-month> (ordinal)named-month", -3.865979066926739),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.9605109069136875),
-                                    ("intersect2hh:mm", -4.9605109069136875),
-                                    ("last <day-of-week> of <time>year", -5.365976015021851),
-                                    ("todayat <time-of-day>", -4.9605109069136875),
-                                    ("dayday", -2.923628979652647),
-                                    ("dd/mmat <time-of-day>", -4.449685283147696),
-                                    ("intersect by \",\"hh:mm", -4.449685283147696),
+                                     -4.846808319938465),
+                                    ("intersect2hh:mm", -4.846808319938465),
+                                    ("last <day-of-week> of <time>year", -5.25227342804663),
+                                    ("todayat <time-of-day>", -4.846808319938465),
+                                    ("dayday", -2.8099263926774256),
+                                    ("dd/mmat <time-of-day>", -4.335982696172475),
+                                    ("intersect by \",\"hh:mm", -4.335982696172475),
                                     ("named-day<named-month> <day-of-month> (ordinal)",
-                                     -5.365976015021851),
-                                    ("intersectnamed-month", -4.9605109069136875),
-                                    ("dayyear", -2.8810693652338513),
-                                    ("named-daythis <time>", -3.756538102587751),
-                                    ("quarteryear", -4.9605109069136875),
-                                    ("tomorrow<time-of-day> sharp", -4.9605109069136875),
+                                     -5.25227342804663),
+                                    ("intersectnamed-month", -4.846808319938465),
+                                    ("dayyear", -3.3063632789913164),
+                                    ("named-daythis <time>", -3.865979066926739),
+                                    ("tomorrow<time-of-day> sharp", -4.846808319938465),
                                     ("<day-of-month>(ordinal) <named-month>year",
-                                     -4.449685283147696),
+                                     -4.335982696172475),
                                     ("absorption of , after named day<day-of-month>(ordinal) <named-month>",
-                                     -4.9605109069136875),
+                                     -4.846808319938465),
                                     ("absorption of , after named day<named-month> <day-of-month> (ordinal)",
-                                     -4.672828834461907),
-                                    ("named-day<time> timezone", -4.672828834461907),
-                                    ("named-monthyear", -3.351072994479587),
+                                     -4.5591262474866845),
+                                    ("named-day<time> timezone", -4.5591262474866845),
+                                    ("named-monthyear", -3.237370407504365),
                                     ("absorption of , after named day<named-month> <day-of-month> (non ordinal)",
-                                     -4.672828834461907),
-                                    ("on <date>named-month", -3.979681653901961),
-                                    ("tomorrowuntil <time-of-day>", -4.9605109069136875),
+                                     -4.5591262474866845),
+                                    ("on <date>named-month", -3.865979066926739),
+                                    ("tomorrowuntil <time-of-day>", -4.846808319938465),
                                     ("absorption of , after named day<day-of-month> (non ordinal) <named-month>",
-                                     -4.9605109069136875),
-                                    ("intersect2named-month", -4.9605109069136875),
-                                    ("after <time-of-day>at <time-of-day>", -4.9605109069136875),
+                                     -4.846808319938465),
+                                    ("intersect2named-month", -4.846808319938465),
+                                    ("after <time-of-day>at <time-of-day>", -4.846808319938465),
                                     ("intersect by \",\"<day-of-month> (non ordinal) <named-month>",
-                                     -4.9605109069136875),
+                                     -4.846808319938465),
                                     ("named-day<day-of-month> (non ordinal) <named-month>",
-                                     -5.365976015021851),
+                                     -5.25227342804663),
                                     ("named-day<named-month> <day-of-month> (non ordinal)",
-                                     -5.365976015021851),
-                                    ("nth <time> of <time>year", -4.113213046526484),
+                                     -5.25227342804663),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.9605109069136875),
-                                    ("named-daynext <cycle>", -5.365976015021851),
-                                    ("named-dayintersect", -4.449685283147696),
+                                     -4.846808319938465),
+                                    ("named-daynext <cycle>", -5.25227342804663),
+                                    ("named-dayintersect", -4.846808319938465),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -4.9605109069136875),
-                                    ("tomorrowafter <time-of-day>", -4.9605109069136875),
+                                     -4.846808319938465),
+                                    ("tomorrowafter <time-of-day>", -4.846808319938465),
                                     ("from <time-of-day> - <time-of-day> (interval)on <date>",
-                                     -4.449685283147696),
-                                    ("dayminute", -3.0633909220278057),
-                                    ("<ordinal> quarteryear", -4.9605109069136875),
+                                     -4.335982696172475),
+                                    ("dayminute", -2.949688335052584),
                                     ("from <datetime> - <datetime> (interval)on <date>",
-                                     -4.672828834461907),
-                                    ("intersectyear", -4.9605109069136875),
-                                    ("<ordinal> <cycle> of <time>year", -4.9605109069136875),
-                                    ("minuteday", -2.691827365595323),
+                                     -4.5591262474866845),
+                                    ("<ordinal> <cycle> of <time>year", -4.846808319938465),
+                                    ("minuteday", -2.578124778620101),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.365976015021851),
-                                    ("named-dayon <date>", -4.672828834461907),
-                                    ("named-dayat <time-of-day>", -4.9605109069136875),
-                                    ("named-dayintersect2", -4.449685283147696),
+                                     -5.25227342804663),
+                                    ("named-dayon <date>", -4.5591262474866845),
+                                    ("named-dayat <time-of-day>", -4.846808319938465),
+                                    ("named-dayintersect2", -4.846808319938465),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -5.365976015021851),
-                                    ("dd/mmyear", -4.9605109069136875),
-                                    ("at <time-of-day>on <date>", -5.365976015021851),
+                                     -5.25227342804663),
+                                    ("dd/mmyear", -4.846808319938465),
+                                    ("at <time-of-day>on <date>", -5.25227342804663),
                                     ("between <time-of-day> and <time-of-day> (interval)on <date>",
-                                     -5.365976015021851),
+                                     -5.25227342804663),
                                     ("between <datetime> and <datetime> (interval)on <date>",
-                                     -5.365976015021851),
-                                    ("dayweek", -4.113213046526484),
-                                    ("intersect2year", -4.9605109069136875),
+                                     -5.25227342804663),
+                                    ("dayweek", -3.999510459551262),
                                     ("intersect by \",\"<day-of-month>(ordinal) <named-month>",
-                                     -4.9605109069136875),
-                                    ("weekyear", -4.449685283147696),
-                                    ("hh:mmtomorrow", -4.672828834461907),
+                                     -4.846808319938465),
+                                    ("weekyear", -4.335982696172475),
+                                    ("hh:mmtomorrow", -4.5591262474866845),
                                     ("named-day<day-of-month>(ordinal) <named-month>",
-                                     -5.365976015021851),
-                                    ("tomorrowat <time-of-day>", -4.113213046526484),
-                                    ("named-daythis <cycle>", -4.672828834461907),
-                                    ("named-daythe <day-of-month> (ordinal)", -5.365976015021851),
-                                    ("at <time-of-day>tomorrow", -4.9605109069136875),
-                                    ("this <time>year", -4.9605109069136875),
-                                    ("last <cycle> of <time>year", -4.449685283147696),
+                                     -5.25227342804663),
+                                    ("tomorrowat <time-of-day>", -3.999510459551262),
+                                    ("named-daythis <cycle>", -4.5591262474866845),
+                                    ("named-daythe <day-of-month> (ordinal)", -5.25227342804663),
+                                    ("at <time-of-day>tomorrow", -4.846808319938465),
+                                    ("last <cycle> of <time>year", -4.335982696172475),
                                     ("<day-of-month> (non ordinal) <named-month>year",
-                                     -4.9605109069136875)],
-                               n = 169},
+                                     -4.846808319938465)],
+                               n = 149},
                    koData =
-                     ClassData{prior = -0.8461723678654691, unseen = -5.84354441703136,
+                     ClassData{prior = -0.9244208579574053, unseen = -5.638354669333745,
                                likelihoods =
                                  HashMap.fromList
-                                   [("named-daynamed-month", -5.147494476813453),
-                                    ("dayhour", -3.442746384575028),
-                                    ("daymonth", -1.9488213592627717),
-                                    ("monthday", -3.643417080037179),
-                                    ("monthyear", -3.068052935133617),
+                                   [("named-daynamed-month", -4.941642422609305),
+                                    ("dayhour", -3.236894330370879),
+                                    ("daymonth", -1.9212175364649418),
+                                    ("monthday", -3.43756502583303),
+                                    ("monthyear", -4.02535169073515),
                                     ("intersect by \"of\", \"from\", \"'s\"year",
-                                     -4.048882188145344),
-                                    ("hourmonth", -4.454347296253507),
-                                    ("named-dayhh:mm", -5.147494476813453),
-                                    ("dayday", -5.147494476813453),
-                                    ("dd/mmat <time-of-day>", -4.231203744939298),
-                                    ("intersectnamed-month", -4.742029368705289),
-                                    ("dayyear", -2.9502698994772336),
-                                    ("named-daythis <time>", -3.0074283133171824),
+                                     -3.8430301339411947),
+                                    ("hourmonth", -4.248495242049359),
+                                    ("named-dayhh:mm", -4.941642422609305),
+                                    ("dayday", -4.941642422609305),
+                                    ("dd/mmat <time-of-day>", -4.02535169073515),
+                                    ("intersectnamed-month", -4.53617731450114),
+                                    ("dayyear", -3.5553480614894135),
+                                    ("named-daythis <time>", -2.6903506240028094),
                                     ("year<hour-of-day> <integer> (as relative minutes)",
-                                     -4.742029368705289),
-                                    ("minutemonth", -4.742029368705289),
-                                    ("named-monthyear", -4.231203744939298),
-                                    ("on <date>named-month", -4.742029368705289),
+                                     -4.53617731450114),
+                                    ("minutemonth", -4.53617731450114),
+                                    ("named-monthyear", -4.02535169073515),
+                                    ("on <date>named-month", -4.53617731450114),
                                     ("absorption of , after named daynamed-month",
-                                     -4.048882188145344),
-                                    ("intersect2named-month", -4.742029368705289),
+                                     -3.8430301339411947),
+                                    ("intersect2named-month", -4.53617731450114),
                                     ("named-dayfrom <datetime> - <datetime> (interval)",
-                                     -4.048882188145344),
-                                    ("named-dayintersect", -3.7612001156935624),
+                                     -3.8430301339411947),
+                                    ("named-dayintersect", -4.53617731450114),
                                     ("named-month<day-of-month>(ordinal) <named-month>",
-                                     -4.231203744939298),
+                                     -4.02535169073515),
                                     ("<hour-of-day> <integer> (as relative minutes)named-month",
-                                     -4.742029368705289),
+                                     -4.53617731450114),
                                     ("named-dayfrom <time-of-day> - <time-of-day> (interval)",
-                                     -5.147494476813453),
-                                    ("yearmonth", -5.147494476813453),
-                                    ("until <time-of-day>on <date>", -5.147494476813453),
+                                     -4.941642422609305),
+                                    ("yearmonth", -4.941642422609305),
+                                    ("until <time-of-day>on <date>", -4.941642422609305),
                                     ("<named-month> <day-of-month> (ordinal)named-month",
-                                     -4.231203744939298),
-                                    ("dayminute", -3.5380565643793527),
-                                    ("intersectyear", -4.048882188145344),
-                                    ("minuteday", -3.643417080037179),
+                                     -4.02535169073515),
+                                    ("dayminute", -3.332204510175204),
+                                    ("minuteday", -3.43756502583303),
                                     ("named-daybetween <time-of-day> and <time-of-day> (interval)",
-                                     -5.147494476813453),
-                                    ("named-dayon <date>", -4.742029368705289),
-                                    ("named-dayat <time-of-day>", -4.231203744939298),
-                                    ("named-dayintersect2", -3.7612001156935624),
-                                    ("yearhh:mm", -5.147494476813453),
-                                    ("hh:mmon <date>", -3.7612001156935624),
+                                     -4.941642422609305),
+                                    ("named-dayon <date>", -4.53617731450114),
+                                    ("named-dayat <time-of-day>", -4.02535169073515),
+                                    ("named-dayintersect2", -4.53617731450114),
+                                    ("yearhh:mm", -4.941642422609305),
+                                    ("hh:mmon <date>", -3.5553480614894135),
                                     ("named-daybetween <datetime> and <datetime> (interval)",
-                                     -4.742029368705289),
+                                     -4.53617731450114),
                                     ("<day-of-month>(ordinal) <named-month> yearnamed-month",
-                                     -4.231203744939298),
+                                     -4.02535169073515),
                                     ("named-month<day-of-month> (non ordinal) <named-month>",
-                                     -4.231203744939298),
+                                     -4.02535169073515),
                                     ("<named-month> <day-of-month> (non ordinal)named-month",
-                                     -4.231203744939298),
-                                    ("intersect2year", -4.048882188145344),
+                                     -4.02535169073515),
                                     ("<hour-of-day> <integer> (as relative minutes)year",
-                                     -4.742029368705289),
-                                    ("this <time>year", -3.355735007585398),
-                                    ("minuteyear", -4.742029368705289),
-                                    ("yearminute", -4.454347296253507)],
-                               n = 127}}),
+                                     -4.53617731450114),
+                                    ("minuteyear", -4.53617731450114),
+                                    ("yearminute", -4.248495242049359)],
+                               n = 98}}),
        ("<ordinal> <cycle> of <time>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -785,20 +774,26 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("nth <time> of <time>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -3.8066624897703196,
+                     ClassData{prior = -0.35667494393873245,
+                               unseen = -3.4965075614664802,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -0.7396671961948381),
+                                   [("daymonth", -0.7576857016975165),
                                     ("ordinals (first..31st)named-dayintersect2",
-                                     -1.8382794848629478),
+                                     -1.5198257537444133),
                                     ("ordinals (first..31st)named-dayintersect",
-                                     -1.8382794848629478),
+                                     -1.5198257537444133),
                                     ("ordinals (first..31st)named-daynamed-month",
-                                     -1.5869650565820417)],
-                               n = 20},
+                                     -2.367123614131617)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [], n = 0}}),
+                     ClassData{prior = -1.2039728043259361, unseen = -2.833213344056216,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("daymonth", -0.8266785731844679),
+                                    ("ordinals (first..31st)named-daynamed-month",
+                                     -0.8266785731844679)],
+                               n = 6}}),
        ("the <day-of-month> (non ordinal)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -1709,33 +1704,33 @@ classifiers
                                n = 10}}),
        ("this <time>",
         Classifier{okData =
-                     ClassData{prior = -1.270462545594769, unseen = -3.8501476017100584,
+                     ClassData{prior = -1.4039939382192916,
+                               unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.1354942159291497),
-                                    ("intersect2", -2.7300291078209855),
-                                    ("intersect", -2.7300291078209855),
-                                    ("season", -2.2192034840549946),
-                                    ("next <cycle>", -3.1354942159291497),
-                                    ("named-month", -2.2192034840549946),
-                                    ("day", -2.2192034840549946), ("hour", -2.4423470353692043),
-                                    ("month", -1.6314168191528755),
-                                    ("week-end", -2.4423470353692043)],
-                               n = 16},
+                                   [("week", -3.044522437723423),
+                                    ("intersect2", -2.639057329615259),
+                                    ("intersect", -2.639057329615259),
+                                    ("season", -2.128231705849268),
+                                    ("next <cycle>", -3.044522437723423),
+                                    ("named-month", -2.639057329615259),
+                                    ("day", -2.128231705849268), ("hour", -2.3513752571634776),
+                                    ("month", -1.791759469228055),
+                                    ("week-end", -2.3513752571634776)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -0.3294792011302423, unseen = -4.574710978503383,
+                     ClassData{prior = -0.2818511521409877, unseen = -4.61512051684126,
                                likelihoods =
                                  HashMap.fromList
-                                   [("intersect2", -2.0794415416798357),
-                                    ("intersect", -2.0794415416798357),
-                                    ("named-month", -1.8562979903656263),
-                                    ("day", -3.871201010907891),
-                                    ("time-of-day (latent)", -3.4657359027997265),
-                                    ("<day-of-month> (ordinal)", -3.871201010907891),
-                                    ("noon", -3.871201010907891), ("hour", -2.9549102790337356),
-                                    ("month", -0.9534302788236118),
-                                    ("morning", -3.871201010907891)],
-                               n = 41}}),
+                                   [("intersect2", -2.120263536200091),
+                                    ("intersect", -2.120263536200091),
+                                    ("named-month", -1.7719568419318752),
+                                    ("day", -3.912023005428146),
+                                    ("time-of-day (latent)", -3.506557897319982),
+                                    ("<day-of-month> (ordinal)", -3.912023005428146),
+                                    ("noon", -3.912023005428146), ("hour", -2.995732273553991),
+                                    ("month", -0.941608539858445), ("morning", -3.912023005428146)],
+                               n = 43}}),
        ("<named-month> <day-of-month> (ordinal)",
         Classifier{okData =
                      ClassData{prior = -0.4418327522790392, unseen = -3.044522437723423,
diff --git a/Duckling/Testing/Asserts.hs b/Duckling/Testing/Asserts.hs
index 5f319b1c..ca905524 100644
--- a/Duckling/Testing/Asserts.hs
+++ b/Duckling/Testing/Asserts.hs
@@ -11,6 +11,7 @@
 module Duckling.Testing.Asserts
   ( analyzedTargetTest
   , analyzedFirstTest
+  , analyzedNTest
   , analyzedNothingTest
   , makeCorpusTest
   , makeNegativeCorpusTest
@@ -74,7 +75,11 @@ makeNegativeCorpusTest targets (context, xs) = testCase "Negative Corpus Tests"
 
 analyzedNothingTest :: Context -> (Text, [Some Dimension]) -> IO ()
 analyzedNothingTest context (input, targets) =
-  assertBool msg . null $ tokens
+  analyzedNTest context (input, targets, 0)
+
+analyzedNTest :: Context -> (Text, [Some Dimension], Int) -> IO ()
+analyzedNTest context (input, targets, n) =
+  assertBool msg . (== n) $ length tokens
   where
     msg = "analyze " ++ show (input, targets)
           ++ "tokens= " ++ show tokens
diff --git a/Duckling/Time/EN/Tests.hs b/Duckling/Time/EN/Tests.hs
index 35245699..533d3568 100644
--- a/Duckling/Time/EN/Tests.hs
+++ b/Duckling/Time/EN/Tests.hs
@@ -35,6 +35,7 @@ tests = testGroup "EN Tests"
   , makeNegativeCorpusTest [Some Time] negativeCorpus
   , exactSecondTests
   , valuesTest
+  , intersectTests
   ]
 
 exactSecondTests :: TestTree
@@ -68,3 +69,11 @@ valuesTest = testCase "Values Test" $
     parseValuesSize x = length <$> parseValues x
     parseValues :: Value -> Maybe [Object]
     parseValues = parseMaybe $ withObject "value object" (.: "values")
+
+intersectTests :: TestTree
+intersectTests = testCase "Intersect Test" $
+  mapM_ (analyzedNTest testContext . withTargets [Some Time]) xs
+  where
+    xs = [ ("tomorrow July", 2)
+         , ("Mar tonight", 2)
+         ]
diff --git a/Duckling/Time/Helpers.hs b/Duckling/Time/Helpers.hs
index eaecc037..a0b90fff 100644
--- a/Duckling/Time/Helpers.hs
+++ b/Duckling/Time/Helpers.hs
@@ -113,10 +113,11 @@ takeN n notImmediate f = mkSeriesPredicate series
         else ([nth], [])
       Nothing -> ([], [])
     where
-      (past, future) = runPredicate f t context
+      baseTime = TTime.refTime context
+      (past, future) = runPredicate f baseTime context
       fut = case future of
         (ahead:rest)
-          | notImmediate && isJust (TTime.timeIntersect ahead t) -> rest
+          | notImmediate && isJust (TTime.timeIntersect ahead baseTime) -> rest
         _ -> future
       slot = if n >= 0
         then case fut of
@@ -142,10 +143,11 @@ takeNth n notImmediate f = mkSeriesPredicate series
         then ([], [nth])
         else ([nth], [])
     where
-      (past, future) = runPredicate f t context
+      baseTime = TTime.refTime context
+      (past, future) = runPredicate f baseTime context
       rest = if n >= 0
         then case future of
-          (ahead:_) | notImmediate && isJust (TTime.timeIntersect ahead t)
+          (ahead:_) | notImmediate && isJust (TTime.timeIntersect ahead baseTime)
             -> drop (n + 1) future
           _ -> drop n future
         else drop (- (n + 1)) past
diff --git a/Duckling/Time/IT/Corpus.hs b/Duckling/Time/IT/Corpus.hs
index b50a3857..8eaa3a30 100644
--- a/Duckling/Time/IT/Corpus.hs
+++ b/Duckling/Time/IT/Corpus.hs
@@ -688,12 +688,6 @@ allExamples = concat
              ]
   , examples (datetimeInterval ((2013, 2, 12, 11, 30, 0), (2013, 2, 12, 13, 31, 0)) Minute)
              [ "11:30-13:30"
-             , "11:30-13:30"
-             , "11:30-13:30"
-             , "11:30-13:30"
-             , "11:30-13:30"
-             , "11:30-13:30"
-             , "11:30-13:30"
              ]
   , examples (datetime (2013, 9, 21, 13, 30, 0) Minute)
              [ "13:30 di sabato 21 settembre"
diff --git a/Duckling/Time/IT/Rules.hs b/Duckling/Time/IT/Rules.hs
index 475019ec..8e0a41ae 100644
--- a/Duckling/Time/IT/Rules.hs
+++ b/Duckling/Time/IT/Rules.hs
@@ -281,7 +281,7 @@ ruleCycleTheOrdinalTime :: Rule
 ruleCycleTheOrdinalTime = Rule
   { name = "the <ordinal> <cycle> <time>"
   , pattern =
-    [ regex "the <ordinal> quarter"
+    [ regex "il|[nd]el(l')?|l'"
     , dimension Ordinal
     , dimension TimeGrain
     , dimension Time
@@ -1700,9 +1700,9 @@ ruleTraIlDatetimeEIlDatetimeInterval = Rule
   { name = "tra il <datetime> e il <datetime> (interval)"
   , pattern =
     [ regex "tra( il| l')?"
-    , Predicate isNotLatent
+    , Predicate isATimeOfDay
     , regex "e( il| l')?"
-    , Predicate isNotLatent
+    , Predicate isATimeOfDay
     ]
   , prod = \tokens -> case tokens of
       (_:Token Time td1:_:Token Time td2:_) ->
@@ -2314,7 +2314,7 @@ ruleProssimiUnitofduration = Rule
   , prod = \tokens -> case tokens of
       (_:Token TimeGrain grain:_) ->
         let from = cycleNth grain 1
-            to = cycleNth grain 2
+            to = cycleNth grain 3
         in Just . Token Time $ interval True (from, to)
       _ -> Nothing
   }