diff --git a/wiki/grafana.json b/wiki/grafana.json
index 5abae8f..6b6cf2b 100644
--- a/wiki/grafana.json
+++ b/wiki/grafana.json
@@ -155,7 +155,7 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 3,
+        "w": 5,
         "x": 3,
         "y": 0
       },
@@ -184,9 +184,10 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "max(increase(downloaded_total[5y]))",
+          "editorMode": "builder",
+          "expr": "sum(increase(downloaded_total[5y]))",
           "fullMetaSearch": false,
+          "hide": false,
           "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "__auto",
@@ -224,8 +225,8 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 3,
-        "x": 6,
+        "w": 5,
+        "x": 8,
         "y": 0
       },
       "id": 15,
@@ -253,8 +254,8 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "max(increase(downloaded_bytes_total[5y]))",
+          "editorMode": "builder",
+          "expr": "sum(increase(downloaded_bytes_total[5y]))",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -267,77 +268,6 @@
       "title": "Bytes Downloaded",
       "type": "stat"
     },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "fieldMinMax": false,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              }
-            ]
-          },
-          "unit": "bps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 3,
-        "x": 9,
-        "y": 0
-      },
-      "id": 16,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showPercentChange": false,
-        "textMode": "auto",
-        "wideLayout": true
-      },
-      "pluginVersion": "10.4.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_PROMETHEUS}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(rate(downloaded_bytes_total[$__rate_interval])) * 8",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": true,
-          "legendFormat": "__auto",
-          "range": false,
-          "refId": "A",
-          "useBackend": false
-        }
-      ],
-      "title": "Speed",
-      "type": "stat"
-    },
     {
       "datasource": {
         "type": "prometheus",
@@ -365,9 +295,9 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 5,
-        "w": 2,
-        "x": 12,
+        "h": 2,
+        "w": 3,
+        "x": 13,
         "y": 0
       },
       "id": 19,
@@ -436,7 +366,7 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "stepAfter",
             "lineWidth": 1,
             "pointSize": 5,
             "scaleDistribution": {
@@ -467,8 +397,8 @@
       },
       "gridPos": {
         "h": 5,
-        "w": 10,
-        "x": 14,
+        "w": 8,
+        "x": 16,
         "y": 0
       },
       "id": 7,
@@ -480,8 +410,8 @@
           "showLegend": true
         },
         "tooltip": {
-          "mode": "single",
-          "sort": "none"
+          "mode": "multi",
+          "sort": "desc"
         }
       },
       "pluginVersion": "10.4.1",
@@ -509,6 +439,79 @@
       "title": "Instances",
       "type": "timeseries"
     },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bps"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 3,
+        "x": 13,
+        "y": 2
+      },
+      "id": 16,
+      "interval": "1s",
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.4.1",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "sum(rate(downloaded_bytes_total[10s])) * 8",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": true,
+          "interval": "1s",
+          "legendFormat": "__auto",
+          "range": false,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Speed",
+      "type": "stat"
+    },
     {
       "datasource": {
         "type": "prometheus",
@@ -518,7 +521,7 @@
         "defaults": {
           "color": {
             "fixedColor": "red",
-            "mode": "fixed"
+            "mode": "palette-classic"
           },
           "custom": {
             "axisBorderShow": false,
@@ -536,23 +539,24 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineWidth": 1,
             "pointSize": 5,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "auto",
-            "spanNulls": false,
+            "spanNulls": 30000,
             "stacking": {
               "group": "A",
-              "mode": "none"
+              "mode": "normal"
             },
             "thresholdsStyle": {
               "mode": "off"
             }
           },
           "mappings": [],
+          "noValue": "0",
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -564,24 +568,48 @@
           },
           "unit": "bps"
         },
-        "overrides": []
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byFrameRefID",
+              "options": "B"
+            },
+            "properties": [
+              {
+                "id": "custom.hideFrom",
+                "value": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": true
+                }
+              }
+            ]
+          }
+        ]
       },
       "gridPos": {
-        "h": 7,
-        "w": 12,
+        "h": 10,
+        "w": 24,
         "x": 0,
         "y": 5
       },
       "id": 9,
+      "interval": "1s",
       "options": {
         "legend": {
-          "calcs": [],
-          "displayMode": "list",
+          "calcs": [
+            "mean",
+            "max",
+            "lastNotNull"
+          ],
+          "displayMode": "table",
           "placement": "bottom",
-          "showLegend": false
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
         },
         "tooltip": {
-          "mode": "single",
+          "mode": "multi",
           "sort": "none"
         }
       },
@@ -592,16 +620,34 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "sum(rate(downloaded_bytes_total[$__rate_interval])) * 8",
+          "editorMode": "builder",
+          "expr": "rate(downloaded_bytes_total[10s]) * 8 > 0",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
-          "interval": "",
-          "legendFormat": "Speed",
+          "interval": "1s",
+          "legendFormat": "{{instance}}",
           "range": true,
           "refId": "A",
           "useBackend": false
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum(rate(downloaded_bytes_total[10s]) * 8)",
+          "fullMetaSearch": false,
+          "hide": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "interval": "1s",
+          "legendFormat": "Total",
+          "range": true,
+          "refId": "B",
+          "useBackend": false
         }
       ],
       "title": "Download Speed",
@@ -634,19 +680,16 @@
             },
             "insertNulls": false,
             "lineInterpolation": "smooth",
-            "lineStyle": {
-              "fill": "solid"
-            },
             "lineWidth": 1,
             "pointSize": 3,
             "scaleDistribution": {
               "type": "linear"
             },
             "showPoints": "auto",
-            "spanNulls": 600000,
+            "spanNulls": false,
             "stacking": {
               "group": "A",
-              "mode": "none"
+              "mode": "normal"
             },
             "thresholdsStyle": {
               "mode": "off"
@@ -666,33 +709,28 @@
               }
             ]
           },
-          "unit": "ms"
+          "unit": "percentunit"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 11,
-        "w": 12,
-        "x": 12,
-        "y": 5
+        "h": 5,
+        "w": 24,
+        "x": 0,
+        "y": 15
       },
-      "id": 10,
+      "id": 3,
+      "interval": "1s",
       "options": {
         "legend": {
-          "calcs": [
-            "max",
-            "mean",
-            "min"
-          ],
-          "displayMode": "table",
+          "calcs": [],
+          "displayMode": "list",
           "placement": "bottom",
-          "showLegend": true,
-          "sortBy": "Mean",
-          "sortDesc": true
+          "showLegend": false
         },
         "tooltip": {
-          "mode": "multi",
-          "sort": "none"
+          "mode": "single",
+          "sort": "desc"
         }
       },
       "targets": [
@@ -702,22 +740,19 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "(avg by(pathname, status) (increase(request_duration_ms_sum{hostname!=\"pbs.floatplane.com\"}[$__rate_interval]))) / avg by(pathname, status) (increase(request_duration_ms_count{hostname!=\"pbs.floatplane.com\"}[$__rate_interval])) > 0",
-          "format": "time_series",
+          "editorMode": "builder",
+          "expr": "rate(process_cpu_user_seconds_total{job=\"fpd\"}[10s])",
           "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": false,
+          "includeNullMetadata": true,
           "instant": false,
-          "interval": "3m",
-          "legendFormat": "{{pathname}} ({{status}})",
+          "interval": "1s",
+          "legendFormat": "{{instance}} ",
           "range": true,
-          "refId": "B",
+          "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Endpoint Latency",
+      "title": "CPU",
       "type": "timeseries"
     },
     {
@@ -728,6 +763,7 @@
       "fieldConfig": {
         "defaults": {
           "color": {
+            "fixedColor": "yellow",
             "mode": "palette-classic"
           },
           "custom": {
@@ -746,7 +782,7 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
             "lineWidth": 1,
             "pointSize": 3,
             "scaleDistribution": {
@@ -776,27 +812,33 @@
               }
             ]
           },
-          "unit": "percentunit"
+          "unit": "bytes"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 8,
-        "w": 12,
+        "h": 5,
+        "w": 24,
         "x": 0,
-        "y": 12
+        "y": 20
       },
-      "id": 3,
+      "id": 2,
+      "interval": "1s",
       "options": {
         "legend": {
-          "calcs": [],
+          "calcs": [
+            "min",
+            "max",
+            "mean",
+            "lastNotNull"
+          ],
           "displayMode": "list",
           "placement": "bottom",
           "showLegend": false
         },
         "tooltip": {
           "mode": "single",
-          "sort": "none"
+          "sort": "desc"
         }
       },
       "targets": [
@@ -806,19 +848,19 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "rate(process_cpu_user_seconds_total{job=\"fpd\"}[$__rate_interval])",
+          "editorMode": "builder",
+          "expr": "avg_over_time(process_resident_memory_bytes{job=\"fpd\"}[1m])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
-          "interval": "",
-          "legendFormat": "{{instance}} ",
+          "interval": "1s",
+          "legendFormat": "{{instance}}",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "CPU",
+      "title": "Memory",
       "type": "timeseries"
     },
     {
@@ -852,11 +894,11 @@
               "fill": "solid"
             },
             "lineWidth": 1,
-            "pointSize": 2,
+            "pointSize": 3,
             "scaleDistribution": {
               "type": "linear"
             },
-            "showPoints": "always",
+            "showPoints": "auto",
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -880,17 +922,17 @@
               }
             ]
           },
-          "unit": "reqpm"
+          "unit": "ms"
         },
         "overrides": []
       },
       "gridPos": {
         "h": 11,
         "w": 12,
-        "x": 12,
-        "y": 16
+        "x": 0,
+        "y": 25
       },
-      "id": 12,
+      "id": 10,
       "options": {
         "legend": {
           "calcs": [
@@ -905,7 +947,7 @@
           "sortDesc": true
         },
         "tooltip": {
-          "mode": "multi",
+          "mode": "none",
           "sort": "none"
         }
       },
@@ -916,22 +958,22 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
+          "editorMode": "builder",
           "exemplar": false,
-          "expr": "sum by(pathname, status) (rate(request_duration_ms_count{hostname!=\"pbs.floatplane.com\"}[$__rate_interval]) * 60) > 0",
+          "expr": "(avg by(pathname, status) (increase(request_duration_ms_sum[10m])) > 0) / (avg by(pathname, status) (increase(request_duration_ms_count[10m])) > 0)",
           "format": "time_series",
           "fullMetaSearch": false,
           "hide": false,
           "includeNullMetadata": false,
           "instant": false,
-          "interval": "3m",
+          "interval": "1s",
           "legendFormat": "{{pathname}} ({{status}})",
           "range": true,
-          "refId": "A",
+          "refId": "B",
           "useBackend": false
         }
       ],
-      "title": "Endpoint Requests",
+      "title": "Endpoint Latency",
       "type": "timeseries"
     },
     {
@@ -942,8 +984,7 @@
       "fieldConfig": {
         "defaults": {
           "color": {
-            "fixedColor": "yellow",
-            "mode": "fixed"
+            "mode": "palette-classic"
           },
           "custom": {
             "axisBorderShow": false,
@@ -961,9 +1002,12 @@
               "viz": false
             },
             "insertNulls": false,
-            "lineInterpolation": "linear",
+            "lineInterpolation": "smooth",
+            "lineStyle": {
+              "fill": "solid"
+            },
             "lineWidth": 1,
-            "pointSize": 3,
+            "pointSize": 2,
             "scaleDistribution": {
               "type": "linear"
             },
@@ -991,26 +1035,32 @@
               }
             ]
           },
-          "unit": "bytes"
+          "unit": "reqpm"
         },
         "overrides": []
       },
       "gridPos": {
-        "h": 7,
+        "h": 11,
         "w": 12,
-        "x": 0,
-        "y": 20
+        "x": 12,
+        "y": 25
       },
-      "id": 2,
+      "id": 12,
       "options": {
         "legend": {
-          "calcs": [],
-          "displayMode": "list",
+          "calcs": [
+            "max",
+            "mean",
+            "min"
+          ],
+          "displayMode": "table",
           "placement": "bottom",
-          "showLegend": false
+          "showLegend": true,
+          "sortBy": "Mean",
+          "sortDesc": true
         },
         "tooltip": {
-          "mode": "single",
+          "mode": "none",
           "sort": "none"
         }
       },
@@ -1021,19 +1071,22 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
-          "expr": "sum(avg_over_time(process_resident_memory_bytes{job=\"fpd\"}[1m]))",
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "sum by(pathname, status) (rate(request_duration_ms_count[10m])) * 60 > 0",
+          "format": "time_series",
           "fullMetaSearch": false,
-          "includeNullMetadata": true,
+          "hide": false,
+          "includeNullMetadata": false,
           "instant": false,
-          "interval": "",
-          "legendFormat": "Memory",
+          "interval": "30s",
+          "legendFormat": "{{pathname}} ({{status}})",
           "range": true,
           "refId": "A",
           "useBackend": false
         }
       ],
-      "title": "Memory",
+      "title": "Endpoint Requests",
       "type": "timeseries"
     },
     {
@@ -1101,7 +1154,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 27
+        "y": 36
       },
       "id": 11,
       "options": {
@@ -1204,7 +1257,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 27
+        "y": 36
       },
       "id": 17,
       "options": {
@@ -1212,11 +1265,11 @@
           "calcs": [],
           "displayMode": "list",
           "placement": "bottom",
-          "showLegend": true
+          "showLegend": false
         },
         "tooltip": {
-          "mode": "none",
-          "sort": "none"
+          "mode": "multi",
+          "sort": "desc"
         }
       },
       "pluginVersion": "8.1.0-pre",
@@ -1227,7 +1280,7 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "disableTextWrap": false,
-          "editorMode": "code",
+          "editorMode": "builder",
           "expr": "scrape_duration_seconds{job=\"fpd\"}",
           "format": "time_series",
           "fullMetaSearch": false,
@@ -1273,6 +1326,6 @@
   "timezone": "browser",
   "title": "Floatplane Downloader",
   "uid": "edhe5hq3k20owc",
-  "version": 108,
+  "version": 148,
   "weekStart": ""
 }
\ No newline at end of file