diff --git a/files.yml b/files.yml
index 741c589..08e9f4b 100644
--- a/files.yml
+++ b/files.yml
@@ -34,6 +34,9 @@ default:
   profile.yml:
     bytes: 479
     sha256: 29e45e9f6668a99ef99b05bc6cdcfb1fc51a83ee98b802afc50acb3c55de1d85
+  slot_programs/rhasspy/number:
+    bytes: 651
+    sha256: d1f10ccea552c2c9ba2a59dd69705f8e82545592c7db5ca7078b462ed9d08387
   stop_words.txt:
     bytes: 805
     sha256: 6ca60ffd4257c35cc3981d0e923881c3d8b85c8c0f6ef7a6697bd4ae97200fd8
@@ -70,3 +73,12 @@ text-to-speech:
   marytts/voice-upmc-pierre-hsmm-5.2.jar:
     bytes: 1558945
     sha256: 14b320fd7c8808eace209471982ecd24e8db223e85bfa87d5ebfad45131b14a8
+
+# Sample sentences, etc.
+examples:
+  custom_words.txt:
+    bytes: 37
+    sha256: 0a177acaf089ceb8c3a2cbef36b73e507679e2bf8a07a054b3544ad954c14e97
+  sentences.ini:
+    bytes: 462
+    sha256: 0647a3ade5a0c246fc4d51028871440e82a0292db51c199fba6018066757e7d2
diff --git a/slot_programs/rhasspy/number b/slot_programs/rhasspy/number
new file mode 100644
index 0000000..d03f4ec
--- /dev/null
+++ b/slot_programs/rhasspy/number
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+import argparse
+import sys
+
+
+def main():
+    parser = argparse.ArgumentParser("number")
+    parser.add_argument("lower", type=int, help="Lower bound")
+    parser.add_argument("upper", type=int, help="Upper bound (inclusive)")
+    args, rest_args = parser.parse_known_args()
+
+    lower = args.lower
+    upper = args.upper
+    step = 1
+
+    if rest_args:
+        step = int(rest_args[0])
+
+    if upper < lower:
+        lower, upper = upper, lower
+
+    for n in range(lower, upper + 1, step):
+        print(n)
+
+
+# -----------------------------------------------------------------------------
+
+if __name__ == "__main__":
+    main()
diff --git a/test/voxforge/report.json b/test/voxforge/report.json
index e6b01c5..f81b159 100644
--- a/test/voxforge/report.json
+++ b/test/voxforge/report.json
@@ -144,7 +144,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 7.375,
-      "transcribe_seconds": 4.138270815001306,
+      "transcribe_seconds": 4.211290864001057,
       "speech_confidence": null,
       "wav_name": "fr-sb-500.wav",
       "expected_intent_name": "",
@@ -213,7 +213,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 6.125,
-      "transcribe_seconds": 2.787541849000263,
+      "transcribe_seconds": 2.3235058869977365,
       "speech_confidence": null,
       "wav_name": "fr-sb-497.wav",
       "expected_intent_name": "",
@@ -271,7 +271,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 7.25,
-      "transcribe_seconds": 3.468488343001809,
+      "transcribe_seconds": 2.956744360999437,
       "speech_confidence": null,
       "wav_name": "fr-sb-504.wav",
       "expected_intent_name": "",
@@ -340,7 +340,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 8,
-      "transcribe_seconds": 5.256080913997721,
+      "transcribe_seconds": 3.9519907959984266,
       "speech_confidence": null,
       "wav_name": "fr-sb-499.wav",
       "expected_intent_name": "",
@@ -408,7 +408,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 7,
-      "transcribe_seconds": 3.716683104998083,
+      "transcribe_seconds": 3.4006894009980897,
       "speech_confidence": null,
       "wav_name": "fr-sb-502.wav",
       "expected_intent_name": "",
@@ -487,7 +487,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 6,
-      "transcribe_seconds": 2.303514430997893,
+      "transcribe_seconds": 2.2265132629981963,
       "speech_confidence": null,
       "wav_name": "fr-sb-495.wav",
       "expected_intent_name": "",
@@ -550,7 +550,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 6.5,
-      "transcribe_seconds": 3.642738182003086,
+      "transcribe_seconds": 3.4625251839970588,
       "speech_confidence": null,
       "wav_name": "fr-sb-496.wav",
       "expected_intent_name": "",
@@ -613,7 +613,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 8.125,
-      "transcribe_seconds": 5.598374150999007,
+      "transcribe_seconds": 4.2704927699996915,
       "speech_confidence": null,
       "wav_name": "fr-sb-501.wav",
       "expected_intent_name": "",
@@ -692,7 +692,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 5.625,
-      "transcribe_seconds": 3.4308349560014904,
+      "transcribe_seconds": 3.6179624819997116,
       "speech_confidence": null,
       "wav_name": "fr-sb-503.wav",
       "expected_intent_name": "",
@@ -761,7 +761,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 8.25,
-      "transcribe_seconds": 4.772347522000928,
+      "transcribe_seconds": 4.7086250629981805,
       "speech_confidence": null,
       "wav_name": "fr-sb-498.wav",
       "expected_intent_name": "",
@@ -836,5 +836,5 @@
   "intent_accuracy": 1,
   "entity_accuracy": 1,
   "intent_entity_accuracy": 1,
-  "average_transcription_speedup": 1.8683769228719853
+  "average_transcription_speedup": 2.0703546921707296
 }
diff --git a/test/wavenet/report.json b/test/wavenet/report.json
index 7d43d94..1ebab45 100644
--- a/test/wavenet/report.json
+++ b/test/wavenet/report.json
@@ -547,7 +547,7 @@
       ],
       "text": "on la lumière dans la chambre à coucher",
       "raw_text": "allumé la lumière dans la chambre à coucher",
-      "recognize_seconds": 0.000576522001210833,
+      "recognize_seconds": 0.00043005499901482835,
       "tokens": [
         "on",
         "la",
@@ -569,7 +569,7 @@
         "coucher"
       ],
       "wav_seconds": 2.562125,
-      "transcribe_seconds": 0.10550804800004698,
+      "transcribe_seconds": 0.09812663199772942,
       "speech_confidence": null,
       "wav_name": "allumé_la_lumière_dans_la_chambre_à_coucher.wav",
       "expected_intent_name": "ChangeLightState",
@@ -648,7 +648,7 @@
       ],
       "text": "on la lampe de salon",
       "raw_text": "allumé la lampe de salon",
-      "recognize_seconds": 0.0004156479990342632,
+      "recognize_seconds": 0.000979481999820564,
       "tokens": [
         "on",
         "la",
@@ -664,7 +664,7 @@
         "salon"
       ],
       "wav_seconds": 1.7656875,
-      "transcribe_seconds": 0.0879437190014869,
+      "transcribe_seconds": 0.0837201529975573,
       "speech_confidence": null,
       "wav_name": "allumé_la_lampe_de_salon.wav",
       "expected_intent_name": "ChangeLightState",
@@ -709,7 +709,7 @@
       "entities": [],
       "text": "est -elle ouverte ou fermée la porte de garage",
       "raw_text": "est -elle ouverte ou fermée la porte de garage",
-      "recognize_seconds": 0.0003853289999824483,
+      "recognize_seconds": 0.0004079209975316189,
       "tokens": [
         "est",
         "-elle",
@@ -733,7 +733,7 @@
         "garage"
       ],
       "wav_seconds": 2.760625,
-      "transcribe_seconds": 0.12684517600064282,
+      "transcribe_seconds": 0.12422158299887087,
       "speech_confidence": null,
       "wav_name": "estelle_ouverte_ou_fermée_la_porte_de_garage.wav",
       "expected_intent_name": "GetGarageState",
@@ -784,27 +784,17 @@
     },
     "il_est_quelle_heure.wav": {
       "intent": {
-        "name": "GetTime",
-        "confidence": 1
+        "name": "",
+        "confidence": 0
       },
       "entities": [],
-      "text": "il est quelle heure",
-      "raw_text": "il est quelle heure",
-      "recognize_seconds": 0.0010100850013259333,
-      "tokens": [
-        "il",
-        "est",
-        "quelle",
-        "heure"
-      ],
-      "raw_tokens": [
-        "il",
-        "est",
-        "quelle",
-        "heure"
-      ],
+      "text": "il est quelle à",
+      "raw_text": "il est quelle à",
+      "recognize_seconds": 0,
+      "tokens": [],
+      "raw_tokens": [],
       "wav_seconds": 0.94875,
-      "transcribe_seconds": 0.03851277899957495,
+      "transcribe_seconds": 0.04907963799996651,
       "speech_confidence": null,
       "wav_name": "il_est_quelle_heure.wav",
       "expected_intent_name": "GetTime",
@@ -821,21 +811,21 @@
           "il",
           "est",
           "quelle",
-          "heure"
+          "à"
         ],
         "differences": [
           "il",
           "est",
           "quelle",
-          "heure"
+          "heure:à"
         ],
         "words": 4,
-        "errors": 0,
-        "matches": 4,
-        "substitutions": 0,
+        "errors": 1,
+        "matches": 3,
+        "substitutions": 1,
         "deletions": 0,
         "insertions": 0,
-        "error_rate": 0
+        "error_rate": 0.25
       }
     },
     "éteindre_la_lampe_de_salon.wav": {
@@ -850,7 +840,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 1.8169375,
-      "transcribe_seconds": 0.08054877700124052,
+      "transcribe_seconds": 0.07228139300059411,
       "speech_confidence": null,
       "wav_name": "éteindre_la_lampe_de_salon.wav",
       "expected_intent_name": "ChangeLightState",
@@ -897,7 +887,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 2.867875,
-      "transcribe_seconds": 0.14214915499906056,
+      "transcribe_seconds": 0.1345220170005632,
       "speech_confidence": null,
       "wav_name": "la_porte_de_garage_estelle_ouverte_ou_fermée.wav",
       "expected_intent_name": "GetGarageState",
@@ -957,7 +947,7 @@
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 3.0151875,
-      "transcribe_seconds": 0.1029141970029741,
+      "transcribe_seconds": 0.11470254099913291,
       "speech_confidence": null,
       "wav_name": "estce_que_la_porte_de_garage_est_ouverte_ou_fermée.wav",
       "expected_intent_name": "GetGarageState",
@@ -1037,7 +1027,7 @@
       ],
       "text": "on l'éclairage de garage",
       "raw_text": "allumé l'éclairage de garage",
-      "recognize_seconds": 0.0005652990003000014,
+      "recognize_seconds": 0.00040126800013240427,
       "tokens": [
         "on",
         "l'éclairage",
@@ -1051,7 +1041,7 @@
         "garage"
       ],
       "wav_seconds": 1.9378125,
-      "transcribe_seconds": 0.10473032599838916,
+      "transcribe_seconds": 0.09844881900062319,
       "speech_confidence": null,
       "wav_name": "allumé_léclairage_de_garage.wav",
       "expected_intent_name": "ChangeLightState",
@@ -1118,7 +1108,7 @@
       ],
       "text": "off la lumière dans la chambre à coucher",
       "raw_text": "éteindre la lumière dans la chambre à coucher",
-      "recognize_seconds": 0.0002535719977458939,
+      "recognize_seconds": 0.0004153339978074655,
       "tokens": [
         "off",
         "la",
@@ -1140,7 +1130,7 @@
         "coucher"
       ],
       "wav_seconds": 2.6883125,
-      "transcribe_seconds": 0.11705704800260719,
+      "transcribe_seconds": 0.11721756200131495,
       "speech_confidence": null,
       "wav_name": "éteindre_la_lumière_dans_la_chambre_à_coucher.wav",
       "expected_intent_name": "ChangeLightState",
@@ -1188,27 +1178,17 @@
     },
     "quelle_heure_estil.wav": {
       "intent": {
-        "name": "GetTime",
-        "confidence": 1
+        "name": "",
+        "confidence": 0
       },
       "entities": [],
-      "text": "quelle heure est -il",
-      "raw_text": "quelle heure est -il",
-      "recognize_seconds": 0.00031830000079935417,
-      "tokens": [
-        "quelle",
-        "heure",
-        "est",
-        "-il"
-      ],
-      "raw_tokens": [
-        "quelle",
-        "heure",
-        "est",
-        "-il"
-      ],
+      "text": "-elle à est -il",
+      "raw_text": "-elle à est -il",
+      "recognize_seconds": 0,
+      "tokens": [],
+      "raw_tokens": [],
       "wav_seconds": 1.0114375,
-      "transcribe_seconds": 0.05601114700039034,
+      "transcribe_seconds": 0.07237913700009813,
       "speech_confidence": null,
       "wav_name": "quelle_heure_estil.wav",
       "expected_intent_name": "GetTime",
@@ -1222,14 +1202,14 @@
           "heure"
         ],
         "hypothesis": [
-          "quelle",
-          "heure",
+          "-elle",
+          "à",
           "est",
           "-il"
         ],
         "differences": [
-          "il:quelle",
-          "est:heure",
+          "il:-elle",
+          "est:à",
           "quelle:est",
           "heure:-il"
         ],
@@ -1275,7 +1255,7 @@
       ],
       "text": "off l'éclairage de garage",
       "raw_text": "éteindre l'éclairage de garage",
-      "recognize_seconds": 0.00022740699932910502,
+      "recognize_seconds": 0.00042821900206035934,
       "tokens": [
         "off",
         "l'éclairage",
@@ -1289,7 +1269,7 @@
         "garage"
       ],
       "wav_seconds": 2.0468125,
-      "transcribe_seconds": 0.10109098199973232,
+      "transcribe_seconds": 0.08223818400074379,
       "speech_confidence": null,
       "wav_name": "éteindre_léclairage_de_garage.wav",
       "expected_intent_name": "ChangeLightState",
@@ -1329,13 +1309,13 @@
         "confidence": 0
       },
       "entities": [],
-      "text": "-elle température",
-      "raw_text": "-elle température",
+      "text": "est la température",
+      "raw_text": "est la température",
       "recognize_seconds": 0,
       "tokens": [],
       "raw_tokens": [],
       "wav_seconds": 1.4678125,
-      "transcribe_seconds": 0.060855390001961496,
+      "transcribe_seconds": 0.058736562001286075,
       "speech_confidence": null,
       "wav_name": "quelle_est_la_température.wav",
       "expected_intent_name": "GetTemperature",
@@ -1349,20 +1329,22 @@
           "température"
         ],
         "hypothesis": [
-          "-elle",
+          "est",
+          "la",
           "température"
         ],
         "differences": [
-          "la:-elle",
+          "est",
+          "la",
           "température"
         ],
         "words": 4,
-        "errors": 3,
-        "matches": 1,
-        "substitutions": 1,
+        "errors": 1,
+        "matches": 3,
+        "substitutions": 0,
         "deletions": 0,
         "insertions": 0,
-        "error_rate": 0.25
+        "error_rate": 0
       }
     }
   },
@@ -1370,14 +1352,14 @@
   "num_words": 73,
   "num_intents": 12,
   "num_entities": 12,
-  "correct_transcriptions": 7,
-  "correct_intent_names": 8,
-  "correct_words": 62,
+  "correct_transcriptions": 6,
+  "correct_intent_names": 6,
+  "correct_words": 63,
   "correct_entities": 10,
-  "correct_intent_and_entities": 8,
-  "transcription_accuracy": 0.8493150684931506,
-  "intent_accuracy": 0.6666666666666666,
+  "correct_intent_and_entities": 6,
+  "transcription_accuracy": 0.863013698630137,
+  "intent_accuracy": 0.5,
   "entity_accuracy": 0.8333333333333334,
-  "intent_entity_accuracy": 0.6666666666666666,
-  "average_transcription_speedup": 22.223596551425658
+  "intent_entity_accuracy": 0.5,
+  "average_transcription_speedup": 22.330714047785563
 }