diff --git a/Makefile b/Makefile
index 87a2a68..5780663 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,18 @@
-ARDUINO_DIR = /usr/share/arduino
-ARDUINO_LIBS =
-ARDMK_DIR = /home/sebastien/.arduino_mk
+ALL:
 
-# USER_LIB_PATH = /home/sebastien/travail/cpp/seb/arduino/libraries
+clean:
+	make -C examples/01_main/ $@
+	make -C examples/02_output-received-code/ $@
+	make -C examples/03_output-signal-timings/ $@
+	make -C examples/04_react_on_code/ $@
+	make -C examples/05_callback/ $@
+	make -C extras/testplan/test/ $@
 
-BOARD_TAG = uno
-MCU = atmega328
+mrproper:
+	make -C examples/01_main/ $@
+	make -C examples/02_output-received-code/ $@
+	make -C examples/03_output-signal-timings/ $@
+	make -C examples/04_react_on_code/ $@
+	make -C examples/05_callback/ $@
+	make -C extras/testplan/test/ $@
 
-include $(ARDMK_DIR)/Arduino.mk
diff --git a/RF433Debug.cpp b/RF433Debug.cpp
index 722d799..e1a7c37 100644
--- a/RF433Debug.cpp
+++ b/RF433Debug.cpp
@@ -29,7 +29,9 @@
 #include <stdarg.h>
 
 static char buffer[120];
-static char progmem_reading_buffer[70];
+static char progmem_reading_buffer[91];
+
+const char *newline = "\n";
 
 #ifdef __arm__
 // should use uinstd.h to define sbrk but Due causes a conflict
@@ -38,13 +40,36 @@ extern "C" char* sbrk(int incr);
 extern char *__brkval;
 #endif  // __arm__
 
-void dbgfunc(const char* file, long int line, const char* progmem_str) {
-    strcpy_P(progmem_reading_buffer, progmem_str);
-    Serial.print(progmem_reading_buffer);
-    Serial.print("\n");
+static fatal(const char* file, long int line, short unsigned len) {
+    Serial.print(newline);
+    Serial.print(file);
+    Serial.print(newline);
+    Serial.print(line);
+    Serial.print(newline);
+    Serial.print(len);
+    Serial.print(newline);
+    Serial.flush();
+    while (1)
+        ;
 }
 
-void dbgffunc(const char* file, long int line, const char* progmem_fmt, ...) {
+void dbgfunc(const char* file, long int line, short unsigned progmem_str_len,
+        const char* progmem_str) {
+    if (progmem_str_len >= sizeof(progmem_reading_buffer)) {
+        fatal(file, line, progmem_str_len);
+    }
+    strcpy_P(progmem_reading_buffer, progmem_str);
+    Serial.print(progmem_reading_buffer);
+    Serial.print(newline);
+      // Not useful normally (sometimes, makes analysis easier in bug fix)
+//    Serial.flush();
+}
+
+void dbgffunc(const char* file, long int line, short unsigned progmem_fmt_len,
+        const char* progmem_fmt, ...) {
+    if (progmem_fmt_len >= sizeof(progmem_reading_buffer)) {
+        fatal(file, line, progmem_fmt_len);
+    }
     strcpy_P(progmem_reading_buffer, progmem_fmt);
     va_list args;
 
@@ -55,7 +80,9 @@ void dbgffunc(const char* file, long int line, const char* progmem_fmt, ...) {
     vsnprintf(buffer, sizeof(buffer), progmem_reading_buffer, args);
     va_end(args);
     Serial.print(buffer);
-    Serial.print("\n");
+    Serial.print(newline);
+      // Not useful normally (sometimes, makes analysis easier in bug fix)
+//    Serial.flush();
 }
 
 // vim: ts=4:sw=4:tw=80:et
diff --git a/RF433Debug.h b/RF433Debug.h
index 2d6feb1..02b2abb 100644
--- a/RF433Debug.h
+++ b/RF433Debug.h
@@ -23,17 +23,21 @@
 
 #define dbg(a) \
     { static const char tmp[] PROGMEM = {a}; \
-      dbgfunc(__FILE__, __LINE__, tmp); \
+      constexpr short unsigned l = strlen(a); \
+      dbgfunc(__FILE__, __LINE__, l, tmp); \
     }
 
 #define dbgf(a, ...) \
     { static const char tmp[] PROGMEM = {a}; \
-      dbgffunc(__FILE__, __LINE__, tmp, __VA_ARGS__); \
+      constexpr short unsigned l = strlen(a); \
+      dbgffunc(__FILE__, __LINE__, l, tmp, __VA_ARGS__); \
     }
 
-void dbgfunc(const char* file, long int line, const char *msg);
-void dbgffunc(const char* file, long int line, const char *format, ...)
-     __attribute__((format(printf, 3, 4)));
+void dbgfunc(const char* file, long int line, short unsigned msg_len,
+        const char *msg);
+void dbgffunc(const char* file, long int line, short unsigned format_len,
+        const char *format, ...)
+        __attribute__((format(printf, 4, 5)));
 
 #endif // _RF433DEBUG_H
 
diff --git a/RF433any.cpp b/RF433any.cpp
index 970db0d..1fc6a46 100644
--- a/RF433any.cpp
+++ b/RF433any.cpp
@@ -350,6 +350,8 @@ inline bool Rail::rail_eat(uint16_t d) {
 
 #ifdef RF433ANY_DBG_TRACE
         dbg("R> P0");
+        dbgf("R> small = %lu, small * 4 = %lu, big = %lu",
+                small, small << 2, big);
 #endif
 
         if ((small << 2) >= big) {
diff --git a/extras/testplan/decoder/01/expect3.txt b/extras/testplan/decoder/01/expect3.txt
index e0d0741..d229a37 100644
--- a/extras/testplan/decoder/01/expect3.txt
+++ b/extras/testplan/decoder/01/expect3.txt
@@ -1,2 +1,2 @@
 [0] Received 9 bits: 01 6e
-    T=TRI, E=0, I=9000, S=572, L=1256, P=7020, Y=0, Z=522
+    T=TRI, E=0, I=8960, S=568, L=1256, P=6912, Y=0, Z=512
diff --git a/extras/testplan/decoder/01/expect4.txt b/extras/testplan/decoder/01/expect4.txt
index e0d0741..d229a37 100644
--- a/extras/testplan/decoder/01/expect4.txt
+++ b/extras/testplan/decoder/01/expect4.txt
@@ -1,2 +1,2 @@
 [0] Received 9 bits: 01 6e
-    T=TRI, E=0, I=9000, S=572, L=1256, P=7020, Y=0, Z=522
+    T=TRI, E=0, I=8960, S=568, L=1256, P=6912, Y=0, Z=512
diff --git a/extras/testplan/decoder/02/expect3.txt b/extras/testplan/decoder/02/expect3.txt
index 2974998..8e16465 100644
--- a/extras/testplan/decoder/02/expect3.txt
+++ b/extras/testplan/decoder/02/expect3.txt
@@ -1,3 +1,3 @@
 [0] Unknown encoding: 18 signal bits
     Signal: LS:SL:LS:LS:SL:LS:LS:LS:LL:SP
-    T=UNK, E=0, I=9000, S=572, L=1256, P=7020, Y=0, Z=522
+    T=UNK, E=0, I=8960, S=568, L=1256, P=6912, Y=0, Z=512
diff --git a/extras/testplan/decoder/02/expect4.txt b/extras/testplan/decoder/02/expect4.txt
index 2974998..8e16465 100644
--- a/extras/testplan/decoder/02/expect4.txt
+++ b/extras/testplan/decoder/02/expect4.txt
@@ -1,3 +1,3 @@
 [0] Unknown encoding: 18 signal bits
     Signal: LS:SL:LS:LS:SL:LS:LS:LS:LL:SP
-    T=UNK, E=0, I=9000, S=572, L=1256, P=7020, Y=0, Z=522
+    T=UNK, E=0, I=8960, S=568, L=1256, P=6912, Y=0, Z=512
diff --git a/extras/testplan/decoder/03/expect3.txt b/extras/testplan/decoder/03/expect3.txt
index 80876c6..e59a490 100644
--- a/extras/testplan/decoder/03/expect3.txt
+++ b/extras/testplan/decoder/03/expect3.txt
@@ -1,4 +1,4 @@
 [0] Received 32 bits: b5 35 6d 00
-    T=TRI, E=0, I=6908, S=598, L=1224, P=6908, Y=0, Z=560
+    T=TRI, E=0, I=6784, S=592, L=1216, P=6784, Y=0, Z=560
 [1] Received 32 bits: b5 35 6d 00
-    T=TRI, E=0, I=0, S=598, L=1224, P=6984, Y=0, Z=408
+    T=TRI, E=0, I=0, S=592, L=1216, P=6912, Y=0, Z=400
diff --git a/extras/testplan/decoder/03/expect4.txt b/extras/testplan/decoder/03/expect4.txt
index 80876c6..e59a490 100644
--- a/extras/testplan/decoder/03/expect4.txt
+++ b/extras/testplan/decoder/03/expect4.txt
@@ -1,4 +1,4 @@
 [0] Received 32 bits: b5 35 6d 00
-    T=TRI, E=0, I=6908, S=598, L=1224, P=6908, Y=0, Z=560
+    T=TRI, E=0, I=6784, S=592, L=1216, P=6784, Y=0, Z=560
 [1] Received 32 bits: b5 35 6d 00
-    T=TRI, E=0, I=0, S=598, L=1224, P=6984, Y=0, Z=408
+    T=TRI, E=0, I=0, S=592, L=1216, P=6912, Y=0, Z=400
diff --git a/extras/testplan/decoder/10/expect3.txt b/extras/testplan/decoder/10/expect3.txt
index bd6bb95..bb922e7 100644
--- a/extras/testplan/decoder/10/expect3.txt
+++ b/extras/testplan/decoder/10/expect3.txt
@@ -1,4 +1,4 @@
 [0] Received 32 bits: 7e dc 56 78
-    T=MAN, E=0, I=5436, S=1180, L=2270, P=5436, Y=0, Z=1112
+    T=MAN, E=0, I=5376, S=1176, L=2240, P=5376, Y=0, Z=1104
 [1] Received 32 bits: 7e dc 56 78
-    T=MAN, E=0, I=0, S=1180, L=2270, P=6740, Y=0, Z=1088
+    T=MAN, E=0, I=0, S=1176, L=2240, P=6656, Y=0, Z=1088
diff --git a/extras/testplan/decoder/10/expect4.txt b/extras/testplan/decoder/10/expect4.txt
index 0fbf550..adc15e1 100644
--- a/extras/testplan/decoder/10/expect4.txt
+++ b/extras/testplan/decoder/10/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 32 bits: 7e dc 56 78
-    T=MAN, E=0, I=5436, S=1180, L=2270, P=5436, Y=0, Z=1112
+    T=MAN, E=0, I=5376, S=1176, L=2240, P=5376, Y=0, Z=1104
 [1] Received 32 bits: 7e dc 56 78
-    T=MAN, E=0, I=0, S=1180, L=2270, P=6740, Y=0, Z=1088
+    T=MAN, E=0, I=0, S=1176, L=2240, P=6656, Y=0, Z=1088
 [2] Received 9 bits: 00 fd
-    T=MAN, E=0, I=0, S=1180, L=2270, P=0, Y=0, Z=1088
+    T=MAN, E=0, I=0, S=1176, L=2240, P=0, Y=0, Z=1088
diff --git a/extras/testplan/decoder/11/expect3.txt b/extras/testplan/decoder/11/expect3.txt
index 5c647c7..1a3a667 100644
--- a/extras/testplan/decoder/11/expect3.txt
+++ b/extras/testplan/decoder/11/expect3.txt
@@ -1,4 +1,4 @@
 [0] Received 32 bits: 8e dc 56 7f
-    T=MAN, E=0, I=5568, S=1154, L=2314, P=5568, Y=0, Z=1100
+    T=MAN, E=0, I=5504, S=1144, L=2240, P=5504, Y=0, Z=1088
 [1] Received 32 bits: 8e dc 56 7f
-    T=MAN, E=0, I=0, S=1154, L=2314, P=5584, Y=0, Z=1080
+    T=MAN, E=0, I=0, S=1144, L=2240, P=5504, Y=0, Z=1072
diff --git a/extras/testplan/decoder/11/expect4.txt b/extras/testplan/decoder/11/expect4.txt
index 620967b..e998636 100644
--- a/extras/testplan/decoder/11/expect4.txt
+++ b/extras/testplan/decoder/11/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 32 bits: 8e dc 56 7f
-    T=MAN, E=0, I=5568, S=1154, L=2314, P=5568, Y=0, Z=1100
+    T=MAN, E=0, I=5504, S=1144, L=2240, P=5504, Y=0, Z=1088
 [1] Received 32 bits: 8e dc 56 7f
-    T=MAN, E=0, I=0, S=1154, L=2314, P=5584, Y=0, Z=1080
+    T=MAN, E=0, I=0, S=1144, L=2240, P=5504, Y=0, Z=1072
 [2] Received 11 bits: 04 76
-    T=MAN, E=0, I=0, S=1154, L=2314, P=0, Y=0, Z=2244
+    T=MAN, E=0, I=0, S=1144, L=2240, P=0, Y=0, Z=2176
diff --git a/extras/testplan/decoder/12/expect3.txt b/extras/testplan/decoder/12/expect3.txt
index c93053b..860c027 100644
--- a/extras/testplan/decoder/12/expect3.txt
+++ b/extras/testplan/decoder/12/expect3.txt
@@ -1,4 +1,4 @@
 [0] Received 32 bits: fe dc 56 78
-    T=MAN, E=0, I=5468, S=1154, L=2310, P=5468, Y=0, Z=1104
+    T=MAN, E=0, I=5376, S=1152, L=2240, P=5376, Y=0, Z=1104
 [1] Received 32 bits: fe dc 56 78
-    T=MAN, E=0, I=0, S=1154, L=2310, P=6732, Y=0, Z=1088
+    T=MAN, E=0, I=0, S=1152, L=2240, P=6656, Y=0, Z=1088
diff --git a/extras/testplan/decoder/12/expect4.txt b/extras/testplan/decoder/12/expect4.txt
index 968b3a3..e7adda7 100644
--- a/extras/testplan/decoder/12/expect4.txt
+++ b/extras/testplan/decoder/12/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 32 bits: fe dc 56 78
-    T=MAN, E=0, I=5468, S=1154, L=2310, P=5468, Y=0, Z=1104
+    T=MAN, E=0, I=5376, S=1152, L=2240, P=5376, Y=0, Z=1104
 [1] Received 32 bits: fe dc 56 78
-    T=MAN, E=0, I=0, S=1154, L=2310, P=6732, Y=0, Z=1088
+    T=MAN, E=0, I=0, S=1152, L=2240, P=6656, Y=0, Z=1088
 [2] Received 9 bits: 01 fd
-    T=MAN, E=0, I=0, S=1154, L=2310, P=0, Y=0, Z=1096
+    T=MAN, E=0, I=0, S=1152, L=2240, P=0, Y=0, Z=1088
diff --git a/extras/testplan/decoder/13/expect3.txt b/extras/testplan/decoder/13/expect3.txt
index a206bed..d350096 100644
--- a/extras/testplan/decoder/13/expect3.txt
+++ b/extras/testplan/decoder/13/expect3.txt
@@ -1,5 +1,5 @@
 [0] Received 32 bits: 7e dc 56 78
-    T=MAN, E=0, I=5436, S=1180, L=2270, P=5436, Y=0, Z=1112
+    T=MAN, E=0, I=5376, S=1176, L=2240, P=5376, Y=0, Z=1104
 [1] Unknown encoding: 50 signal bits
     Signal: SS:SL:SS:SS:SS:SS:SS:LL:SS:LL:SS:SS:LS:SS:SL:LL:SL:SS:LS:SL:SS:SS:SS:LS:SS:SP
-    T=UNK, E=0, I=0, S=1180, L=2270, P=6740, Y=0, Z=1088
+    T=UNK, E=0, I=0, S=1176, L=2240, P=6656, Y=0, Z=1088
diff --git a/extras/testplan/decoder/13/expect4.txt b/extras/testplan/decoder/13/expect4.txt
index 792741a..4f6eab9 100644
--- a/extras/testplan/decoder/13/expect4.txt
+++ b/extras/testplan/decoder/13/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 32 bits: 7e dc 56 78
-    T=MAN, E=0, I=5436, S=1180, L=2270, P=5436, Y=0, Z=1112
+    T=MAN, E=0, I=5376, S=1176, L=2240, P=5376, Y=0, Z=1104
 [1] Received 27 bits(!): 03 f6 e2 a3
-    T=MAN, E=4, I=0, S=1180, L=2270, P=6740, Y=0, Z=1088
+    T=MAN, E=4, I=0, S=1176, L=2240, P=6656, Y=0, Z=1088
 [2] Received 9 bits: 00 fd
-    T=MAN, E=0, I=0, S=1180, L=2270, P=0, Y=0, Z=1088
+    T=MAN, E=0, I=0, S=1176, L=2240, P=0, Y=0, Z=1088
diff --git a/extras/testplan/decoder/20/expect3.txt b/extras/testplan/decoder/20/expect3.txt
index 8c9daea..1ae8e7d 100644
--- a/extras/testplan/decoder/20/expect3.txt
+++ b/extras/testplan/decoder/20/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=356, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=344, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/20/expect4.txt b/extras/testplan/decoder/20/expect4.txt
index 4addcfd..1ae8e7d 100644
--- a/extras/testplan/decoder/20/expect4.txt
+++ b/extras/testplan/decoder/20/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=344
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=356, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=344, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/21/expect3.txt b/extras/testplan/decoder/21/expect3.txt
index b37682a..859a94c 100644
--- a/extras/testplan/decoder/21/expect3.txt
+++ b/extras/testplan/decoder/21/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14924, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3740, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 55 bits: 29 3d 1c 2f 08 98 cf
-    T=TRI, E=0, I=0, S=356, L=734, P=3000, Y=0, Z=692
+    T=TRI, E=0, I=0, S=344, L=728, P=2944, Y=0, Z=688
diff --git a/extras/testplan/decoder/21/expect4.txt b/extras/testplan/decoder/21/expect4.txt
index 5e9b5b8..fb5678b 100644
--- a/extras/testplan/decoder/21/expect4.txt
+++ b/extras/testplan/decoder/21/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14924, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3740, Y=0, Z=324
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=320
 [1] Received 55 bits: 29 3d 1c 2f 08 98 cf
-    T=TRI, E=0, I=0, S=356, L=734, P=3000, Y=0, Z=692
+    T=TRI, E=0, I=0, S=344, L=728, P=2944, Y=0, Z=688
diff --git a/extras/testplan/decoder/22/expect3.txt b/extras/testplan/decoder/22/expect3.txt
index e3519b7..a190073 100644
--- a/extras/testplan/decoder/22/expect3.txt
+++ b/extras/testplan/decoder/22/expect3.txt
@@ -1,8 +1,8 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 33 bits: 01 42 3c 68 c0
-    T=TRI, E=0, I=0, S=356, L=734, P=15284, Y=0, Z=328
+    T=TRI, E=0, I=0, S=344, L=728, P=15232, Y=0, Z=320
 [2] Sync 11
-    T=SYN, E=0, I=0, S=356, L=734, P=3740, Y=0, Z=336
+    T=SYN, E=0, I=0, S=344, L=728, P=3712, Y=0, Z=336
 [3] Received 9 bits: 01 42
-    T=TRI, E=0, I=0, S=356, L=734, P=3740, Y=0, Z=336
+    T=TRI, E=0, I=0, S=344, L=728, P=3712, Y=0, Z=336
diff --git a/extras/testplan/decoder/22/expect4.txt b/extras/testplan/decoder/22/expect4.txt
index db9819f..1406bd0 100644
--- a/extras/testplan/decoder/22/expect4.txt
+++ b/extras/testplan/decoder/22/expect4.txt
@@ -1,8 +1,8 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=344
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 33 bits: 01 42 3c 68 c0
-    T=TRI, E=0, I=0, S=356, L=734, P=15284, Y=0, Z=328
+    T=TRI, E=0, I=0, S=344, L=728, P=15232, Y=0, Z=320
 [2] Sync 11
-    T=SYN, E=0, I=0, S=356, L=734, P=3740, Y=0, Z=336
+    T=SYN, E=0, I=0, S=344, L=728, P=3712, Y=0, Z=336
 [3] Received 9 bits: 01 42
-    T=TRI, E=0, I=0, S=356, L=734, P=0, Y=0, Z=356
+    T=TRI, E=0, I=0, S=344, L=728, P=0, Y=0, Z=352
diff --git a/extras/testplan/decoder/23/expect3.txt b/extras/testplan/decoder/23/expect3.txt
index 2e4bd74..4819314 100644
--- a/extras/testplan/decoder/23/expect3.txt
+++ b/extras/testplan/decoder/23/expect3.txt
@@ -1,8 +1,8 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 33 bits: 01 42 3c 68 c0
-    T=TRI, E=0, I=0, S=356, L=734, P=15284, Y=0, Z=328
+    T=TRI, E=0, I=0, S=344, L=728, P=15232, Y=0, Z=320
 [2] Sync 11
-    T=SYN, E=0, I=0, S=356, L=734, P=3740, Y=0, Z=336
+    T=SYN, E=0, I=0, S=344, L=728, P=3712, Y=0, Z=336
 [3] Received 10 bits: 02 84
-    T=TRI, E=0, I=0, S=356, L=734, P=15284, Y=0, Z=328
+    T=TRI, E=0, I=0, S=344, L=728, P=15232, Y=0, Z=320
diff --git a/extras/testplan/decoder/23/expect4.txt b/extras/testplan/decoder/23/expect4.txt
index db9819f..1406bd0 100644
--- a/extras/testplan/decoder/23/expect4.txt
+++ b/extras/testplan/decoder/23/expect4.txt
@@ -1,8 +1,8 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=344
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 33 bits: 01 42 3c 68 c0
-    T=TRI, E=0, I=0, S=356, L=734, P=15284, Y=0, Z=328
+    T=TRI, E=0, I=0, S=344, L=728, P=15232, Y=0, Z=320
 [2] Sync 11
-    T=SYN, E=0, I=0, S=356, L=734, P=3740, Y=0, Z=336
+    T=SYN, E=0, I=0, S=344, L=728, P=3712, Y=0, Z=336
 [3] Received 9 bits: 01 42
-    T=TRI, E=0, I=0, S=356, L=734, P=0, Y=0, Z=356
+    T=TRI, E=0, I=0, S=344, L=728, P=0, Y=0, Z=352
diff --git a/extras/testplan/decoder/24/expect3.txt b/extras/testplan/decoder/24/expect3.txt
index b131121..1ca5d0a 100644
--- a/extras/testplan/decoder/24/expect3.txt
+++ b/extras/testplan/decoder/24/expect3.txt
@@ -1,5 +1,5 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Unknown encoding: 66 signal bits
     Signal: LS:SL:LS:SL:SL:SL:SL:LS:SL:SL:SL:LS:LS:LS:LS:SL:SL:SL:LS:LS:SL:LS:SL:SL:SL:LS:LS:SL:SL:SL:SL:SL:LL
-    T=UNK, E=0, I=0, S=356, L=734, P=0, Y=0, Z=717
+    T=UNK, E=0, I=0, S=344, L=728, P=0, Y=0, Z=704
diff --git a/extras/testplan/decoder/24/expect4.txt b/extras/testplan/decoder/24/expect4.txt
index 3e52de8..734be69 100644
--- a/extras/testplan/decoder/24/expect4.txt
+++ b/extras/testplan/decoder/24/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=344
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Received 48 bits(!): a1 1e 34 60 22 63
-    T=TRI, E=1, I=0, S=356, L=734, P=0, Y=0, Z=708
+    T=TRI, E=1, I=0, S=344, L=728, P=0, Y=0, Z=704
diff --git a/extras/testplan/decoder/25/expect3.txt b/extras/testplan/decoder/25/expect3.txt
index 023447f..0af7e6b 100644
--- a/extras/testplan/decoder/25/expect3.txt
+++ b/extras/testplan/decoder/25/expect3.txt
@@ -1,7 +1,7 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Unknown encoding: 48 signal bits
     Signal: LS:SL:SS:SL:SL:LS:SL:SL:SL:SL:LS:LS:SL:SL:SL:LS:LS:SL:SL:LS:LS:SL:LS:LS:SP
-    T=UNK, E=0, I=0, S=356, L=736, P=15284, Y=0, Z=328
+    T=UNK, E=0, I=0, S=344, L=736, P=15232, Y=0, Z=320
 [2] Sync 8
-    T=SYN, E=0, I=0, S=356, L=736, P=3740, Y=0, Z=336
+    T=SYN, E=0, I=0, S=344, L=736, P=3712, Y=0, Z=336
diff --git a/extras/testplan/decoder/25/expect4.txt b/extras/testplan/decoder/25/expect4.txt
index 8f76c00..0af7e6b 100644
--- a/extras/testplan/decoder/25/expect4.txt
+++ b/extras/testplan/decoder/25/expect4.txt
@@ -1,7 +1,7 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=348, L(lo)=348, S(hi)=364, L(hi)=364, P=3724, Y=0, Z=344
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=352, L(hi)=352, P=3712, Y=0, Z=336
 [1] Unknown encoding: 48 signal bits
     Signal: LS:SL:SS:SL:SL:LS:SL:SL:SL:SL:LS:LS:SL:SL:SL:LS:LS:SL:SL:LS:LS:SL:LS:LS:SP
-    T=UNK, E=0, I=0, S=356, L=736, P=15284, Y=0, Z=328
+    T=UNK, E=0, I=0, S=344, L=736, P=15232, Y=0, Z=320
 [2] Sync 8
-    T=SYN, E=0, I=0, S=356, L=736, P=3740, Y=0, Z=336
+    T=SYN, E=0, I=0, S=344, L=736, P=3712, Y=0, Z=336
diff --git a/extras/testplan/decoder/30/code-sonoff1.txt b/extras/testplan/decoder/30/code-sonoff1.txt
index 0ffa9be..22cce06 100644
--- a/extras/testplan/decoder/30/code-sonoff1.txt
+++ b/extras/testplan/decoder/30/code-sonoff1.txt
@@ -1,12 +1,12 @@
 0,  5652
-1180,   300
+1180,   320
 440,   924
-1164,   236
-1136,   264
-1156,   244
+1164,   336
+1136,   294
+1156,   294
 408,   952
 416,   948
-1144,   256
+1144,   266
 400,   964
 1124,   276
 400,   968
diff --git a/extras/testplan/decoder/30/expect3.txt b/extras/testplan/decoder/30/expect3.txt
index 411e53b..8268e23 100644
--- a/extras/testplan/decoder/30/expect3.txt
+++ b/extras/testplan/decoder/30/expect3.txt
@@ -1,4 +1,4 @@
 [0] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=5652, S=338, L=1044, P=5652, Y=0, Z=364
+    T=TRI, E=0, I=5632, S=384, L=1032, P=5632, Y=0, Z=352
 [1] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=0, S=338, L=1044, P=10688, Y=0, Z=324
+    T=TRI, E=0, I=0, S=384, L=1032, P=10624, Y=0, Z=320
diff --git a/extras/testplan/decoder/30/expect4.txt b/extras/testplan/decoder/30/expect4.txt
index 2fe7e03..2ebd66a 100644
--- a/extras/testplan/decoder/30/expect4.txt
+++ b/extras/testplan/decoder/30/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=5652, S=338, L=1044, P=5652, Y=0, Z=364
+    T=TRI, E=0, I=5632, S=384, L=1032, P=5632, Y=0, Z=352
 [1] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=0, S=338, L=1044, P=10688, Y=0, Z=324
+    T=TRI, E=0, I=0, S=384, L=1032, P=10624, Y=0, Z=320
 [2] Received 17 bits: 01 72 9a
-    T=TRI, E=0, I=0, S=338, L=1044, P=0, Y=0, Z=328
+    T=TRI, E=0, I=0, S=384, L=1032, P=0, Y=0, Z=320
diff --git a/extras/testplan/decoder/31/expect3.txt b/extras/testplan/decoder/31/expect3.txt
index 66f1085..06afe77 100644
--- a/extras/testplan/decoder/31/expect3.txt
+++ b/extras/testplan/decoder/31/expect3.txt
@@ -1,4 +1,4 @@
 [0] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=10680, S=336, L=1036, P=10680, Y=0, Z=328
+    T=TRI, E=0, I=10624, S=336, L=1032, P=10624, Y=0, Z=320
 [1] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=0, S=336, L=1036, P=10708, Y=0, Z=316
+    T=TRI, E=0, I=0, S=336, L=1032, P=10624, Y=0, Z=304
diff --git a/extras/testplan/decoder/31/expect4.txt b/extras/testplan/decoder/31/expect4.txt
index 6d7b4a5..33eefb3 100644
--- a/extras/testplan/decoder/31/expect4.txt
+++ b/extras/testplan/decoder/31/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=10680, S=336, L=1036, P=10680, Y=0, Z=328
+    T=TRI, E=0, I=10624, S=336, L=1032, P=10624, Y=0, Z=320
 [1] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=0, S=336, L=1036, P=10708, Y=0, Z=316
+    T=TRI, E=0, I=0, S=336, L=1032, P=10624, Y=0, Z=304
 [2] Received 17 bits: 01 72 9a
-    T=TRI, E=0, I=0, S=336, L=1036, P=0, Y=0, Z=312
+    T=TRI, E=0, I=0, S=336, L=1032, P=0, Y=0, Z=304
diff --git a/extras/testplan/decoder/32/code-sonoff1-err.txt b/extras/testplan/decoder/32/code-sonoff1-err.txt
index 90ae501..acdaa59 100644
--- a/extras/testplan/decoder/32/code-sonoff1-err.txt
+++ b/extras/testplan/decoder/32/code-sonoff1-err.txt
@@ -1,12 +1,12 @@
 0,  5652
 1180,   300
 440,   924
-1164,   236
-1136,   264
-1156,   244
+1164,   300
+1136,   284
+1156,   294
 408,   952
 416,   948
-1144,   256
+1144,   276
 400,   964
 400,   276
 400,   968
diff --git a/extras/testplan/decoder/32/expect3.txt b/extras/testplan/decoder/32/expect3.txt
index e4ac80f..3951c11 100644
--- a/extras/testplan/decoder/32/expect3.txt
+++ b/extras/testplan/decoder/32/expect3.txt
@@ -1,5 +1,5 @@
 [0] Unknown encoding: 48 signal bits
     Signal: LS:SL:LS:LS:LS:SL:SL:LS:SL:SS:SL:SL:LS:LS:SL:LS:SL:SL:LS:SL:SL:LS:SL:SL:SP
-    T=UNK, E=0, I=5652, S=338, L=1044, P=5652, Y=0, Z=364
+    T=UNK, E=0, I=5632, S=360, L=1032, P=5632, Y=0, Z=352
 [1] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=0, S=338, L=1044, P=10688, Y=0, Z=324
+    T=TRI, E=0, I=0, S=360, L=1032, P=10624, Y=0, Z=320
diff --git a/extras/testplan/decoder/32/expect4.txt b/extras/testplan/decoder/32/expect4.txt
index 3f11162..2be9449 100644
--- a/extras/testplan/decoder/32/expect4.txt
+++ b/extras/testplan/decoder/32/expect4.txt
@@ -1,6 +1,6 @@
 [0] Received 23 bits(!): 5c 8d 24
-    T=TRI, E=1, I=5652, S=338, L=1044, P=5652, Y=0, Z=364
+    T=TRI, E=1, I=5632, S=360, L=1032, P=5632, Y=0, Z=352
 [1] Received 24 bits: b9 4d 24
-    T=TRI, E=0, I=0, S=338, L=1044, P=10688, Y=0, Z=324
+    T=TRI, E=0, I=0, S=360, L=1032, P=10624, Y=0, Z=320
 [2] Received 17 bits: 01 72 9a
-    T=TRI, E=0, I=0, S=338, L=1044, P=0, Y=0, Z=328
+    T=TRI, E=0, I=0, S=360, L=1032, P=0, Y=0, Z=320
diff --git a/extras/testplan/decoder/40/expect3.txt b/extras/testplan/decoder/40/expect3.txt
index 029423b..0cdaeb9 100644
--- a/extras/testplan/decoder/40/expect3.txt
+++ b/extras/testplan/decoder/40/expect3.txt
@@ -1,8 +1,8 @@
 [0] Received 12 bits: 05 55
-    T=TRN, E=0, I=23908, S=650, L=1348, P=23908, Y=650, Z=656
+    T=TRN, E=0, I=21504, S=640, L=1336, P=21504, Y=640, Z=656
 [1] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23936, Y=650, Z=664
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=656
 [2] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23956, Y=650, Z=628
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=624
 [3] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23936, Y=650, Z=656
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=656
diff --git a/extras/testplan/decoder/40/expect4.txt b/extras/testplan/decoder/40/expect4.txt
index 029423b..0cdaeb9 100644
--- a/extras/testplan/decoder/40/expect4.txt
+++ b/extras/testplan/decoder/40/expect4.txt
@@ -1,8 +1,8 @@
 [0] Received 12 bits: 05 55
-    T=TRN, E=0, I=23908, S=650, L=1348, P=23908, Y=650, Z=656
+    T=TRN, E=0, I=21504, S=640, L=1336, P=21504, Y=640, Z=656
 [1] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23936, Y=650, Z=664
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=656
 [2] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23956, Y=650, Z=628
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=624
 [3] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23936, Y=650, Z=656
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=656
diff --git a/extras/testplan/decoder/41/expect3.txt b/extras/testplan/decoder/41/expect3.txt
index 1cb7761..b67053a 100644
--- a/extras/testplan/decoder/41/expect3.txt
+++ b/extras/testplan/decoder/41/expect3.txt
@@ -1,8 +1,8 @@
 [0] Received 12 bits: 05 55
-    T=TRN, E=0, I=23908, S=666, L=1356, P=23908, Y=666, Z=636
+    T=TRN, E=0, I=21504, S=664, L=1352, P=21504, Y=664, Z=624
 [1] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=666, L=1356, P=23964, Y=666, Z=636
+    T=TRN, E=0, I=0, S=664, L=1352, P=21504, Y=664, Z=624
 [2] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=666, L=1356, P=23952, Y=666, Z=640
+    T=TRN, E=0, I=0, S=664, L=1352, P=21504, Y=664, Z=640
 [3] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=666, L=1356, P=23952, Y=666, Z=648
+    T=TRN, E=0, I=0, S=664, L=1352, P=21504, Y=664, Z=640
diff --git a/extras/testplan/decoder/41/expect4.txt b/extras/testplan/decoder/41/expect4.txt
index 1cb7761..b67053a 100644
--- a/extras/testplan/decoder/41/expect4.txt
+++ b/extras/testplan/decoder/41/expect4.txt
@@ -1,8 +1,8 @@
 [0] Received 12 bits: 05 55
-    T=TRN, E=0, I=23908, S=666, L=1356, P=23908, Y=666, Z=636
+    T=TRN, E=0, I=21504, S=664, L=1352, P=21504, Y=664, Z=624
 [1] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=666, L=1356, P=23964, Y=666, Z=636
+    T=TRN, E=0, I=0, S=664, L=1352, P=21504, Y=664, Z=624
 [2] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=666, L=1356, P=23952, Y=666, Z=640
+    T=TRN, E=0, I=0, S=664, L=1352, P=21504, Y=664, Z=640
 [3] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=666, L=1356, P=23952, Y=666, Z=648
+    T=TRN, E=0, I=0, S=664, L=1352, P=21504, Y=664, Z=640
diff --git a/extras/testplan/decoder/42/expect3.txt b/extras/testplan/decoder/42/expect3.txt
index 7d085e1..092351b 100644
--- a/extras/testplan/decoder/42/expect3.txt
+++ b/extras/testplan/decoder/42/expect3.txt
@@ -1,10 +1,10 @@
 [0] Unknown encoding: 24 signal bits
     Signal: SS:LL:SS:LL:SS:SS:LL:LL:SS:LL:SS:LL:SP
-    T=UNK, E=0, I=23908, S=650, L=1348, P=23908, Y=0, Z=656
+    T=UNK, E=0, I=21504, S=640, L=1336, P=21504, Y=0, Z=656
 [1] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23936, Y=650, Z=664
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=656
 [2] Unknown encoding: 24 signal bits
     Signal: SS:LL:SS:LL:SS:LL:SS:LL:SS:SL:SS:LL:SP
-    T=UNK, E=0, I=0, S=650, L=1348, P=23936, Y=0, Z=656
+    T=UNK, E=0, I=0, S=640, L=1336, P=21504, Y=0, Z=656
 [3] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23956, Y=650, Z=628
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=624
diff --git a/extras/testplan/decoder/42/expect4.txt b/extras/testplan/decoder/42/expect4.txt
index fd5e70b..a6a6600 100644
--- a/extras/testplan/decoder/42/expect4.txt
+++ b/extras/testplan/decoder/42/expect4.txt
@@ -1,9 +1,9 @@
 [0] Unknown encoding: 24 signal bits
     Signal: SS:LL:SS:LL:SS:SS:LL:LL:SS:LL:SS:LL:SP
-    T=UNK, E=0, I=23908, S=650, L=1348, P=23908, Y=0, Z=656
+    T=UNK, E=0, I=21504, S=640, L=1336, P=21504, Y=0, Z=656
 [1] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23936, Y=650, Z=664
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=656
 [2] Received 11 bits(!): 02 ad
-    T=TRN, E=1, I=0, S=650, L=1348, P=23936, Y=650, Z=656
+    T=TRN, E=1, I=0, S=640, L=1336, P=21504, Y=640, Z=656
 [3] Received 12 bits: 05 55
-    T=TRN, E=0, I=0, S=650, L=1348, P=23956, Y=650, Z=628
+    T=TRN, E=0, I=0, S=640, L=1336, P=21504, Y=640, Z=624
diff --git a/extras/testplan/decoder/50/expect3.txt b/extras/testplan/decoder/50/expect3.txt
index cdfa718..a3fe3c1 100644
--- a/extras/testplan/decoder/50/expect3.txt
+++ b/extras/testplan/decoder/50/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=2500, V=2500, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2432, V=2432, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/50/expect4.txt b/extras/testplan/decoder/50/expect4.txt
index 930f999..a3fe3c1 100644
--- a/extras/testplan/decoder/50/expect4.txt
+++ b/extras/testplan/decoder/50/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 11
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=2500, V=2500, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2432, V=2432, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/51/expect3.txt b/extras/testplan/decoder/51/expect3.txt
index 48a758f..dc8643f 100644
--- a/extras/testplan/decoder/51/expect3.txt
+++ b/extras/testplan/decoder/51/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 7
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=2500, V=2500, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2432, V=2432, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/51/expect4.txt b/extras/testplan/decoder/51/expect4.txt
index 48a758f..dc8643f 100644
--- a/extras/testplan/decoder/51/expect4.txt
+++ b/extras/testplan/decoder/51/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 7
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=2500, V=2500, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2432, V=2432, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/52/expect3.txt b/extras/testplan/decoder/52/expect3.txt
index 8072384..cb2dd24 100644
--- a/extras/testplan/decoder/52/expect3.txt
+++ b/extras/testplan/decoder/52/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 8
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=2500, V=2500, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2432, V=2432, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/52/expect4.txt b/extras/testplan/decoder/52/expect4.txt
index 549f798..cb2dd24 100644
--- a/extras/testplan/decoder/52/expect4.txt
+++ b/extras/testplan/decoder/52/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 8
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=2500, V=2500, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2432, V=2432, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/53/expect3.txt b/extras/testplan/decoder/53/expect3.txt
index da79c9a..575c2d4 100644
--- a/extras/testplan/decoder/53/expect3.txt
+++ b/extras/testplan/decoder/53/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 8
-    T=SYN, E=0, I=14916, S(lo)=340, L(lo)=340, S(hi)=368, L(hi)=368, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=368, L(hi)=368, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=354, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/53/expect4.txt b/extras/testplan/decoder/53/expect4.txt
index da79c9a..575c2d4 100644
--- a/extras/testplan/decoder/53/expect4.txt
+++ b/extras/testplan/decoder/53/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 8
-    T=SYN, E=0, I=14916, S(lo)=340, L(lo)=340, S(hi)=368, L(hi)=368, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=368, L(hi)=368, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=354, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/54/expect3.txt b/extras/testplan/decoder/54/expect3.txt
index 7441860..f5f875f 100644
--- a/extras/testplan/decoder/54/expect3.txt
+++ b/extras/testplan/decoder/54/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 9
-    T=SYN, E=0, I=14916, S(lo)=340, L(lo)=340, S(hi)=368, L(hi)=368, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=368, L(hi)=368, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=354, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/54/expect4.txt b/extras/testplan/decoder/54/expect4.txt
index 3fa051c..f5f875f 100644
--- a/extras/testplan/decoder/54/expect4.txt
+++ b/extras/testplan/decoder/54/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 9
-    T=SYN, E=0, I=14916, S(lo)=340, L(lo)=340, S(hi)=368, L(hi)=368, P=3724, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=368, L(hi)=368, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=354, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/55/expect3.txt b/extras/testplan/decoder/55/expect3.txt
index f421e34..39b1ba2 100644
--- a/extras/testplan/decoder/55/expect3.txt
+++ b/extras/testplan/decoder/55/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 10
-    T=SYN, E=0, I=14916, S(lo)=340, L(lo)=340, S(hi)=368, L(hi)=368, P=3724, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=368, L(hi)=368, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=354, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/55/expect4.txt b/extras/testplan/decoder/55/expect4.txt
index f94ce43..39b1ba2 100644
--- a/extras/testplan/decoder/55/expect4.txt
+++ b/extras/testplan/decoder/55/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 10
-    T=SYN, E=0, I=14916, S(lo)=340, L(lo)=340, S(hi)=368, L(hi)=368, P=3724, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=336, L(lo)=336, S(hi)=368, L(hi)=368, P=3712, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=354, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/56/expect3.txt b/extras/testplan/decoder/56/expect3.txt
index 809cecf..24155b8 100644
--- a/extras/testplan/decoder/56/expect3.txt
+++ b/extras/testplan/decoder/56/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 9
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=3000, V=3000, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2944, V=2944, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/56/expect4.txt b/extras/testplan/decoder/56/expect4.txt
index 4aa8cb0..24155b8 100644
--- a/extras/testplan/decoder/56/expect4.txt
+++ b/extras/testplan/decoder/56/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 9
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=3000, V=3000, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=2944, V=2944, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/57/expect3.txt b/extras/testplan/decoder/57/expect3.txt
index 7ab805a..04ea150 100644
--- a/extras/testplan/decoder/57/expect3.txt
+++ b/extras/testplan/decoder/57/expect3.txt
@@ -1,4 +1,4 @@
 [0] Sync 10
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=1200, V=1200, Y=0, Z=348
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=1200, V=1200, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/decoder/57/expect4.txt b/extras/testplan/decoder/57/expect4.txt
index e8847d2..04ea150 100644
--- a/extras/testplan/decoder/57/expect4.txt
+++ b/extras/testplan/decoder/57/expect4.txt
@@ -1,4 +1,4 @@
 [0] Sync 10
-    T=SYN, E=0, I=14916, S(lo)=356, L(lo)=356, S(hi)=364, L(hi)=364, P=3724, U=1200, V=1200, Y=0, Z=340
+    T=SYN, E=0, I=14848, S(lo)=352, L(lo)=352, S(hi)=352, L(hi)=352, P=3712, U=1200, V=1200, Y=0, Z=336
 [1] Received 55 bits: 50 8f 1a 30 08 98 cf
-    T=TRI, E=0, I=0, S=360, L=734, P=3000, Y=0, Z=708
+    T=TRI, E=0, I=0, S=352, L=728, P=2944, Y=0, Z=704
diff --git a/extras/testplan/track/09/code-flo.txt b/extras/testplan/track/09/code-flo.txt
index 76ea731..414007c 100644
--- a/extras/testplan/track/09/code-flo.txt
+++ b/extras/testplan/track/09/code-flo.txt
@@ -14,8 +14,6 @@
 608, 24028
 608,   728
 1300,  1412
-596,   736
-1288,  1424
 592,   748
 1284,  1420
 596,   736
@@ -29,8 +27,6 @@
 1268,  1420
 604,   736
 1300,  1412
-588,   744
-1296,  1412
 592,   748
 1276,  1428
 588,   752
@@ -38,12 +34,8 @@
 580,   760
 1280,  1420
 584, 24048
-612,   736
-1260,  1440
 580,   760
 1268,  1436
-580,   760
-1256,  1440
 596,   744
 1276,  1424
 596,   736
@@ -51,19 +43,6 @@
 596,   752
 1264,  1432
 576, 24056
-572,   776
-1256,  1448
-580,   752
-1276,  1424
-592,   744
-1284,  1420
-616,   728
-1268,  1424
-588,   752
-1256,  1448
-568,   776
-1240,  1464
-580, 24040
 576,   764
 1260,  1440
 616,   716
diff --git a/extras/testplan/track/09/expect1.txt b/extras/testplan/track/09/expect1.txt
index 41af441..07c0f02 100644
--- a/extras/testplan/track/09/expect1.txt
+++ b/extras/testplan/track/09/expect1.txt
@@ -1,6 +1,6 @@
 [
   {
-    "N":138,"start":0,"end":29,
+    "N":96,"start":0,"end":29,
     "trk":TRK_RECV,"xorval":0x00000B97,
     "r_low":{
       "bits":12,"v":0x00000D1A,"railstatus":"closed","n":2,
@@ -16,64 +16,48 @@
     }
   }
   {
-    "N":138,"start":0,"end":55,
-    "trk":TRK_RECV,"xorval":0x00000FFF,
+    "N":96,"start":0,"end":51,
+    "trk":TRK_RECV,"xorval":0x000003FF,
     "r_low":{
-      "bits":12,"v":0x00000AAA,"railstatus":"closed","n":2,
+      "bits":10,"v":0x000002AA,"railstatus":"closed","n":2,
       "b_short":{"inf":234,"mid":624,"sup":952},
       "b_long":{"inf":953,"mid":1280,"sup":2080},
       "b_sep":{"inf":0,"mid":0,"sup":0}
     },
     "r_high":{
-      "bits":11,"v":0x00000555,"railstatus":"stop received","n":2,
+      "bits":9,"v":0x00000155,"railstatus":"stop received","n":2,
       "b_short":{"inf":264,"mid":704,"sup":1048},
       "b_long":{"inf":1049,"mid":1392,"sup":2262},
       "b_sep":{"inf":13440,"mid":21504,"sup":65535}
     }
   }
   {
-    "N":138,"start":0,"end":81,
-    "trk":TRK_RECV,"xorval":0x00000FFF,
+    "N":96,"start":0,"end":73,
+    "trk":TRK_RECV,"xorval":0x000003FF,
     "r_low":{
-      "bits":12,"v":0x00000AAA,"railstatus":"closed","n":2,
+      "bits":10,"v":0x000002AA,"railstatus":"closed","n":2,
       "b_short":{"inf":234,"mid":624,"sup":952},
       "b_long":{"inf":953,"mid":1280,"sup":2080},
       "b_sep":{"inf":0,"mid":0,"sup":0}
     },
     "r_high":{
-      "bits":11,"v":0x00000555,"railstatus":"stop received","n":2,
+      "bits":9,"v":0x00000155,"railstatus":"stop received","n":2,
       "b_short":{"inf":264,"mid":704,"sup":1048},
       "b_long":{"inf":1049,"mid":1392,"sup":2262},
       "b_sep":{"inf":13440,"mid":21504,"sup":65535}
     }
   }
   {
-    "N":138,"start":0,"end":107,
-    "trk":TRK_RECV,"xorval":0x00000FFF,
+    "N":96,"start":0,"end":91,
+    "trk":TRK_RECV,"xorval":0x000000FF,
     "r_low":{
-      "bits":12,"v":0x00000AAA,"railstatus":"closed","n":2,
+      "bits":8,"v":0x000000AA,"railstatus":"closed","n":2,
       "b_short":{"inf":234,"mid":624,"sup":952},
       "b_long":{"inf":953,"mid":1280,"sup":2080},
       "b_sep":{"inf":0,"mid":0,"sup":0}
     },
     "r_high":{
-      "bits":11,"v":0x00000555,"railstatus":"stop received","n":2,
-      "b_short":{"inf":264,"mid":704,"sup":1048},
-      "b_long":{"inf":1049,"mid":1392,"sup":2262},
-      "b_sep":{"inf":13440,"mid":21504,"sup":65535}
-    }
-  }
-  {
-    "N":138,"start":0,"end":133,
-    "trk":TRK_RECV,"xorval":0x00000FFF,
-    "r_low":{
-      "bits":12,"v":0x00000AAA,"railstatus":"closed","n":2,
-      "b_short":{"inf":234,"mid":624,"sup":952},
-      "b_long":{"inf":953,"mid":1280,"sup":2080},
-      "b_sep":{"inf":0,"mid":0,"sup":0}
-    },
-    "r_high":{
-      "bits":11,"v":0x00000555,"railstatus":"stop received","n":2,
+      "bits":7,"v":0x00000055,"railstatus":"stop received","n":2,
       "b_short":{"inf":264,"mid":704,"sup":1048},
       "b_long":{"inf":1049,"mid":1392,"sup":2262},
       "b_sep":{"inf":13440,"mid":21504,"sup":65535}
diff --git a/extras/testplan/track/09/expect2.txt b/extras/testplan/track/09/expect2.txt
index 5b2c4a3..a6a4255 100644
--- a/extras/testplan/track/09/expect2.txt
+++ b/extras/testplan/track/09/expect2.txt
@@ -1,22 +1,18 @@
 IH_max_pending_timings = 3
-> nb_sections = 5, initseq = 8448
+> nb_sections = 4, initseq = 8448
   00  SSEP
       sep = 21504
       low:  [2] n = 12, v = 0x00000D1A
       high: [2] n = 11, v = 0x0000068D
   01  SSEP
       sep = 21504
-      low:  [2] n = 12, v = 0x00000AAA
-      high: [2] n = 11, v = 0x00000555
+      low:  [2] n = 10, v = 0x000002AA
+      high: [2] n =  9, v = 0x00000155
   02  SSEP
       sep = 21504
-      low:  [2] n = 12, v = 0x00000AAA
-      high: [2] n = 11, v = 0x00000555
+      low:  [2] n = 10, v = 0x000002AA
+      high: [2] n =  9, v = 0x00000155
   03  SSEP
       sep = 21504
-      low:  [2] n = 12, v = 0x00000AAA
-      high: [2] n = 11, v = 0x00000555
-  04  SSEP
-      sep = 21504
-      low:  [2] n = 12, v = 0x00000AAA
-      high: [2] n = 11, v = 0x00000555
+      low:  [2] n =  8, v = 0x000000AA
+      high: [2] n =  7, v = 0x00000055