diff --git a/Duckling/Ranking/Classifiers/PT_XX.hs b/Duckling/Ranking/Classifiers/PT_XX.hs
index dd06d1af..b7631aa7 100644
--- a/Duckling/Ranking/Classifiers/PT_XX.hs
+++ b/Duckling/Ranking/Classifiers/PT_XX.hs
@@ -103,11 +103,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (numeric)",
         Classifier{okData =
-                     ClassData{prior = -0.2212726433783981, unseen = -5.375278407684165,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 214},
+                     ClassData{prior = -0.23894721648733527,
+                               unseen = -5.429345628954441,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 226},
                    koData =
-                     ClassData{prior = -1.6169567448481277, unseen = -4.007333185232471,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 53}}),
+                     ClassData{prior = -1.5486083515863098, unseen = -4.143134726391533,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 61}}),
        ("the day before yesterday",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -1.3862943611198906,
@@ -117,8 +118,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hh(:|.|h)mm (time-of-day)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
+                     ClassData{prior = 0.0, unseen = -2.70805020110221,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 13},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -216,116 +217,123 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("intersect by `da` or `de`",
         Classifier{okData =
-                     ClassData{prior = -1.9564365620423008, unseen = -4.852030263919617,
+                     ClassData{prior = -1.9209712007080613, unseen = -4.912654885736052,
                                likelihoods =
                                  HashMap.fromList
-                                   [("daymonth", -3.0524276172305362),
-                                    ("dd-dd <month> de (interval)year", -4.151039905898646),
-                                    ("dayday", -3.457892725338701),
-                                    ("Quart-feira<cycle> (que vem)", -4.151039905898646),
-                                    ("dayyear", -2.07159836421881),
-                                    ("quarteryear", -4.151039905898646),
-                                    ("dd-dd <month>(interval)year", -4.151039905898646),
-                                    ("<ordinal> trimestreyear", -4.151039905898646),
+                                   [("daymonth", -2.959364629383116),
+                                    ("dd-dd <month> de (interval)year", -4.212127597878484),
+                                    ("dayday", -3.518980417318539),
+                                    ("Quart-feira<cycle> (que vem)", -4.212127597878484),
+                                    ("dayyear", -2.132686056198648),
+                                    ("quarteryear", -4.212127597878484),
+                                    ("dd-dd <month>(interval)year", -4.212127597878484),
+                                    ("<ordinal> trimestreyear", -4.212127597878484),
                                     ("<day-of-month> (ordinal or number) de <named-month>year",
-                                     -2.7647455447787554),
-                                    ("day of month (1st)Mar\231o", -3.457892725338701),
+                                     -2.8258332367585934),
+                                    ("day of month (1st)Mar\231o", -3.518980417318539),
+                                    ("dayminute", -4.212127597878484),
                                     ("two time tokens separated by \",\"2year",
-                                     -3.7455747977904816),
-                                    ("intersectyear", -4.151039905898646),
+                                     -3.8066624897703196),
+                                    ("intersectyear", -4.212127597878484),
                                     ("dia <day-of-month> (non ordinal)Fevereiro",
-                                     -3.7455747977904816),
+                                     -3.518980417318539),
                                     ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -4.151039905898646),
-                                    ("two time tokens separated by \",\"year", -3.7455747977904816),
-                                    ("Domingo<cycle> passado", -4.151039905898646),
-                                    ("dayweek", -3.457892725338701),
+                                     -4.212127597878484),
+                                    ("two time tokens separated by \",\"year", -3.8066624897703196),
+                                    ("Domingo<cycle> passado", -4.212127597878484),
+                                    ("dayweek", -3.518980417318539),
                                     ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"2",
-                                     -4.151039905898646),
+                                     -4.212127597878484),
                                     ("<day-of-month> (ordinal or number) de <named-month>intersect",
-                                     -4.151039905898646),
-                                    ("Quart-feiraproximo <cycle> ", -4.151039905898646),
+                                     -4.212127597878484),
+                                    ("Quart-feiraproximo <cycle> ", -4.212127597878484),
+                                    ("dia <day-of-month> (non ordinal)intersect",
+                                     -4.212127597878484),
                                     ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"",
-                                     -4.151039905898646)],
-                               n = 27},
+                                     -4.212127597878484)],
+                               n = 29},
                    koData =
-                     ClassData{prior = -0.15240700022243142,
-                               unseen = -5.996452088619021,
+                     ClassData{prior = -0.15836831577146182,
+                               unseen = -6.030685260261263,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)<datetime> - <datetime> (interval)",
-                                     -4.895349138638459),
-                                    ("hourday", -3.160748083250353),
-                                    ("year (latent)Abril", -4.895349138638459),
-                                    ("year (latent)Julho", -3.3549040976913105),
-                                    ("time-of-day (latent)Fevereiro", -4.048051278251256),
-                                    ("monthday", -4.6076670661866785),
-                                    ("monthyear", -3.5960661545081987),
-                                    ("yearhour", -3.914519885626733),
+                                     -4.929666231562589),
+                                    ("hourday", -3.195065176174482),
+                                    ("year (latent)Abril", -4.929666231562589),
+                                    ("year (latent)Julho", -3.3892211906154395),
+                                    ("dayhour", -5.3351313396707525),
+                                    ("time-of-day (latent)Fevereiro", -3.948836978550862),
+                                    ("monthday", -4.641984159110808),
+                                    ("monthyear", -3.6303832474323277),
+                                    ("yearhour", -3.8310539428944788),
                                     ("entre <datetime> e <datetime> (interval)Julho",
-                                     -3.6913763343125234),
-                                    ("houryear", -3.3549040976913105),
-                                    ("year (latent)Maio", -4.202201958078514),
+                                     -3.7256934272366524),
+                                    ("houryear", -3.3892211906154395),
+                                    ("year (latent)Maio", -4.236519051002643),
                                     ("time-of-day (latent)two time tokens separated by \",\"2",
-                                     -4.895349138638459),
-                                    ("Setembroyear", -4.202201958078514),
-                                    ("time-of-day (latent)Setembro", -4.202201958078514),
-                                    ("time-of-day (latent)intersect", -3.2859112262043593),
+                                     -4.929666231562589),
+                                    ("Setembroyear", -4.236519051002643),
+                                    ("time-of-day (latent)Setembro", -4.236519051002643),
+                                    ("time-of-day (latent)intersect", -3.3202283191284883),
                                     ("year (latent)<time-of-day> <part-of-day>",
-                                     -5.300814246746624),
-                                    ("\224s <time-of-day>Julho", -4.6076670661866785),
-                                    ("year (latent)intersect", -4.6076670661866785),
-                                    ("Setembrointersect", -5.300814246746624),
+                                     -5.3351313396707525),
+                                    ("\224s <time-of-day>Julho", -4.641984159110808),
+                                    ("year (latent)intersect", -4.236519051002643),
+                                    ("Setembrointersect", -5.3351313396707525),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -5.300814246746624),
+                                     -5.3351313396707525),
                                     ("year (latent)amanh\227 pela <part-of-day>",
-                                     -5.300814246746624),
-                                    ("hourmonth", -1.7598549227093099),
+                                     -5.3351313396707525),
+                                    ("hourmonth", -1.7797832781813394),
                                     ("time-of-day (latent)intersect by `da` or `de`",
-                                     -3.509054777518569),
-                                    ("monthmonth", -5.300814246746624),
+                                     -3.543371870442698),
+                                    ("monthmonth", -5.3351313396707525),
                                     ("Setembrotwo time tokens separated by \",\"2",
-                                     -5.300814246746624),
-                                    ("year (latent)Fevereiro", -4.048051278251256),
-                                    ("time-of-day (latent)Dezembro", -5.300814246746624),
-                                    ("dayyear", -5.300814246746624),
-                                    ("time-of-day (latent)Julho", -3.509054777518569),
-                                    ("time-of-day (latent)Abril", -4.895349138638459),
-                                    ("passado <cycle>year", -5.300814246746624),
-                                    ("year (latent)<dim time> da manha", -5.300814246746624),
+                                     -5.3351313396707525),
+                                    ("year (latent)Fevereiro", -3.948836978550862),
+                                    ("time-of-day (latent)Dezembro", -5.3351313396707525),
+                                    ("dayyear", -5.3351313396707525),
+                                    ("time-of-day (latent)Julho", -3.543371870442698),
+                                    ("time-of-day (latent)Abril", -4.929666231562589),
+                                    ("passado <cycle>year", -5.3351313396707525),
+                                    ("year (latent)<dim time> da manha", -5.3351313396707525),
                                     ("<day-of-month> (ordinal or number) de <named-month>year",
-                                     -5.300814246746624),
-                                    ("time-of-day (latent)Mar\231o", -4.202201958078514),
-                                    ("year (latent)Janeiro", -5.300814246746624),
-                                    ("year (latent)Dezembro", -5.300814246746624),
+                                     -5.3351313396707525),
+                                    ("time-of-day (latent)Mar\231o", -4.236519051002643),
+                                    ("year (latent)Janeiro", -5.3351313396707525),
+                                    ("year (latent)Dezembro", -5.3351313396707525),
                                     ("entre <datetime> e <datetime> (interval)Janeiro",
-                                     -5.300814246746624),
-                                    ("yearmonth", -2.1872989375362493),
-                                    ("two time tokens separated by \",\"2year", -4.895349138638459),
+                                     -5.3351313396707525),
+                                    ("yearmonth", -2.1996371237416033),
+                                    ("two time tokens separated by \",\"2year", -4.929666231562589),
                                     ("Setembrotwo time tokens separated by \",\"",
-                                     -5.300814246746624),
-                                    ("intersect by `da` or `de`intersect", -5.300814246746624),
-                                    ("intersectyear", -5.300814246746624),
+                                     -5.3351313396707525),
+                                    ("intersect by `da` or `de`intersect", -5.3351313396707525),
+                                    ("intersectyear", -5.3351313396707525),
                                     ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -5.300814246746624),
-                                    ("time-of-day (latent)Maio", -4.202201958078514),
-                                    ("antes das <time-of-day>Julho", -4.048051278251256),
-                                    ("Maioyear", -4.6076670661866785),
-                                    ("year (latent)Setembro", -4.202201958078514),
-                                    ("\224s <time-of-day>Janeiro", -5.300814246746624),
-                                    ("two time tokens separated by \",\"year", -4.895349138638459),
+                                     -5.3351313396707525),
+                                    ("time-of-day (latent)Maio", -4.236519051002643),
+                                    ("antes das <time-of-day>Julho", -4.082368371175385),
+                                    ("Maioyear", -4.641984159110808),
+                                    ("year (latent)Setembro", -4.236519051002643),
+                                    ("\224s <time-of-day>Janeiro", -5.3351313396707525),
+                                    ("two time tokens separated by \",\"year", -4.929666231562589),
                                     ("time-of-day (latent)two time tokens separated by \",\"",
-                                     -4.895349138638459),
-                                    ("intersect by `da` or `de`year", -3.7967368499703498),
+                                     -4.929666231562589),
+                                    ("intersect by `da` or `de`year", -3.8310539428944788),
                                     ("year (latent)<datetime> - <datetime> (interval)",
-                                     -4.895349138638459),
-                                    ("yearday", -5.300814246746624),
-                                    ("time-of-day (latent)Janeiro", -5.300814246746624),
-                                    ("Julhoyear", -5.300814246746624),
+                                     -4.929666231562589),
+                                    ("yearday", -5.3351313396707525),
+                                    ("time-of-day (latent)Janeiro", -5.3351313396707525),
+                                    ("dia <day-of-month> (non ordinal)intersect",
+                                     -5.3351313396707525),
+                                    ("Julhoyear", -5.3351313396707525),
                                     ("de <datetime> - <datetime> (interval)Julho",
-                                     -5.300814246746624),
-                                    ("year (latent)Mar\231o", -4.202201958078514)],
-                               n = 164}}),
+                                     -5.3351313396707525),
+                                    ("year (latent)Mar\231o", -4.236519051002643),
+                                    ("yearminute", -5.3351313396707525)],
+                               n = 169}}),
        ("<hour-of-day> and half",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.1354942159291497,
@@ -405,11 +413,11 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("integer (0..19)",
         Classifier{okData =
-                     ClassData{prior = -1.7699577099400975e-2,
-                               unseen = -4.060443010546419,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 56},
+                     ClassData{prior = -1.6529301951210582e-2,
+                               unseen = -4.127134385045092,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 60},
                    koData =
-                     ClassData{prior = -4.04305126783455, unseen = -1.0986122886681098,
+                     ClassData{prior = -4.110873864173311, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("desde <month> dd-dd (interval)",
         Classifier{okData =
@@ -425,44 +433,46 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<time-of-day> <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.3437715391028245, unseen = -4.61512051684126,
+                     ClassData{prior = -0.3639653772014116, unseen = -4.663439094112067,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> and quinzeafternoon", -2.995732273553991),
-                                    ("dayhour", -3.2188758248682006),
-                                    ("\224s <time-of-day>morning", -3.2188758248682006),
-                                    ("hourhour", -1.8325814637483102),
-                                    ("<hour-of-day> and halfafternoon", -2.995732273553991),
-                                    ("minutehour", -1.5141277326297755),
-                                    ("time-of-day (latent)morning", -3.2188758248682006),
-                                    ("time-of-day (latent)evening", -3.506557897319982),
-                                    ("\224s <time-of-day>afternoon", -2.3025850929940455),
+                                   [("<hour-of-day> and quinzeafternoon", -3.044522437723423),
+                                    ("dayhour", -3.2676659890376327),
+                                    ("\224s <time-of-day>morning", -3.2676659890376327),
+                                    ("intersectevening", -3.960813169597578),
+                                    ("hourhour", -1.7635885922613588),
+                                    ("<hour-of-day> and halfafternoon", -3.044522437723423),
+                                    ("minutehour", -1.5629178967992075),
+                                    ("time-of-day (latent)morning", -3.2676659890376327),
+                                    ("time-of-day (latent)evening", -3.5553480614894135),
+                                    ("\224s <time-of-day>afternoon", -2.3513752571634776),
                                     ("<day-of-month> (ordinal or number) de <named-month>morning",
-                                     -3.912023005428146),
+                                     -3.960813169597578),
                                     ("dia <day-of-month> de <named-month>morning",
-                                     -3.912023005428146),
-                                    ("time-of-day (latent)afternoon", -3.506557897319982),
+                                     -3.960813169597578),
+                                    ("time-of-day (latent)afternoon", -3.5553480614894135),
                                     ("<hour-of-day> and <relative minutes>afternoon",
-                                     -2.659260036932778),
-                                    ("intersectmorning", -3.912023005428146),
-                                    ("\224s <time-of-day>evening", -3.506557897319982),
-                                    ("intersect by `da` or `de`morning", -3.912023005428146)],
-                               n = 39},
+                                     -2.70805020110221),
+                                    ("intersectmorning", -3.960813169597578),
+                                    ("\224s <time-of-day>evening", -3.2676659890376327),
+                                    ("intersect by `da` or `de`morning", -3.960813169597578)],
+                               n = 41},
                    koData =
-                     ClassData{prior = -1.2347444629926898, unseen = -4.007333185232471,
+                     ClassData{prior = -1.1871656860095547, unseen = -4.0943445622221,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -1.5040773967762742),
-                                    ("monthhour", -2.890371757896165),
-                                    ("hourhour", -2.6026896854443837),
-                                    ("time-of-day (latent)morning", -3.295836866004329),
-                                    ("year (latent)afternoon", -2.1972245773362196),
-                                    ("Fevereiromorning", -3.295836866004329),
-                                    ("year (latent)evening", -2.890371757896165),
-                                    ("time-of-day (latent)afternoon", -2.890371757896165),
-                                    ("year (latent)morning", -2.379546134130174),
-                                    ("intersect by `da` or `de`morning", -3.295836866004329)],
-                               n = 16}}),
+                                   [("yearhour", -1.5125880864441827),
+                                    ("monthhour", -2.9789251552376097),
+                                    ("hourhour", -2.468099531471619),
+                                    ("time-of-day (latent)morning", -3.3843902633457743),
+                                    ("year (latent)afternoon", -2.2857779746776643),
+                                    ("time-of-day (latent)evening", -3.3843902633457743),
+                                    ("Fevereiromorning", -3.3843902633457743),
+                                    ("year (latent)evening", -2.691243082785829),
+                                    ("time-of-day (latent)afternoon", -2.9789251552376097),
+                                    ("year (latent)morning", -2.468099531471619),
+                                    ("intersect by `da` or `de`morning", -3.3843902633457743)],
+                               n = 18}}),
        ("de <datetime> - <datetime> (interval)",
         Classifier{okData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
@@ -520,17 +530,16 @@ classifiers
                                n = 108}}),
        ("<time-of-day> horas",
         Classifier{okData =
-                     ClassData{prior = -0.7731898882334817,
-                               unseen = -2.9444389791664407,
+                     ClassData{prior = -0.5306282510621704, unseen = -3.295836866004329,
                                likelihoods =
                                  HashMap.fromList
-                                   [("time-of-day (latent)", -1.5040773967762742),
-                                    ("hour", -0.9444616088408514),
-                                    ("depois das <time-of-day>", -1.791759469228055),
-                                    ("\224s <time-of-day>", -2.1972245773362196)],
-                               n = 6},
+                                   [("time-of-day (latent)", -1.466337068793427),
+                                    ("hour", -0.8602012652231115),
+                                    ("depois das <time-of-day>", -2.159484249353372),
+                                    ("\224s <time-of-day>", -1.8718021769015913)],
+                               n = 10},
                    koData =
-                     ClassData{prior = -0.6190392084062235, unseen = -3.044522437723423,
+                     ClassData{prior = -0.8873031950009028, unseen = -3.044522437723423,
                                likelihoods =
                                  HashMap.fromList
                                    [("time-of-day (latent)", -1.2039728043259361),
@@ -540,147 +549,172 @@ classifiers
                                n = 7}}),
        ("intersect",
         Classifier{okData =
-                     ClassData{prior = -1.2729656758128873, unseen = -5.288267030694535,
+                     ClassData{prior = -1.0287687153008453, unseen = -5.58724865840025,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dayhour", -2.5106150064982073),
-                                    ("nowquinze para as <hour-of-day> (as relative minutes)",
-                                     -4.590056548178043),
-                                    ("Quart-feiraamanh\227 pela <part-of-day>", -4.590056548178043),
-                                    ("now\224s <time-of-day>", -4.1845914400698785),
-                                    ("now<hour-of-day> and 3/4", -4.590056548178043),
-                                    ("Segunda-feirain the <part-of-day>", -4.590056548178043),
-                                    ("Quart-feira<time-of-day> <part-of-day>", -4.590056548178043),
-                                    ("yearSexta-feira", -4.590056548178043),
-                                    ("dayday", -3.0859791514017694),
-                                    ("hourhour", -4.590056548178043),
-                                    ("dayyear", -2.392831970841824),
-                                    ("de <year>Sexta-feira", -4.590056548178043),
-                                    ("quarteryear", -4.590056548178043),
-                                    ("minutehour", -3.337293579682675),
-                                    ("<hour-of-day> and quinzein the <part-of-day>",
-                                     -4.1845914400698785),
-                                    ("Sexta-feira<day-of-month> (ordinal or number) de <named-month>",
-                                     -4.590056548178043),
-                                    ("intersect by `da` or `de`in the <part-of-day>",
-                                     -4.1845914400698785),
-                                    ("<day-of-month> (ordinal or number) de <named-month>year",
-                                     -4.590056548178043),
-                                    ("now<hour-of-day> and <relative minutes>", -4.590056548178043),
-                                    ("tomorrow<time-of-day> horas", -4.1845914400698785),
-                                    ("dd-dd <month> de (interval)de <year>", -4.590056548178043),
-                                    ("now<integer> para as <hour-of-day> (as relative minutes)",
-                                     -4.590056548178043),
-                                    ("\224s <time-of-day>in the <part-of-day>", -3.896909367618098),
-                                    ("Sexta-feiraintersect", -4.590056548178043),
-                                    ("dayminute", -3.337293579682675),
-                                    ("<ordinal> trimestrede <year>", -4.590056548178043),
-                                    ("<day-of-month> (ordinal or number) de <named-month>de <year>",
-                                     -3.2037621870581527),
-                                    ("intersectSexta-feira", -4.590056548178043),
-                                    ("dd-dd <month>(interval)de <year>", -4.590056548178043),
-                                    ("Sexta-feiraintersect by `da` or `de`", -4.590056548178043),
-                                    ("<day-of-month> (ordinal or number) <named-month>year",
-                                     -4.590056548178043),
-                                    ("intersect by `da` or `de`Sexta-feira", -4.590056548178043),
-                                    ("<day-of-month> (ordinal or number) de <named-month>in the <part-of-day>",
-                                     -4.1845914400698785),
-                                    ("dia <day-of-month> de <named-month>in the <part-of-day>",
-                                     -4.1845914400698785),
-                                    ("<day-of-month> (ordinal or number) <named-month>de <year>",
-                                     -4.590056548178043),
-                                    ("yearday", -4.1845914400698785),
-                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"2",
-                                     -4.590056548178043),
-                                    ("<day-of-month> (ordinal or number) de <named-month>intersect",
-                                     -4.590056548178043),
-                                    ("two time tokens separated by \",\"de <year>",
-                                     -4.1845914400698785),
-                                    ("Quart-feira\224s <time-of-day>", -4.590056548178043),
-                                    ("Quart-feira<dim time> da manha", -4.590056548178043),
-                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"",
-                                     -4.590056548178043),
-                                    ("tomorrowdepois das <time-of-day>", -4.1845914400698785),
-                                    ("<hour-of-day> and <relative minutes>in the <part-of-day>",
-                                     -4.1845914400698785),
-                                    ("two time tokens separated by \",\"2de <year>",
-                                     -4.1845914400698785),
-                                    ("intersectde <year>", -4.590056548178043)],
-                               n = 56},
-                   koData =
-                     ClassData{prior = -0.3285040669720361, unseen = -5.924255797414532,
-                               likelihoods =
-                                 HashMap.fromList
-                                   [("hourday", -3.3566290621822787),
-                                    ("dayhour", -3.8421368779639797),
-                                    ("daymonth", -5.2284312390838705),
-                                    ("monthday", -4.1298189504157605),
-                                    ("monthyear", -3.282521090028557),
+                                   [("dayhour", -1.9199346626520526),
+                                    ("dia <day-of-month> (non ordinal)\224s <time-of-day>",
+                                     -3.5040547671018634),
+                                    ("dia <day-of-month> de <named-month>\224s <time-of-day>",
+                                     -4.890349128221754),
+                                    ("tomorrowin the <part-of-day>", -3.9740583963475986),
                                     ("<day-of-month> (ordinal or number) de <named-month>\224s <time-of-day>",
-                                     -5.2284312390838705),
-                                    ("now\224s <time-of-day>", -4.822966130975706),
-                                    ("entre <datetime> e <datetime> (interval)Julho",
-                                     -3.61899332664977),
-                                    ("houryear", -3.2135282185416054),
-                                    ("Dezembro\224s <time-of-day>", -5.2284312390838705),
-                                    ("\224s <time-of-day>Julho", -4.822966130975706),
-                                    ("Fevereiroin the <part-of-day>", -4.822966130975706),
-                                    ("de <year>antes das <time-of-day>", -2.487591215158669),
-                                    ("monthhour", -3.9756682705885025),
-                                    ("Setembrointersect", -5.2284312390838705),
-                                    ("intersect by `da` or `de`two time tokens separated by \",\"",
-                                     -5.2284312390838705),
-                                    ("hourmonth", -3.3566290621822787),
-                                    ("Julhode <year>", -5.2284312390838705),
-                                    ("<time-of-day> am|pmintersect by `da` or `de`",
-                                     -4.535284058523925),
-                                    ("Setembrotwo time tokens separated by \",\"2",
-                                     -5.2284312390838705),
-                                    ("dayyear", -5.2284312390838705),
+                                     -4.890349128221754),
+                                    ("nowquinze para as <hour-of-day> (as relative minutes)",
+                                     -4.890349128221754),
+                                    ("Quart-feiraamanh\227 pela <part-of-day>", -4.890349128221754),
+                                    ("now\224s <time-of-day>", -4.484884020113589),
+                                    ("now<hour-of-day> and 3/4", -4.890349128221754),
+                                    ("Segunda-feirain the <part-of-day>", -4.890349128221754),
+                                    ("Quart-feira<time-of-day> <part-of-day>", -4.890349128221754),
+                                    ("yearSexta-feira", -4.890349128221754),
+                                    ("dayday", -3.3862717314454795),
+                                    ("hourhour", -4.890349128221754),
+                                    ("dayyear", -2.6931245508855346),
+                                    ("Quinta-feira\224s <time-of-day>", -4.197201947661808),
+                                    ("de <year>Sexta-feira", -4.890349128221754),
+                                    ("quarteryear", -4.890349128221754),
                                     ("intersect by `da` or `de`\224s <time-of-day>",
-                                     -5.2284312390838705),
-                                    ("passado <cycle>year", -5.2284312390838705),
-                                    ("de <year>o <ordinal> <cycle> de <time>", -4.822966130975706),
+                                     -4.890349128221754),
+                                    ("monthminute", -4.890349128221754),
+                                    ("minutehour", -3.6375861597263857),
+                                    ("<hour-of-day> and quinzein the <part-of-day>",
+                                     -4.484884020113589),
+                                    ("Sexta-feira<day-of-month> (ordinal or number) de <named-month>",
+                                     -4.890349128221754),
                                     ("intersect by `da` or `de`in the <part-of-day>",
-                                     -4.822966130975706),
-                                    ("Setembrode <year>", -4.1298189504157605),
-                                    ("now<hour-of-day> and <relative minutes>",
-                                     -5.2284312390838705),
-                                    ("yearmonth", -2.487591215158669),
-                                    ("Ter\231a-feiraright now", -5.2284312390838705),
-                                    ("Sexta-feiraintersect", -5.2284312390838705),
-                                    ("dayminute", -4.822966130975706),
-                                    ("Setembrotwo time tokens separated by \",\"",
-                                     -5.2284312390838705),
-                                    ("intersect by `da` or `de`intersect", -5.2284312390838705),
+                                     -4.484884020113589),
+                                    ("<day-of-month> (ordinal or number) de <named-month>year",
+                                     -4.890349128221754),
+                                    ("now<hour-of-day> and <relative minutes>", -4.890349128221754),
+                                    ("tomorrow<time-of-day> horas", -4.484884020113589),
+                                    ("dd-dd <month> de (interval)de <year>", -4.890349128221754),
+                                    ("now<integer> para as <hour-of-day> (as relative minutes)",
+                                     -4.890349128221754),
+                                    ("Quinta-feira<time-of-day> horas", -4.890349128221754),
+                                    ("\224s <time-of-day>in the <part-of-day>", -4.197201947661808),
+                                    ("Sexta-feiraintersect", -4.890349128221754),
+                                    ("Fevereiro\224s <time-of-day>", -4.890349128221754),
+                                    ("dayminute", -3.1856010359833284),
+                                    ("<ordinal> trimestrede <year>", -4.890349128221754),
                                     ("<day-of-month> (ordinal or number) de <named-month>de <year>",
-                                     -5.2284312390838705),
-                                    ("intersectSexta-feira", -4.822966130975706),
-                                    ("intersect by `da` or `de`two time tokens separated by \",\"2",
-                                     -5.2284312390838705),
-                                    ("yearo <ordinal> <cycle> de <time>", -4.822966130975706),
-                                    ("Maioyear", -4.822966130975706),
-                                    ("passado <cycle>de <year>", -5.2284312390838705),
-                                    ("Sexta-feiraintersect by `da` or `de`", -4.1298189504157605),
-                                    ("intersect by `da` or `de`Sexta-feira", -4.312140507209715),
-                                    ("<time-of-day> am|pm<day-of-month> (ordinal or number) <named-month>",
-                                     -4.822966130975706),
-                                    ("intersect by `da` or `de`year", -5.2284312390838705),
+                                     -3.5040547671018634),
+                                    ("intersectSexta-feira", -4.890349128221754),
+                                    ("dd-dd <month>(interval)de <year>", -4.890349128221754),
+                                    ("Sexta-feiraintersect by `da` or `de`", -4.890349128221754),
+                                    ("<day-of-month> (ordinal or number) <named-month>year",
+                                     -4.890349128221754),
+                                    ("intersect by `da` or `de`Sexta-feira", -4.890349128221754),
+                                    ("<day-of-month> (ordinal or number) de <named-month>in the <part-of-day>",
+                                     -4.484884020113589),
+                                    ("tomorrow\224s <time-of-day>", -4.890349128221754),
+                                    ("dia <day-of-month> de <named-month>in the <part-of-day>",
+                                     -4.484884020113589),
+                                    ("<day-of-month> (ordinal or number) <named-month>de <year>",
+                                     -4.890349128221754),
+                                    ("tomorrow<time-of-day> <part-of-day>", -4.890349128221754),
+                                    ("yearday", -4.484884020113589),
+                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"2",
+                                     -4.890349128221754),
+                                    ("<day-of-month> (ordinal or number) de <named-month>intersect",
+                                     -4.890349128221754),
                                     ("two time tokens separated by \",\"de <year>",
-                                     -4.822966130975706),
-                                    ("intersect by `da` or `de`de <year>", -3.7243538423075964),
-                                    ("yearquarter", -2.2080063529395075),
-                                    ("de <datetime> - <datetime> (interval)Julho",
-                                     -5.2284312390838705),
-                                    ("daynograin", -5.2284312390838705),
-                                    ("yearantes das <time-of-day>", -2.395217895027654),
-                                    ("Maiode <year>", -4.535284058523925),
+                                     -4.484884020113589),
+                                    ("dia <day-of-month> (non ordinal)<time-of-day> horas",
+                                     -4.890349128221754),
+                                    ("Quart-feira\224s <time-of-day>", -4.890349128221754),
+                                    ("Quart-feira<dim time> da manha", -4.890349128221754),
+                                    ("yesterdayin the <part-of-day>", -3.9740583963475986),
+                                    ("<day-of-month> (ordinal or number) de <named-month>two time tokens separated by \",\"",
+                                     -4.890349128221754),
+                                    ("tomorrowdepois das <time-of-day>", -4.484884020113589),
+                                    ("<hour-of-day> and <relative minutes>in the <part-of-day>",
+                                     -4.484884020113589),
+                                    ("tomorrowamanh\227 pela <part-of-day>", -4.890349128221754),
                                     ("two time tokens separated by \",\"2de <year>",
-                                     -4.822966130975706),
-                                    ("intersectde <year>", -5.2284312390838705),
+                                     -4.484884020113589),
+                                    ("intersectde <year>", -4.890349128221754),
+                                    ("n[ao] <date>\224s <time-of-day>", -4.890349128221754)],
+                               n = 84},
+                   koData =
+                     ClassData{prior = -0.4423056773292346, unseen = -5.993961427306569,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("hourday", -3.4265151896464454),
+                                    ("dayhour", -3.506557897319982),
+                                    ("daymonth", -5.298317366548036),
+                                    ("monthday", -4.199705077879927),
+                                    ("monthyear", -3.3524072174927233),
+                                    ("dia <day-of-month> (non ordinal)\224s <time-of-day>",
+                                     -5.298317366548036),
+                                    ("dia <day-of-month> de <named-month>\224s <time-of-day>",
+                                     -5.298317366548036),
+                                    ("<day-of-month> (ordinal or number) de <named-month>\224s <time-of-day>",
+                                     -4.892852258439873),
+                                    ("now\224s <time-of-day>", -4.892852258439873),
+                                    ("entre <datetime> e <datetime> (interval)Julho",
+                                     -3.6888794541139363),
+                                    ("houryear", -3.283414346005772),
+                                    ("Dezembro\224s <time-of-day>", -5.298317366548036),
+                                    ("\224s <time-of-day>Julho", -4.892852258439873),
+                                    ("Fevereiroin the <part-of-day>", -4.892852258439873),
+                                    ("de <year>antes das <time-of-day>", -2.557477342622836),
+                                    ("monthhour", -3.7942399697717626),
+                                    ("Setembrointersect", -5.298317366548036),
+                                    ("intersect by `da` or `de`two time tokens separated by \",\"",
+                                     -5.298317366548036),
+                                    ("hourmonth", -3.4265151896464454),
+                                    ("Julhode <year>", -5.298317366548036),
+                                    ("<time-of-day> am|pmintersect by `da` or `de`",
+                                     -4.605170185988091),
+                                    ("Setembrotwo time tokens separated by \",\"2",
+                                     -5.298317366548036),
+                                    ("dayyear", -5.298317366548036),
+                                    ("intersect by `da` or `de`\224s <time-of-day>",
+                                     -4.382026634673881),
+                                    ("monthminute", -5.298317366548036),
+                                    ("passado <cycle>year", -5.298317366548036),
+                                    ("de <year>o <ordinal> <cycle> de <time>", -4.892852258439873),
+                                    ("intersect by `da` or `de`in the <part-of-day>",
+                                     -4.892852258439873),
+                                    ("Setembrode <year>", -4.199705077879927),
+                                    ("now<hour-of-day> and <relative minutes>", -5.298317366548036),
+                                    ("yearmonth", -2.557477342622836),
+                                    ("Ter\231a-feiraright now", -5.298317366548036),
+                                    ("Sexta-feiraintersect", -5.298317366548036),
+                                    ("Fevereiro\224s <time-of-day>", -5.298317366548036),
+                                    ("dayminute", -4.892852258439873),
+                                    ("Setembrotwo time tokens separated by \",\"",
+                                     -5.298317366548036),
+                                    ("intersect by `da` or `de`intersect", -5.298317366548036),
+                                    ("<day-of-month> (ordinal or number) de <named-month>de <year>",
+                                     -5.298317366548036),
+                                    ("intersectSexta-feira", -4.892852258439873),
+                                    ("intersect by `da` or `de`two time tokens separated by \",\"2",
+                                     -5.298317366548036),
+                                    ("yearo <ordinal> <cycle> de <time>", -4.892852258439873),
+                                    ("Maioyear", -4.892852258439873),
+                                    ("passado <cycle>de <year>", -5.298317366548036),
+                                    ("Sexta-feiraintersect by `da` or `de`", -4.199705077879927),
+                                    ("intersect by `da` or `de`Sexta-feira", -4.382026634673881),
+                                    ("<time-of-day> am|pm<day-of-month> (ordinal or number) <named-month>",
+                                     -4.892852258439873),
+                                    ("intersect by `da` or `de`year", -5.298317366548036),
+                                    ("two time tokens separated by \",\"de <year>",
+                                     -4.892852258439873),
+                                    ("intersect by `da` or `de`de <year>", -3.7942399697717626),
+                                    ("yearquarter", -2.277892480403674),
+                                    ("de <datetime> - <datetime> (interval)Julho",
+                                     -5.298317366548036),
+                                    ("daynograin", -5.298317366548036),
+                                    ("yearantes das <time-of-day>", -2.4651040224918206),
+                                    ("Maiode <year>", -4.605170185988091),
+                                    ("two time tokens separated by \",\"2de <year>",
+                                     -4.892852258439873),
+                                    ("intersectde <year>", -5.298317366548036),
                                     ("<time-of-day> am|pm<day-of-month> (ordinal or number) de <named-month>",
-                                     -4.535284058523925)],
-                               n = 144}}),
+                                     -4.605170185988091)],
+                               n = 151}}),
        ("<ordinal> <cycle> de <year> - <ordinal> <cycle> de <year>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -4.174387269895637,
@@ -748,76 +782,79 @@ classifiers
                      ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0},
                    koData =
-                     ClassData{prior = 0.0, unseen = -4.174387269895637,
+                     ClassData{prior = 0.0, unseen = -4.204692619390966,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.39768296766610944),
-                                    ("integer (0..19)", -1.3862943611198906),
-                                    ("negative numbers", -3.0602707946915624),
-                                    ("tens (20..90)", -3.4657359027997265)],
-                               n = 60}}),
+                                   [("integer (numeric)", -0.40546510810816444),
+                                    ("integer (0..19)", -1.3564413979702095),
+                                    ("negative numbers", -3.0910424533583156),
+                                    ("tens (20..90)", -3.4965075614664802)],
+                               n = 62}}),
        ("n[ao] <date>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
+                     ClassData{prior = 0.0, unseen = -2.3025850929940455,
                                likelihoods =
                                  HashMap.fromList
-                                   [("dia <day-of-month> (non ordinal)", -1.252762968495368),
-                                    ("Domingo", -1.252762968495368), ("day", -0.8472978603872037)],
-                               n = 2},
+                                   [("dia <day-of-month> (non ordinal)", -1.0986122886681098),
+                                    ("Domingo", -1.5040773967762742), ("day", -0.8109302162163288)],
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("yesterday",
         Classifier{okData =
-                     ClassData{prior = -0.40546510810816444,
-                               unseen = -1.3862943611198906,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 2},
+                     ClassData{prior = -0.1823215567939546,
+                               unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
                    koData =
-                     ClassData{prior = -1.0986122886681098,
-                               unseen = -1.0986122886681098,
+                     ClassData{prior = -1.791759469228055, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 1}}),
        ("amanh\227 pela <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.3294792011302423, unseen = -4.672828834461907,
+                     ClassData{prior = -0.3364722366212129, unseen = -4.770684624465665,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<hour-of-day> and quinzeafternoon", -3.054001181677967),
-                                    ("dayhour", -2.871679624884012),
-                                    ("\224s <time-of-day>morning", -3.2771447329921766),
-                                    ("hourhour", -1.890850371872286),
-                                    ("<hour-of-day> and halfafternoon", -3.054001181677967),
-                                    ("minutehour", -1.5723966407537513),
-                                    ("tomorrowevening", -3.970291913552122),
-                                    ("time-of-day (latent)morning", -3.2771447329921766),
-                                    ("time-of-day (latent)evening", -3.5648268054439574),
-                                    ("\224s <time-of-day>afternoon", -2.3608540011180215),
+                                   [("<hour-of-day> and quinzeafternoon", -3.152736022363656),
+                                    ("dayhour", -2.68273239311792),
+                                    ("\224s <time-of-day>morning", -3.3758795736778655),
+                                    ("intersectevening", -4.069026754237811),
+                                    ("tomorrowafternoon", -4.069026754237811),
+                                    ("hourhour", -1.8718021769015913),
+                                    ("<hour-of-day> and halfafternoon", -3.152736022363656),
+                                    ("minutehour", -1.6711314814394402),
+                                    ("tomorrowevening", -4.069026754237811),
+                                    ("time-of-day (latent)morning", -3.3758795736778655),
+                                    ("yesterdayafternoon", -4.069026754237811),
+                                    ("time-of-day (latent)evening", -3.6635616461296463),
+                                    ("\224s <time-of-day>afternoon", -2.4595888418037104),
                                     ("<day-of-month> (ordinal or number) de <named-month>morning",
-                                     -3.970291913552122),
+                                     -4.069026754237811),
                                     ("dia <day-of-month> de <named-month>morning",
-                                     -3.970291913552122),
-                                    ("yesterdayevening", -3.970291913552122),
-                                    ("time-of-day (latent)afternoon", -3.5648268054439574),
+                                     -4.069026754237811),
+                                    ("yesterdayevening", -4.069026754237811),
+                                    ("time-of-day (latent)afternoon", -3.6635616461296463),
                                     ("<hour-of-day> and <relative minutes>afternoon",
-                                     -2.717528945056754),
-                                    ("intersectmorning", -3.970291913552122),
-                                    ("\224s <time-of-day>evening", -3.5648268054439574),
-                                    ("intersect by `da` or `de`morning", -3.970291913552122)],
-                               n = 41},
+                                     -2.816263785742443),
+                                    ("intersectmorning", -4.069026754237811),
+                                    ("\224s <time-of-day>evening", -3.3758795736778655),
+                                    ("intersect by `da` or `de`morning", -4.069026754237811)],
+                               n = 45},
                    koData =
-                     ClassData{prior = -1.270462545594769, unseen = -4.04305126783455,
+                     ClassData{prior = -1.252762968495368, unseen = -4.1588830833596715,
                                likelihoods =
                                  HashMap.fromList
-                                   [("yearhour", -1.540445040947149),
-                                    ("monthhour", -2.9267394020670396),
-                                    ("hourhour", -2.639057329615259),
-                                    ("time-of-day (latent)morning", -3.332204510175204),
-                                    ("year (latent)afternoon", -2.2335922215070942),
-                                    ("Fevereiromorning", -3.332204510175204),
-                                    ("year (latent)evening", -2.9267394020670396),
-                                    ("time-of-day (latent)afternoon", -2.9267394020670396),
-                                    ("year (latent)morning", -2.4159137783010487),
-                                    ("intersect by `da` or `de`morning", -3.332204510175204)],
-                               n = 16}}),
+                                   [("yearhour", -1.578185368929996),
+                                    ("monthhour", -3.044522437723423),
+                                    ("hourhour", -2.5336968139574325),
+                                    ("time-of-day (latent)morning", -3.4499875458315876),
+                                    ("year (latent)afternoon", -2.3513752571634776),
+                                    ("time-of-day (latent)evening", -3.4499875458315876),
+                                    ("Fevereiromorning", -3.4499875458315876),
+                                    ("year (latent)evening", -2.7568403652716422),
+                                    ("time-of-day (latent)afternoon", -3.044522437723423),
+                                    ("year (latent)morning", -2.5336968139574325),
+                                    ("intersect by `da` or `de`morning", -3.4499875458315876)],
+                               n = 18}}),
        ("dentro de <duration>",
         Classifier{okData =
                      ClassData{prior = -2.772588722239781, unseen = -2.3978952727983707,
@@ -846,8 +883,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("Fevereiro",
         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}}),
@@ -875,11 +912,14 @@ classifiers
                                n = 127}}),
        ("dia <day-of-month> (non ordinal)",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("integer (numeric)", 0.0)],
-                               n = 6},
+                     ClassData{prior = 0.0, unseen = -2.833213344056216,
+                               likelihoods =
+                                 HashMap.fromList
+                                   [("integer (numeric)", -0.13353139262452263),
+                                    ("integer (0..19)", -2.0794415416798357)],
+                               n = 14},
                    koData =
-                     ClassData{prior = -infinity, unseen = -0.6931471805599453,
+                     ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("<ordinal> trimestre",
         Classifier{okData =
@@ -899,28 +939,26 @@ classifiers
                                n = 50}}),
        ("<day-of-month> (ordinal or number) de <named-month>",
         Classifier{okData =
-                     ClassData{prior = -0.24362208265775043,
-                               unseen = -4.290459441148391,
+                     ClassData{prior = -0.2363887780642304, unseen = -4.31748811353631,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)Fevereiro", -2.330755969960742),
-                                    ("integer (numeric)Mar\231o", -3.1780538303479458),
-                                    ("integer (0..19)Maio", -3.1780538303479458),
-                                    ("integer (numeric)Abril", -3.58351893845611),
-                                    ("integer (numeric)Julho", -3.1780538303479458),
-                                    ("ordinals (1..10)Mar\231o", -3.58351893845611),
-                                    ("integer (numeric)Dezembro", -3.58351893845611),
-                                    ("integer (numeric)Janeiro", -3.58351893845611),
-                                    ("month", -0.8754687373538999),
-                                    ("integer (0..19)Julho", -3.58351893845611),
-                                    ("integer (0..19)Abril", -3.58351893845611),
-                                    ("integer (numeric)Maio", -2.890371757896165),
-                                    ("integer (0..19)Mar\231o", -2.890371757896165),
-                                    ("integer (numeric)Setembro", -2.4849066497880004)],
-                               n = 29},
+                                   [("integer (numeric)Fevereiro", -2.2246235515243336),
+                                    ("integer (numeric)Mar\231o", -3.20545280453606),
+                                    ("integer (0..19)Maio", -3.20545280453606),
+                                    ("integer (numeric)Abril", -3.6109179126442243),
+                                    ("integer (numeric)Julho", -3.20545280453606),
+                                    ("ordinals (1..10)Mar\231o", -3.6109179126442243),
+                                    ("integer (numeric)Dezembro", -3.6109179126442243),
+                                    ("integer (numeric)Janeiro", -3.6109179126442243),
+                                    ("month", -0.8700778887190235),
+                                    ("integer (0..19)Julho", -3.6109179126442243),
+                                    ("integer (0..19)Abril", -3.6109179126442243),
+                                    ("integer (numeric)Maio", -2.917770732084279),
+                                    ("integer (0..19)Mar\231o", -2.917770732084279),
+                                    ("integer (numeric)Setembro", -2.512305623976115)],
+                               n = 30},
                    koData =
-                     ClassData{prior = -1.5314763709643884,
-                               unseen = -3.4339872044851463,
+                     ClassData{prior = -1.55814461804655, unseen = -3.4339872044851463,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)Julho", -1.2039728043259361),
@@ -935,12 +973,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("dia <day-of-month> de <named-month>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
+                     ClassData{prior = 0.0, unseen = -2.1972245773362196,
                                likelihoods =
                                  HashMap.fromList
                                    [("integer (numeric)Fevereiro", -0.6931471805599453),
                                     ("month", -0.6931471805599453)],
-                               n = 2},
+                               n = 3},
                    koData =
                      ClassData{prior = -infinity, unseen = -1.0986122886681098,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1064,11 +1102,12 @@ classifiers
                                n = 2}}),
        ("tomorrow",
         Classifier{okData =
-                     ClassData{prior = -0.3364722366212129,
-                               unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     ClassData{prior = -0.2006706954621511,
+                               unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
                    koData =
-                     ClassData{prior = -1.252762968495368, unseen = -1.3862943611198906,
+                     ClassData{prior = -1.7047480922384253,
+                               unseen = -1.3862943611198906,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 2}}),
        ("mes (grain)",
         Classifier{okData =
@@ -1079,12 +1118,12 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("ordinals (1..10)",
         Classifier{okData =
-                     ClassData{prior = -0.24183568432636227, unseen = -4.68213122712422,
+                     ClassData{prior = -0.2565418317160577, unseen = -4.68213122712422,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 106},
                    koData =
-                     ClassData{prior = -1.5379789484519555,
-                               unseen = -3.4339872044851463,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 29}}),
+                     ClassData{prior = -1.4859937213429786,
+                               unseen = -3.4965075614664802,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 31}}),
        ("<integer> para as <hour-of-day> (as relative minutes)",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.4849066497880004,
@@ -1211,8 +1250,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("afternoon",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                     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}}),
@@ -1252,21 +1291,21 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("time-of-day (latent)",
         Classifier{okData =
-                     ClassData{prior = -1.2407867774486523, unseen = -3.332204510175204,
+                     ClassData{prior = -1.0986122886681098, unseen = -3.58351893845611,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -1.0986122886681098),
-                                    ("integer (0..19)", -0.46262352194811296)],
-                               n = 24},
+                                   [("integer (numeric)", -0.916290731874155),
+                                    ("integer (0..19)", -0.5596157879354228)],
+                               n = 32},
                    koData =
-                     ClassData{prior = -0.34130316389087856,
-                               unseen = -4.143134726391533,
+                     ClassData{prior = -0.40546510810816444,
+                               unseen = -4.219507705176107,
                                likelihoods =
                                  HashMap.fromList
-                                   [("integer (numeric)", -0.29849298855599654),
-                                    ("integer (0..19)", -1.488077055429833),
-                                    ("tens (20..90)", -3.4339872044851463)],
-                               n = 59}}),
+                                   [("integer (numeric)", -0.27286698666664033),
+                                    ("integer (0..19)", -1.5656352897757075),
+                                    ("tens (20..90)", -3.5115454388310208)],
+                               n = 64}}),
        ("<hour-of-day> and <relative minutes>",
         Classifier{okData =
                      ClassData{prior = -0.2719337154836418, unseen = -3.713572066704308,
@@ -1306,7 +1345,7 @@ classifiers
                                n = 7}}),
        ("<integer> <unit-of-duration>",
         Classifier{okData =
-                     ClassData{prior = -0.7396671961948381, unseen = -4.174387269895637,
+                     ClassData{prior = -0.7841189587656721, unseen = -4.174387269895637,
                                likelihoods =
                                  HashMap.fromList
                                    [("number (21..29 31..39 .. 91..99)hora (grain)",
@@ -1329,26 +1368,27 @@ classifiers
                                     ("integer (0..19)dia (grain)", -3.4657359027997265)],
                                n = 21},
                    koData =
-                     ClassData{prior = -0.6486954179891115, unseen = -4.23410650459726,
+                     ClassData{prior = -0.6097655716208943, unseen = -4.290459441148391,
                                likelihoods =
                                  HashMap.fromList
-                                   [("week", -3.120895416507997),
-                                    ("integer (numeric)hora (grain)", -2.833213344056216),
-                                    ("integer (numeric)dia (grain)", -3.120895416507997),
-                                    ("integer (0..19)ano (grain)", -3.5263605246161616),
-                                    ("integer (numeric)mes (grain)", -2.833213344056216),
-                                    ("second", -3.120895416507997),
-                                    ("integer (0..19)semana (grain)", -3.5263605246161616),
-                                    ("integer (numeric)semana (grain)", -3.5263605246161616),
-                                    ("integer (numeric)ano (grain)", -2.6100697927420065),
-                                    ("integer (0..19)mes (grain)", -3.120895416507997),
-                                    ("integer (0..19)hora (grain)", -3.120895416507997),
-                                    ("integer (numeric)minutos (grain)", -3.120895416507997),
-                                    ("day", -3.120895416507997),
-                                    ("integer (numeric)segundo (grain)", -3.120895416507997),
-                                    ("year", -2.4277482359480516), ("hour", -2.4277482359480516),
-                                    ("month", -2.4277482359480516), ("minute", -3.120895416507997)],
-                               n = 23}}),
+                                   [("week", -3.1780538303479458),
+                                    ("integer (numeric)hora (grain)", -2.4849066497880004),
+                                    ("integer (numeric)dia (grain)", -3.1780538303479458),
+                                    ("integer (0..19)ano (grain)", -3.58351893845611),
+                                    ("integer (numeric)mes (grain)", -2.890371757896165),
+                                    ("second", -3.1780538303479458),
+                                    ("integer (0..19)semana (grain)", -3.58351893845611),
+                                    ("integer (numeric)semana (grain)", -3.58351893845611),
+                                    ("integer (numeric)ano (grain)", -2.667228206581955),
+                                    ("integer (0..19)mes (grain)", -3.1780538303479458),
+                                    ("integer (0..19)hora (grain)", -3.1780538303479458),
+                                    ("integer (numeric)minutos (grain)", -3.1780538303479458),
+                                    ("day", -3.1780538303479458),
+                                    ("integer (numeric)segundo (grain)", -3.1780538303479458),
+                                    ("year", -2.4849066497880004), ("hour", -2.1972245773362196),
+                                    ("month", -2.4849066497880004),
+                                    ("minute", -3.1780538303479458)],
+                               n = 25}}),
        ("proximas n <cycle>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -3.2188758248682006,
@@ -1428,8 +1468,8 @@ classifiers
                                n = 4}}),
        ("Quinta-feira",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -1.9459101490553135,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 5},
+                     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}}),
@@ -1603,8 +1643,8 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("evening",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.0794415416798357,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 6},
+                     ClassData{prior = 0.0, unseen = -2.3978952727983707,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 9},
                    koData =
                      ClassData{prior = -infinity, unseen = -0.6931471805599453,
                                likelihoods = HashMap.fromList [], n = 0}}),
@@ -1836,15 +1876,15 @@ classifiers
                                likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
        ("in the <part-of-day>",
         Classifier{okData =
-                     ClassData{prior = 0.0, unseen = -2.639057329615259,
+                     ClassData{prior = 0.0, unseen = -3.4339872044851463,
                                likelihoods =
                                  HashMap.fromList
-                                   [("afternoon", -1.8718021769015913),
-                                    ("hour", -0.7731898882334817),
-                                    ("morning", -0.9555114450274363)],
-                               n = 5},
+                                   [("afternoon", -1.6094379124341003),
+                                    ("hour", -0.7621400520468967), ("evening", -1.791759469228055),
+                                    ("morning", -1.791759469228055)],
+                               n = 13},
                    koData =
-                     ClassData{prior = -infinity, unseen = -1.3862943611198906,
+                     ClassData{prior = -infinity, unseen = -1.6094379124341003,
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("this|next <day-of-week>",
         Classifier{okData =
@@ -1881,13 +1921,13 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("hora (grain)",
         Classifier{okData =
-                     ClassData{prior = -0.2876820724517809,
+                     ClassData{prior = -0.4418327522790392,
                                unseen = -2.3978952727983707,
                                likelihoods = HashMap.fromList [("", 0.0)], n = 9},
                    koData =
-                     ClassData{prior = -1.3862943611198906,
-                               unseen = -1.6094379124341003,
-                               likelihoods = HashMap.fromList [("", 0.0)], n = 3}}),
+                     ClassData{prior = -1.0296194171811581,
+                               unseen = -1.9459101490553135,
+                               likelihoods = HashMap.fromList [("", 0.0)], n = 5}}),
        ("right now",
         Classifier{okData =
                      ClassData{prior = -0.1823215567939546,
@@ -1908,31 +1948,32 @@ classifiers
                                likelihoods = HashMap.fromList [], n = 0}}),
        ("\224s <time-of-day>",
         Classifier{okData =
-                     ClassData{prior = -0.2484613592984996, unseen = -4.499809670330265,
+                     ClassData{prior = -0.24921579162398486, unseen = -4.77912349311153,
                                likelihoods =
                                  HashMap.fromList
-                                   [("<time> timezone", -3.7954891891721947),
-                                    ("<hour-of-day> and half", -2.8791984572980396),
-                                    ("<time-of-day> horas", -3.7954891891721947),
-                                    ("<hour-of-day> and 3/4", -3.39002408106403),
-                                    ("time-of-day (latent)", -1.4441139320087168),
-                                    ("<hour-of-day> and <relative minutes>", -2.409194828052304),
-                                    ("<time-of-day> am|pm", -3.7954891891721947),
-                                    ("hour", -1.3105825393841943),
-                                    ("<hour-of-day> and quinze", -3.1023420086122493),
-                                    ("minute", -1.6554230256759237)],
-                               n = 39},
+                                   [("<time> timezone", -4.07753744390572),
+                                    ("hh(:|.|h)mm (time-of-day)", -3.1612467120315646),
+                                    ("<hour-of-day> and half", -3.1612467120315646),
+                                    ("<time-of-day> horas", -3.3843902633457743),
+                                    ("<hour-of-day> and 3/4", -3.672072335797555),
+                                    ("time-of-day (latent)", -1.4033887944791907),
+                                    ("<hour-of-day> and <relative minutes>", -2.691243082785829),
+                                    ("<time-of-day> am|pm", -4.07753744390572),
+                                    ("hour", -1.2443240998495033),
+                                    ("<hour-of-day> and quinze", -3.3843902633457743),
+                                    ("minute", -1.7261621867422419)],
+                               n = 53},
                    koData =
-                     ClassData{prior = -1.5141277326297755,
-                               unseen = -3.5263605246161616,
+                     ClassData{prior = -1.5114575040738967,
+                               unseen = -3.7612001156935624,
                                likelihoods =
                                  HashMap.fromList
-                                   [("midnight", -2.803360380906535),
-                                    ("<time-of-day> horas", -2.803360380906535),
-                                    ("time-of-day (latent)", -1.4170660197866443),
-                                    ("<hour-of-day> and <relative minutes>", -2.3978952727983707),
-                                    ("hour", -1.1939224684724346), ("minute", -2.3978952727983707)],
-                               n = 11}}),
+                                   [("midnight", -3.044522437723423),
+                                    ("<time-of-day> horas", -3.044522437723423),
+                                    ("time-of-day (latent)", -1.252762968495368),
+                                    ("<hour-of-day> and <relative minutes>", -2.639057329615259),
+                                    ("hour", -1.0986122886681098), ("minute", -2.639057329615259)],
+                               n = 15}}),
        ("fazem <duration>",
         Classifier{okData =
                      ClassData{prior = 0.0, unseen = -2.772588722239781,
diff --git a/Duckling/Time/PT/Corpus.hs b/Duckling/Time/PT/Corpus.hs
index 7a96d199..b6473790 100644
--- a/Duckling/Time/PT/Corpus.hs
+++ b/Duckling/Time/PT/Corpus.hs
@@ -182,6 +182,7 @@ allExamples = concat
              , "17/2"
              , "no domingo"
              , "no dia 17"
+             , "dia 17"
              ]
   , examples (datetime (2013, 2, 20, 0, 0, 0) Day)
              [ "esse dia 20"
@@ -258,9 +259,29 @@ allExamples = concat
   , examples (datetime (2013, 2, 12, 20, 0, 0) Hour)
              [ "às oito da noite"
              ]
+  , examples (datetime (2013, 2, 13, 20, 0, 0) Hour)
+             [ "amanhã às oito da noite"
+             ]
+  , examples (datetime (2013, 2, 15, 18, 0, 0) Hour)
+             [ "no dia 15 às 18"
+             , "dia 15 às 18"
+             , "dia 15 às 18 horas"
+             , "dia 15 às dezoito"
+             , "dia quinze às dezoito"
+             ]
+  , examples (datetime (2013, 2, 14, 18, 0, 0) Hour)
+             [ "quinta-feira às 18 horas"
+             , "quinta às 18"
+             ]
+  , examples (datetime (2013, 2, 15, 18, 15, 0) Minute)
+             [ "dia 15 de Fevereiro às 18:15"
+             , "dia 15 às 18:15"
+             ]
   , examples (datetime (2013, 2, 12, 15, 0, 0) Minute)
              [ "15:00"
              , "15.00"
+             , "às 15:00"
+             , "às 15.00"
              ]
   , examples (datetime (2013, 2, 13, 0, 0, 0) Hour)
              [ "meianoite"
@@ -396,9 +417,19 @@ allExamples = concat
              ]
   , examples (datetimeInterval ((2013, 2, 13, 18, 0, 0), (2013, 2, 14, 0, 0, 0)) Hour)
              [ "amanhã a noite"
+             , "amanhã à noite"
              ]
   , examples (datetimeInterval ((2013, 2, 11, 18, 0, 0), (2013, 2, 12, 0, 0, 0)) Hour)
              [ "ontem a noite"
+             , "ontem à noite"
+             ]
+  , examples (datetimeInterval ((2013, 2, 13, 12, 0, 0), (2013, 2, 13, 19, 0, 0)) Hour)
+             [ "amanhã a tarde"
+             , "amanhã à tarde"
+             ]
+  , examples (datetimeInterval ((2013, 2, 11, 12, 0, 0), (2013, 2, 11, 19, 0, 0)) Hour)
+             [ "ontem a tarde"
+             , "ontem à tarde"
              ]
   , examples (datetimeInterval ((2013, 2, 15, 18, 0, 0), (2013, 2, 18, 0, 0, 0)) Hour)
              [ "este final de semana"
diff --git a/Duckling/Time/PT/Rules.hs b/Duckling/Time/PT/Rules.hs
index fb113bb7..4049c3aa 100644
--- a/Duckling/Time/PT/Rules.hs
+++ b/Duckling/Time/PT/Rules.hs
@@ -577,7 +577,7 @@ ruleInThePartofday :: Rule
 ruleInThePartofday = Rule
   { name = "in the <part-of-day>"
   , pattern =
-    [ regex "(de|pela)"
+    [ regex "(de|pela|a|à)"
     , Predicate isAPartOfDay
     ]
   , prod = \tokens -> case tokens of
@@ -1032,7 +1032,7 @@ ruleDiaDayofmonthNonOrdinal = Rule
   , prod = \tokens -> case tokens of
       (_:token:_) -> do
         v <- getIntValue token
-        tt . mkLatent $ dayOfMonth v
+        tt $ dayOfMonth v
       _ -> Nothing
   }