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

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

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

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

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

Reviewed By: haoxuany

Differential Revision: D32311714

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

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