diff --git a/Notizen.md b/Notizen.md
index e66bc07d0210edae1ef69825cf87a25f02ec2d3d..a8d51b641c91e35b998b7ac6d314616a751d9b60 100644
--- a/Notizen.md
+++ b/Notizen.md
@@ -230,7 +230,8 @@
 TODO und weitere Gedanken:
 - Anschlussplan wird nicht auf die Platine passen, aber kann man in den Deckel kleben.
 
-- Testpunkte
+- Testpunkte - auch für Bauteile, die man von der Vorderseite schlecht messen kann.
+- Hardware Design PDF vom RP2040 anschauen
 
 - OLED als Board kaufen oder irgendwie anders auf eigene Platine?
 
diff --git a/c3pb-heizung/c3pb-heizung.kicad_sch b/c3pb-heizung/c3pb-heizung.kicad_sch
index 4d3fc8919eab3172de46f7834051083317e80e6e..331ecaa2dc07ed0192c1598e1f24ec503ca5aedb 100644
--- a/c3pb-heizung/c3pb-heizung.kicad_sch
+++ b/c3pb-heizung/c3pb-heizung.kicad_sch
@@ -6125,12 +6125,6 @@
     (path "/8a2c57fb-91a7-426b-a513-6dda601890d9/512a10ec-9ae5-4c28-ad05-a778540817af"
       (reference "#PWR01") (unit 1) (value "GNDPWR") (footprint "")
     )
-    (path "/54f5266d-1777-4e02-bd31-ebf852aa6849/45e24eab-fb31-456a-ab46-830a25021052"
-      (reference "#PWR02") (unit 1) (value "GND") (footprint "")
-    )
-    (path "/54f5266d-1777-4e02-bd31-ebf852aa6849/a5d22c43-1190-4d85-afa0-afc9c897d6d1"
-      (reference "#PWR03") (unit 1) (value "GND") (footprint "")
-    )
     (path "/54f5266d-1777-4e02-bd31-ebf852aa6849/ea57cafc-8c0b-4edc-82be-d24eb0e73ad6"
       (reference "#PWR05") (unit 1) (value "+3.3V") (footprint "")
     )
@@ -6473,6 +6467,12 @@
     (path "/2f59c195-b3d3-4fd3-a2ef-b308811ae6e7/717eba8e-6f83-4ccb-b94c-8be397b3b890"
       (reference "#PWR0213") (unit 1) (value "GND") (footprint "")
     )
+    (path "/54f5266d-1777-4e02-bd31-ebf852aa6849/76132388-6fa1-4080-ad6b-ee1c7fb5712e"
+      (reference "#PWR?") (unit 1) (value "GNDPWR") (footprint "")
+    )
+    (path "/54f5266d-1777-4e02-bd31-ebf852aa6849/bf3f0d41-1344-4f11-a44a-46733ebabd83"
+      (reference "#PWR?") (unit 1) (value "GNDPWR") (footprint "")
+    )
     (path "/1731f82b-f14d-41ac-a780-ccaeb142095c"
       (reference "C1") (unit 1) (value "2u2, 6.3V") (footprint "Capacitor_SMD:C_0402_1005Metric")
     )
diff --git a/c3pb-heizung/heaters.kicad_sch b/c3pb-heizung/heaters.kicad_sch
index 289f411fed4fd812ed9d4dd542d2ffa921116517..db1cf3ccef3a06cf61d7ceb8bd00648466edd1dc 100644
--- a/c3pb-heizung/heaters.kicad_sch
+++ b/c3pb-heizung/heaters.kicad_sch
@@ -1175,7 +1175,8 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 21c91a9c-ffa3-400d-9fdc-592b790e7f79)
   )
-  (text "move R6/R9 here to opt-out of using the opamp" (at 118.11 105.41 0)
+  (text "move R6/R9 here to opt-out of using the opamp\n(and optionally cut JP6)"
+    (at 118.11 106.68 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 84a4c4a9-e98e-49ff-ab8f-d8518cd470f1)
   )
@@ -1184,12 +1185,17 @@
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid 925fdbc2-aa41-4485-a28c-6534e070d168)
   )
+  (text "use GNDPWR here: The amplifier will see the\nshunt voltage without any offset between GND\nand GNDPWR. We will get the offset between\namplifier and ADC but that will be relative to\nthe amplified voltage, i.e. much less significant.\n\nGNDPWR should usually be higher than GND so this\nis fine. The amplifier supports input voltages of\n0.3V below so negative rail so the other way around\nis also fine.\n\nConnect this with a dedicated wire to the shunt!\nUse net ties if necessary."
+    (at 119.38 180.34 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid b5a34e1f-1ea1-4c6d-8c26-f751fe4c2213)
+  )
   (text "TI example has the same caps in both brances\nbut different caps make a more useful filter,\nit seems (tested in LTspice).\n\nThe -3 dB point is at 30 kHz. This is lower than\nnecessary for our ADC but way more than we need\n(but it does mean that we have to enable the\nmeasurement current for longer). However, this is\nchosen to be a bit lower than what the opamp would\nachieve (again: according to LTspice) so our filter\nis dominated by the external components rather than\nGBW variations."
     (at 204.47 43.18 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid bb2e47e4-9693-49ef-b64f-3129087bd86c)
   )
-  (text "see https://www.ti.com/lit/an/sbaa353a/sbaa353a.pdf\nbut we are not using a low-offset or zero drift\namplifier because of price (only JLC basic parts here)"
+  (text "see https://www.ti.com/lit/an/sbaa353a/sbaa353a.pdf\nbut we are not using a low-offset or zero drift\namplifier because of price (mostly JLC basic parts here)"
     (at 142.24 35.56 0)
     (effects (font (size 1.27 1.27)) (justify left bottom))
     (uuid e2eb9d4a-2702-4034-8422-6cbdc3b41966)
@@ -1417,22 +1423,6 @@
     (pin "2" (uuid c2e1adf1-2e37-4811-b380-6cfb6cea7c79))
   )
 
-  (symbol (lib_id "power:GND") (at 123.19 147.32 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 45e24eab-fb31-456a-ab46-830a25021052)
-    (property "Reference" "#PWR02" (id 0) (at 123.19 153.67 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 123.19 152.4 0))
-    (property "Footprint" "" (id 2) (at 123.19 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 123.19 147.32 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid dc33ecb6-8be3-4076-923a-0490b3545c95))
-  )
-
   (symbol (lib_id "Amplifier_Operational:MCP6002-xSN") (at 194.31 81.28 0) (unit 3)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 471ae91f-f60b-4049-ade6-d2a00c28089e)
@@ -1644,6 +1634,22 @@
     (pin "2" (uuid ac12a97e-3e3e-4a1d-8ea7-cc6772ef29b9))
   )
 
+  (symbol (lib_id "power:GNDPWR") (at 121.92 88.9 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 76132388-6fa1-4080-ad6b-ee1c7fb5712e)
+    (property "Reference" "#PWR?" (id 0) (at 121.92 93.98 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDPWR" (id 1) (at 121.793 93.98 0))
+    (property "Footprint" "" (id 2) (at 121.92 90.17 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 121.92 90.17 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 26a88456-6390-4a25-b449-70e071352e4c))
+  )
+
   (symbol (lib_id "power:GND") (at 181.61 85.09 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 895dacb9-aef7-4526-aaa3-3f1da4326062)
@@ -1724,22 +1730,6 @@
     (pin "2" (uuid 298b688f-d479-4834-aba0-70b6be03087f))
   )
 
-  (symbol (lib_id "power:GND") (at 121.92 88.9 0) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a5d22c43-1190-4d85-afa0-afc9c897d6d1)
-    (property "Reference" "#PWR03" (id 0) (at 121.92 95.25 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Value" "GND" (id 1) (at 121.92 93.98 0))
-    (property "Footprint" "" (id 2) (at 121.92 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "" (id 3) (at 121.92 88.9 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 405caaa0-28a3-4dc9-852f-b541e9b64d83))
-  )
-
   (symbol (lib_id "Device:R") (at 118.11 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ade1c9e1-e4a1-4ad5-a4c8-e525f7b57bfb)
@@ -1759,6 +1749,22 @@
     (pin "2" (uuid 293aaa73-188f-401b-93d0-d6865d63fcba))
   )
 
+  (symbol (lib_id "power:GNDPWR") (at 123.19 147.32 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid bf3f0d41-1344-4f11-a44a-46733ebabd83)
+    (property "Reference" "#PWR?" (id 0) (at 123.19 152.4 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "GNDPWR" (id 1) (at 123.063 152.4 0))
+    (property "Footprint" "" (id 2) (at 123.19 148.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 123.19 148.59 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 6a330de2-b456-4816-afb5-3849f01da534))
+  )
+
   (symbol (lib_id "Transistor_FET:AO3400A") (at 81.28 115.57 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf5f9ca6-727e-4f7f-a98e-730b08151997)