diff --git a/avr/devices/n23/aqua_n23.xml b/avr/devices/n23/aqua_n23.xml
index a4de1bd..2fd9f35 100644
--- a/avr/devices/n23/aqua_n23.xml
+++ b/avr/devices/n23/aqua_n23.xml
@@ -5,12 +5,12 @@
   <deviceversion>23</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="SGP40_VALUE"  id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_TVOC"   id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_CO2"    id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="SGP40_VALUE"            id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
+    <value name="SGP30_TVOC"             id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
+    <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -19,8 +19,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/avr/devices/n24/aqua_n24.xml b/avr/devices/n24/aqua_n24.xml
index 207c53e..6cee19c 100644
--- a/avr/devices/n24/aqua_n24.xml
+++ b/avr/devices/n24/aqua_n24.xml
@@ -5,13 +5,13 @@
   <deviceversion>24</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="SGP40_VALUE"  id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_TVOC"   id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_CO2"    id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
-    <value name="LIGHT"        id="0x0b" type="sensor" dataType="rational" modality="light"                 denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="SGP40_VALUE"            id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
+    <value name="SGP30_TVOC"             id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
+    <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
+    <value name="LIGHT"                  id="0x0b" type="sensor" dataType="rational" modality="light"                 denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -20,8 +20,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/avr/devices/n25/aqua_n25.xml b/avr/devices/n25/aqua_n25.xml
index 5eea16c..470ff46 100644
--- a/avr/devices/n25/aqua_n25.xml
+++ b/avr/devices/n25/aqua_n25.xml
@@ -5,15 +5,15 @@
   <deviceversion>25</deviceversion>
   
   <values>
-    <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
+    <value name="DS18B20_TEMP"           id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
 
-    <value name="NUMLEDS"      id="0x82" type="actor"  dataType="int" />
-    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword" />
+    <value name="NUMLEDS"                id="0x82" type="actor"  dataType="int" />
+    <value name="RGBWVALUE"              id="0x83" type="actor"  dataType="dword" />
 
-    <value name="MALRGBWVALUE" id="0x84" type="actor"  dataType="dword" />
-    <value name="MALONTIME"    id="0x85" type="actor"  dataType="uint16" />
-    <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
-    <value name="MALSOURCE2"   id="0x87" type="actor"  dataType="uint16" />
+    <value name="MALRGBWVALUE"           id="0x84" type="actor"  dataType="dword" />
+    <value name="MALONTIME"              id="0x85" type="actor"  dataType="uint16" />
+    <value name="MALSOURCE1"             id="0x86" type="actor"  dataType="uint16" />
+    <value name="MALSOURCE2"             id="0x87" type="actor"  dataType="uint16" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -22,8 +22,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/avr/devices/n26/aqua_n26.xml b/avr/devices/n26/aqua_n26.xml
index b7a38e2..33515b5 100644
--- a/avr/devices/n26/aqua_n26.xml
+++ b/avr/devices/n26/aqua_n26.xml
@@ -5,8 +5,8 @@
   <deviceversion>26</deviceversion>
   
   <values>
-    <value name="SGP30_TVOC"   id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_CO2"    id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
+    <value name="SGP30_TVOC"             id="0x09" type="sensor" dataType="rational" modality="tvoc"  denom="1" />
+    <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"   denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -15,6 +15,8 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
     <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
   </values>
diff --git a/avr/devices/n27/aqua_n27.xml b/avr/devices/n27/aqua_n27.xml
index 9238a60..26b7ef5 100644
--- a/avr/devices/n27/aqua_n27.xml
+++ b/avr/devices/n27/aqua_n27.xml
@@ -5,13 +5,13 @@
   <deviceversion>27</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="SGP40_VALUE"  id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_TVOC"   id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
-    <value name="SGP30_CO2"    id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
-    <value name="LIGHT"        id="0x0b" type="sensor" dataType="rational" modality="light"                 denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="SGP40_VALUE"            id="0x08" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
+    <value name="SGP30_TVOC"             id="0x09" type="sensor" dataType="rational" modality="tvoc"                  denom="1" />
+    <value name="SGP30_CO2"              id="0x0a" type="sensor" dataType="rational" modality="co2"                   denom="1" />
+    <value name="LIGHT"                  id="0x0b" type="sensor" dataType="rational" modality="light"                 denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -20,8 +20,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/avr/devices/r04/aqua_r04.xml b/avr/devices/r04/aqua_r04.xml
index 865441c..a9b72ef 100644
--- a/avr/devices/r04/aqua_r04.xml
+++ b/avr/devices/r04/aqua_r04.xml
@@ -27,7 +27,8 @@
     <value name="stats_msgsize_errors2"   id="0xf0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_missed_errors2"    id="0xf1" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"               id="0x88" type="actor"  dataType="uint16" />
+    <value name="addressRange"            id="0x89" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/devices/nodes/aqua_n16.xml b/devices/nodes/aqua_n16.xml
index c14dde5..4f18f70 100644
--- a/devices/nodes/aqua_n16.xml
+++ b/devices/nodes/aqua_n16.xml
@@ -5,10 +5,10 @@
   <deviceversion>16</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="DOOR"         id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="DOOR"                   id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -17,8 +17,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
     
   </values>
 
diff --git a/devices/nodes/aqua_n17.xml b/devices/nodes/aqua_n17.xml
index afef95b..ef7a596 100644
--- a/devices/nodes/aqua_n17.xml
+++ b/devices/nodes/aqua_n17.xml
@@ -5,9 +5,9 @@
   <deviceversion>17</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -16,8 +16,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
 
   </values>
 
diff --git a/devices/nodes/aqua_n18.xml b/devices/nodes/aqua_n18.xml
index ad1c691..46e4212 100644
--- a/devices/nodes/aqua_n18.xml
+++ b/devices/nodes/aqua_n18.xml
@@ -5,10 +5,10 @@
   <deviceversion>18</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="CCS811_CO2"   id="0x07" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
-    <value name="CCS811_TVOC"  id="0x08" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="CCS811_CO2"             id="0x07" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
+    <value name="CCS811_TVOC"            id="0x08" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -17,8 +17,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/devices/nodes/aqua_n19.xml b/devices/nodes/aqua_n19.xml
index 22b6104..78a306d 100644
--- a/devices/nodes/aqua_n19.xml
+++ b/devices/nodes/aqua_n19.xml
@@ -5,10 +5,10 @@
   <deviceversion>19</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="CCS811_CO2"   id="0x07" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
-    <value name="CCS811_TVOC"  id="0x08" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="CCS811_CO2"             id="0x07" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
+    <value name="CCS811_TVOC"            id="0x08" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -17,8 +17,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
 
   </values>
 
diff --git a/devices/nodes/aqua_n20.xml b/devices/nodes/aqua_n20.xml
index 559dc43..e465cbe 100644
--- a/devices/nodes/aqua_n20.xml
+++ b/devices/nodes/aqua_n20.xml
@@ -5,11 +5,11 @@
   <deviceversion>20</deviceversion>
   
   <values>
-    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
-    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
-    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
-    <value name="CCS811_CO2"   id="0x08" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
-    <value name="CCS811_TVOC"  id="0x09" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
+    <value name="SI7021_TEMP"            id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"             id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"                 id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="CCS811_CO2"             id="0x08" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
+    <value name="CCS811_TVOC"            id="0x09" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -18,8 +18,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>
diff --git a/devices/nodes/aqua_n22.xml b/devices/nodes/aqua_n22.xml
index 8749b6a..7e76bf1 100644
--- a/devices/nodes/aqua_n22.xml
+++ b/devices/nodes/aqua_n22.xml
@@ -5,15 +5,15 @@
   <deviceversion>22</deviceversion>
   
   <values>
-    <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
+    <value name="DS18B20_TEMP"           id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
 
-    <value name="NUMLEDS"      id="0x82" type="actor"  dataType="int" />
-    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword" />
+    <value name="NUMLEDS"                id="0x82" type="actor"  dataType="int" />
+    <value name="RGBWVALUE"              id="0x83" type="actor"  dataType="dword" />
 
-    <value name="MALRGBWVALUE" id="0x84" type="actor"  dataType="dword" />
-    <value name="MALONTIME"    id="0x85" type="actor"  dataType="uint16" />
-    <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
-    <value name="MALSOURCE2"   id="0x87" type="actor"  dataType="uint16" />
+    <value name="MALRGBWVALUE"           id="0x84" type="actor"  dataType="dword" />
+    <value name="MALONTIME"              id="0x85" type="actor"  dataType="uint16" />
+    <value name="MALSOURCE1"             id="0x86" type="actor"  dataType="uint16" />
+    <value name="MALSOURCE2"             id="0x87" type="actor"  dataType="uint16" />
 
     <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
@@ -22,8 +22,10 @@
     <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
     <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_msgsize_errors"   id="0xe7" type="sensor" dataType="uint16" denom="1" />
+    <value name="stats_missed_errors"    id="0xe8" type="sensor" dataType="uint16" denom="1" />
 
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
+    <value name="LEDTIMING"              id="0x88" type="actor"  dataType="uint16" />
   </values>
 
 </device>