diff --git a/doc/meshtastic-grafana-dashboard.json b/doc/meshtastic-grafana-dashboard.json
index e0b079c..e73c4f0 100644
--- a/doc/meshtastic-grafana-dashboard.json
+++ b/doc/meshtastic-grafana-dashboard.json
@@ -23,9 +23,8 @@
   "panels": [
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -146,7 +145,7 @@
         {
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [],
           "hide": false,
@@ -203,85 +202,8 @@
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "continuous-GrYlRd"
-          },
-          "custom": {
-            "fillOpacity": 70,
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineWidth": 0,
-            "spanNulls": true
-          },
-          "fieldMinMax": true,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 25,
-        "w": 24,
-        "x": 0,
-        "y": 15
-      },
-      "id": 5,
-      "options": {
-        "alignValue": "left",
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "mergeValues": true,
-        "rowHeight": 0.9,
-        "showValue": "auto",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "11.3.0",
-      "targets": [
-        {
-          "alias": "",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
-          },
-          "hide": false,
-          "query": "SELECT last(\"hops_away\") \nFROM \"common_data\" \nWHERE $timeFilter \nGROUP BY time($__interval), \"sender\" fill(null)",
-          "rawQuery": true,
-          "refId": "A",
-          "resultFormat": "time_series"
-        }
-      ],
-      "title": "Hops Away",
-      "type": "state-timeline"
-    },
-    {
-      "datasource": {
-        "default": false,
-        "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -340,10 +262,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 16,
+        "h": 19,
         "w": 12,
         "x": 0,
-        "y": 40
+        "y": 15
       },
       "id": 8,
       "options": {
@@ -370,7 +292,7 @@
           "alias": "neighborinfo",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -411,7 +333,7 @@
           "alias": "detection",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -453,7 +375,7 @@
           "alias": "nodeinfo",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -495,7 +417,7 @@
           "alias": "paxcounter",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -537,7 +459,7 @@
           "alias": "position",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -579,7 +501,7 @@
           "alias": "telemetry",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -621,7 +543,7 @@
           "alias": "text",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -663,7 +585,7 @@
           "alias": "traceroute",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -707,9 +629,8 @@
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -768,10 +689,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 16,
+        "h": 19,
         "w": 12,
         "x": 12,
-        "y": 40
+        "y": 15
       },
       "id": 9,
       "options": {
@@ -796,7 +717,7 @@
           "alias": "Unique stations",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -840,91 +761,57 @@
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
           "color": {
-            "mode": "palette-classic"
+            "mode": "continuous-GrYlRd"
           },
           "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMax": 4.6,
-            "axisSoftMin": 3,
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
+            "fillOpacity": 70,
             "hideFrom": {
               "legend": false,
               "tooltip": false,
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "always",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
+            "lineWidth": 0,
+            "spanNulls": true
           },
+          "fieldMinMax": true,
           "mappings": [],
-          "min": 3,
           "thresholds": {
             "mode": "absolute",
             "steps": [
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
-          },
-          "unit": "volt"
+          }
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 12,
+        "h": 13,
         "w": 12,
         "x": 0,
-        "y": 56
+        "y": 34
       },
-      "id": 1,
+      "id": 5,
       "options": {
+        "alignValue": "left",
         "legend": {
-          "calcs": [
-            "lastNotNull",
-            "min",
-            "max"
-          ],
-          "displayMode": "table",
+          "displayMode": "list",
           "placement": "bottom",
-          "showLegend": true,
-          "sortBy": "Name",
-          "sortDesc": true
+          "showLegend": true
         },
+        "mergeValues": true,
+        "rowHeight": 0.9,
+        "showValue": "auto",
         "tooltip": {
-          "maxHeight": 600,
           "mode": "single",
           "sort": "none"
         }
@@ -935,23 +822,22 @@
           "alias": "",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "hide": false,
-          "query": "SELECT last(\"voltage\") \nFROM \"telemetry\" \nWHERE $timeFilter AND voltage >1\nGROUP BY time($__interval), \"sender\" fill(null)",
+          "query": "SELECT last(\"hops_away\") \nFROM \"common_data\" \nWHERE $timeFilter \nGROUP BY time($__interval), \"sender\" fill(null)",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series"
         }
       ],
-      "title": "Voltage Reports",
-      "type": "timeseries"
+      "title": "Hops Away",
+      "type": "state-timeline"
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -1010,10 +896,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 12,
+        "h": 13,
         "w": 12,
         "x": 12,
-        "y": 56
+        "y": 34
       },
       "id": 2,
       "options": {
@@ -1038,7 +924,7 @@
         {
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "groupBy": [
             {
@@ -1090,9 +976,116 @@
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "axisSoftMax": 4.6,
+            "axisSoftMin": 3,
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "always",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "min": 3,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "volt"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 0,
+        "y": 47
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [
+            "lastNotNull",
+            "min",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true,
+          "sortBy": "Name",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "maxHeight": 600,
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "alias": "",
+          "datasource": {
+            "type": "influxdb",
+            "uid": "adxynk2dg385cb"
+          },
+          "hide": false,
+          "query": "SELECT last(\"voltage\") \nFROM \"telemetry\" \nWHERE $timeFilter AND voltage >1\nGROUP BY time($__interval), \"sender\" fill(null)",
+          "rawQuery": true,
+          "refId": "A",
+          "resultFormat": "time_series"
+        }
+      ],
+      "title": "Voltage Reports",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "influxdb",
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -1146,7 +1139,7 @@
               }
             ]
           },
-          "unit": "celsius"
+          "unit": "humidity"
         },
         "overrides": [
           {
@@ -1176,12 +1169,12 @@
         ]
       },
       "gridPos": {
-        "h": 11,
+        "h": 12,
         "w": 12,
-        "x": 0,
-        "y": 68
+        "x": 12,
+        "y": 47
       },
-      "id": 13,
+      "id": 14,
       "options": {
         "legend": {
           "calcs": [
@@ -1205,23 +1198,22 @@
           "alias": "",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "hide": false,
-          "query": "SELECT LAST(\"temperature\") \nFROM \"telemetry\"\nWHERE $timeFilter AND temperature  !=0\nGROUP BY time($__interval), \"sender\" fill(null)  ",
+          "query": "SELECT LAST(\"relative_humidity\") \nFROM \"telemetry\"\nWHERE $timeFilter AND \"relative_humidity\" >0\nGROUP BY time($__interval), \"sender\" fill(null)  ",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series"
         }
       ],
-      "title": "Temperature Reports",
+      "title": "Humidity Reports",
       "type": "timeseries"
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -1275,7 +1267,7 @@
               }
             ]
           },
-          "unit": "humidity"
+          "unit": "celsius"
         },
         "overrides": [
           {
@@ -1307,10 +1299,10 @@
       "gridPos": {
         "h": 11,
         "w": 12,
-        "x": 12,
-        "y": 68
+        "x": 0,
+        "y": 59
       },
-      "id": 14,
+      "id": 13,
       "options": {
         "legend": {
           "calcs": [
@@ -1334,22 +1326,22 @@
           "alias": "",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "hide": false,
-          "query": "SELECT LAST(\"relative_humidity\") \nFROM \"telemetry\"\nWHERE $timeFilter AND \"relative_humidity\" >0\nGROUP BY time($__interval), \"sender\" fill(null)  ",
+          "query": "SELECT LAST(\"temperature\") \nFROM \"telemetry\"\nWHERE $timeFilter AND temperature  !=0\nGROUP BY time($__interval), \"sender\" fill(null)  ",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series"
         }
       ],
-      "title": "Humidity Reports",
+      "title": "Temperature Reports",
       "type": "timeseries"
     },
     {
       "datasource": {
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -1375,7 +1367,7 @@
             "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
-            "pointSize": 7,
+            "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
@@ -1390,8 +1382,6 @@
             }
           },
           "mappings": [],
-          "max": 100,
-          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1412,10 +1402,10 @@
       "gridPos": {
         "h": 11,
         "w": 12,
-        "x": 0,
-        "y": 79
+        "x": 12,
+        "y": 59
       },
-      "id": 7,
+      "id": 4,
       "options": {
         "legend": {
           "calcs": [
@@ -1439,23 +1429,22 @@
           "alias": "",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "hide": false,
-          "query": "SELECT LAST(\"channel_utilization\") \nFROM \"telemetry\"\nWHERE $timeFilter AND channel_utilization <=100\nGROUP BY time($__interval), \"sender\" fill(null)  ",
+          "query": "SELECT mean(\"air_util_tx\") \nFROM \"telemetry\" \nWHERE $timeFilter  and \"air_util_tx\" <=100\nGROUP BY time($__interval), \"sender\" fill(null)",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series"
         }
       ],
-      "title": "Channel Utilization",
+      "title": "Air TX Time Reports",
       "type": "timeseries"
     },
     {
       "datasource": {
-        "default": false,
         "type": "influxdb",
-        "uid": "ddum9hw9td2psb"
+        "uid": "adxynk2dg385cb"
       },
       "fieldConfig": {
         "defaults": {
@@ -1481,7 +1470,7 @@
             "insertNulls": false,
             "lineInterpolation": "linear",
             "lineWidth": 1,
-            "pointSize": 5,
+            "pointSize": 7,
             "scaleDistribution": {
               "type": "linear"
             },
@@ -1496,6 +1485,8 @@
             }
           },
           "mappings": [],
+          "max": 100,
+          "min": 0,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -1514,12 +1505,12 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 11,
+        "h": 16,
         "w": 12,
-        "x": 12,
-        "y": 79
+        "x": 0,
+        "y": 70
       },
-      "id": 4,
+      "id": 7,
       "options": {
         "legend": {
           "calcs": [
@@ -1543,16 +1534,16 @@
           "alias": "",
           "datasource": {
             "type": "influxdb",
-            "uid": "ddum9hw9td2psb"
+            "uid": "adxynk2dg385cb"
           },
           "hide": false,
-          "query": "SELECT mean(\"air_util_tx\") \nFROM \"telemetry\" \nWHERE $timeFilter  and \"air_util_tx\" <=100\nGROUP BY time($__interval), \"sender\" fill(null)",
+          "query": "SELECT LAST(\"channel_utilization\") \nFROM \"telemetry\"\nWHERE $timeFilter AND channel_utilization <=100\nGROUP BY time($__interval), \"sender\" fill(null)  ",
           "rawQuery": true,
           "refId": "A",
           "resultFormat": "time_series"
         }
       ],
-      "title": "Air TX Time Reports",
+      "title": "Channel Utilization",
       "type": "timeseries"
     }
   ],
@@ -1571,6 +1562,6 @@
   "timezone": "browser",
   "title": "Meshtastic",
   "uid": "ddum9lerrqww0c",
-  "version": 115,
+  "version": 130,
   "weekStart": ""
 }
\ No newline at end of file