diff --git a/hardware/conn-mchip.sch b/hardware/conn-mchip.sch
index 31e44d6..fe7e9f1 100644
--- a/hardware/conn-mchip.sch
+++ b/hardware/conn-mchip.sch
@@ -52,8 +52,8 @@ L Connector:TestPoint TP?
 U 1 1 60068140
 P 4250 6200
 AR Path="/5F53D5B5/60068140" Ref="TP?"  Part="1" 
-AR Path="/60040981/60068140" Ref="TP5"  Part="1" 
-F 0 "TP5" H 4308 6318 50  0000 L CNN
+AR Path="/60040981/60068140" Ref="TP7"  Part="1" 
+F 0 "TP7" H 4308 6318 50  0000 L CNN
 F 1 "TestPoint" H 4308 6227 50  0000 L CNN
 F 2 "TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm" H 4450 6200 50  0001 C CNN
 F 3 "~" H 4450 6200 50  0001 C CNN
diff --git a/hardware/dscomm-cache.lib b/hardware/dscomm-cache.lib
index 064ab05..bee14c5 100644
--- a/hardware/dscomm-cache.lib
+++ b/hardware/dscomm-cache.lib
@@ -222,6 +222,24 @@ X 1 1 0 0 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Connector_TestPoint_Probe
+#
+DEF Connector_TestPoint_Probe TP 0 30 N N 1 F N
+F0 "TP" 65 230 50 H V C CNN
+F1 "Connector_TestPoint_Probe" 65 160 50 H V C CNN
+F2 "" 200 0 50 H I C CNN
+F3 "" 200 0 50 H I C CNN
+$FPLIST
+ Pin*
+ Test*
+$ENDFPLIST
+DRAW
+P 4 0 1 0 50 30 0 0 30 50 50 30 F
+P 5 0 1 0 55 25 25 55 95 125 125 95 55 25 f
+X 1 1 0 0 0 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Connector_USB_C_Receptacle_USB2.0
 #
 DEF Connector_USB_C_Receptacle_USB2.0 J 0 40 Y Y 1 F N
diff --git a/hardware/dscomm.net b/hardware/dscomm.net
index 80f83c5..645ec50 100644
--- a/hardware/dscomm.net
+++ b/hardware/dscomm.net
@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source dscomm.sch)
-    (date "Mi 23 Sep 2020 22:47:33 CEST")
+    (date "Mi 23 Sep 2020 23:20:17 CEST")
     (tool "Eeschema 5.1.5+dfsg1-2build2")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -239,6 +239,20 @@
       (libsource (lib Elabdev) (part Logofirm) (description "Firma Logo"))
       (sheetpath (names /) (tstamps /))
       (tstamp 5F9652D3))
+    (comp (ref TP5)
+      (value Probe)
+      (footprint TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint_Probe) (description "test point (alternative probe-style design)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5F97637F))
+    (comp (ref TP6)
+      (value Probe)
+      (footprint TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm)
+      (datasheet ~)
+      (libsource (lib Connector) (part TestPoint_Probe) (description "test point (alternative probe-style design)"))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5F97786E))
     (comp (ref U1)
       (value STM32WLE5C)
       (footprint Package_DFN_QFN:QFN-48-1EP_7x7mm_P0.5mm_EP5.6x5.6mm)
@@ -764,7 +778,7 @@
       (libsource (lib Connector) (part Conn_01x06_Male) (description "Generic connector, single row, 01x06, script generated (kicad-library-utils/schlib/autogen/connector/)"))
       (sheetpath (names /Sheet60040980/) (tstamps /60040981/))
       (tstamp 6006812D))
-    (comp (ref TP5)
+    (comp (ref TP7)
       (value TestPoint)
       (footprint TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm)
       (datasheet ~)
@@ -1065,6 +1079,17 @@
         (field (name Value) TestPoint))
       (pins
         (pin (num 1) (name 1) (type passive))))
+    (libpart (lib Connector) (part TestPoint_Probe)
+      (description "test point (alternative probe-style design)")
+      (docs ~)
+      (footprints
+        (fp Pin*)
+        (fp Test*))
+      (fields
+        (field (name Reference) TP)
+        (field (name Value) TestPoint_Probe))
+      (pins
+        (pin (num 1) (name 1) (type passive))))
     (libpart (lib Connector) (part USB_C_Receptacle_USB2.0)
       (description "USB 2.0-only Type-C Receptacle connector")
       (docs https://www.usb.org/sites/default/files/documents/usb_type-c.zip)
@@ -1558,211 +1583,213 @@
     (library (logical Switch)
       (uri /usr/share/kicad/library/Switch.lib)))
   (nets
-    (net (code 1) (name /Sheet60040980/ID_SD)
-      (node (ref R11) (pin 2))
-      (node (ref U7) (pin 5))
-      (node (ref J3) (pin 27))
-      (node (ref U6) (pin 5)))
-    (net (code 2) (name "Net-(TP4-Pad1)")
-      (node (ref TP4) (pin 1)))
-    (net (code 3) (name "Net-(TP3-Pad1)")
-      (node (ref TP3) (pin 1)))
-    (net (code 4) (name +3V3)
-      (node (ref JP1) (pin 2))
+    (net (code 1) (name "Net-(TP4-Pad1)")
+      (node (ref TP4) (pin 1))
+      (node (ref TP6) (pin 1)))
+    (net (code 2) (name "Net-(TP3-Pad1)")
+      (node (ref TP3) (pin 1))
+      (node (ref TP5) (pin 1)))
+    (net (code 3) (name +3V3)
       (node (ref R9) (pin 1))
-      (node (ref U6) (pin 8))
-      (node (ref J4) (pin 1))
-      (node (ref R13) (pin 1))
-      (node (ref J3) (pin 1))
       (node (ref J3) (pin 17))
-      (node (ref C12) (pin 1))
       (node (ref J1) (pin 3))
-      (node (ref C11) (pin 1))
-      (node (ref C10) (pin 1))
-      (node (ref U3) (pin A8))
-      (node (ref R2) (pin 1))
-      (node (ref R1) (pin 1))
       (node (ref U3) (pin H8))
-      (node (ref U3) (pin G4))
+      (node (ref J3) (pin 1))
+      (node (ref U9) (pin 8))
+      (node (ref U6) (pin 8))
+      (node (ref R13) (pin 1))
+      (node (ref C12) (pin 1))
       (node (ref U3) (pin A7))
+      (node (ref U3) (pin A8))
       (node (ref C16) (pin 1))
-      (node (ref FB1) (pin 1))
+      (node (ref U3) (pin G4))
+      (node (ref C42) (pin 1))
       (node (ref R15) (pin 1))
-      (node (ref U8) (pin 8))
+      (node (ref C10) (pin 1))
       (node (ref R14) (pin 1))
-      (node (ref C42) (pin 1))
+      (node (ref C11) (pin 1))
+      (node (ref R1) (pin 1))
+      (node (ref R2) (pin 1))
       (node (ref TP2) (pin 1))
-      (node (ref U7) (pin 8))
-      (node (ref R12) (pin 1))
-      (node (ref R11) (pin 1))
       (node (ref C41) (pin 1))
-      (node (ref U9) (pin 8)))
-    (net (code 5) (name GND)
-      (node (ref C32) (pin 2))
-      (node (ref C31) (pin 2))
-      (node (ref C27) (pin 2))
-      (node (ref J6) (pin 2))
-      (node (ref U6) (pin 2))
+      (node (ref R11) (pin 1))
+      (node (ref R12) (pin 1))
+      (node (ref U7) (pin 8))
+      (node (ref J4) (pin 1))
+      (node (ref U8) (pin 8))
+      (node (ref JP1) (pin 2))
+      (node (ref FB1) (pin 1)))
+    (net (code 4) (name GND)
+      (node (ref C9) (pin 2))
+      (node (ref U2) (pin 7))
+      (node (ref BT1) (pin 2))
+      (node (ref J4) (pin 9))
+      (node (ref R3) (pin 2))
+      (node (ref J4) (pin 5))
+      (node (ref J3) (pin 14))
+      (node (ref C20) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref C10) (pin 2))
+      (node (ref J4) (pin 3))
+      (node (ref C21) (pin 2))
+      (node (ref J5) (pin 1))
+      (node (ref XC1) (pin 2))
+      (node (ref C18) (pin 1))
+      (node (ref U4) (pin 10))
       (node (ref C25) (pin 2))
+      (node (ref U4) (pin 8))
+      (node (ref U4) (pin 7))
       (node (ref C26) (pin 2))
+      (node (ref U4) (pin 2))
+      (node (ref U4) (pin 12))
       (node (ref C28) (pin 2))
-      (node (ref U6) (pin 1))
-      (node (ref U6) (pin 3))
-      (node (ref C16) (pin 2))
-      (node (ref U6) (pin 4))
-      (node (ref C1) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref C41) (pin 2))
-      (node (ref C12) (pin 2))
-      (node (ref C15) (pin 2))
-      (node (ref C14) (pin 2))
-      (node (ref AE3) (pin 1))
+      (node (ref C30) (pin 2))
+      (node (ref C39) (pin 2))
+      (node (ref C32) (pin 2))
+      (node (ref C38) (pin 2))
+      (node (ref C31) (pin 2))
+      (node (ref C37) (pin 2))
+      (node (ref C27) (pin 2))
+      (node (ref C22) (pin 1))
+      (node (ref AE2) (pin 2))
+      (node (ref AE7) (pin 2))
+      (node (ref AE6) (pin 2))
       (node (ref AE4) (pin 2))
-      (node (ref XC1) (pin 2))
-      (node (ref C18) (pin 1))
-      (node (ref C8) (pin 2))
-      (node (ref U2) (pin 7))
+      (node (ref AE3) (pin 1))
+      (node (ref U5) (pin 2))
+      (node (ref C14) (pin 2))
+      (node (ref C15) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref C2) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref C16) (pin 2))
       (node (ref C7) (pin 2))
+      (node (ref C8) (pin 2))
       (node (ref U2) (pin 3))
+      (node (ref J2) (pin B12))
       (node (ref SW2) (pin 2))
       (node (ref C13) (pin 2))
       (node (ref C4) (pin 2))
-      (node (ref C9) (pin 2))
-      (node (ref BT1) (pin 2))
-      (node (ref U7) (pin 4))
-      (node (ref U7) (pin 3))
-      (node (ref C20) (pin 2))
-      (node (ref U7) (pin 2))
-      (node (ref U7) (pin 1))
-      (node (ref R3) (pin 2))
+      (node (ref R8) (pin 2))
+      (node (ref R6) (pin 2))
+      (node (ref R7) (pin 2))
+      (node (ref C36) (pin 2))
+      (node (ref R10) (pin 2))
       (node (ref J2) (pin B1))
-      (node (ref J2) (pin B12))
       (node (ref J2) (pin A12))
-      (node (ref U5) (pin 2))
-      (node (ref J2) (pin A1))
-      (node (ref R10) (pin 2))
       (node (ref C40) (pin 2))
-      (node (ref J3) (pin 14))
-      (node (ref J4) (pin 5))
-      (node (ref J5) (pin 1))
+      (node (ref J2) (pin A1))
+      (node (ref C3) (pin 2))
       (node (ref C42) (pin 2))
-      (node (ref J4) (pin 3))
-      (node (ref U9) (pin 4))
-      (node (ref J4) (pin 9))
-      (node (ref U4) (pin 2))
-      (node (ref U4) (pin 7))
-      (node (ref U4) (pin 8))
-      (node (ref J3) (pin 39))
-      (node (ref J3) (pin 6))
-      (node (ref AE7) (pin 2))
-      (node (ref AE2) (pin 2))
-      (node (ref C22) (pin 1))
-      (node (ref C37) (pin 2))
-      (node (ref C30) (pin 2))
-      (node (ref U4) (pin 10))
-      (node (ref U4) (pin 12))
+      (node (ref U3) (pin G2))
+      (node (ref U3) (pin G3))
+      (node (ref U3) (pin G6))
+      (node (ref U3) (pin G7))
+      (node (ref U3) (pin H5))
+      (node (ref U7) (pin 1))
+      (node (ref U7) (pin 4))
+      (node (ref C6) (pin 2))
+      (node (ref U7) (pin 3))
+      (node (ref U7) (pin 2))
+      (node (ref C5) (pin 2))
+      (node (ref U3) (pin G5))
+      (node (ref C41) (pin 2))
+      (node (ref U8) (pin 4))
       (node (ref J3) (pin 30))
-      (node (ref R8) (pin 2))
-      (node (ref R7) (pin 2))
-      (node (ref R6) (pin 2))
       (node (ref J3) (pin 25))
-      (node (ref J3) (pin 34))
-      (node (ref J3) (pin 20))
-      (node (ref C38) (pin 2))
-      (node (ref C39) (pin 2))
-      (node (ref C36) (pin 2))
-      (node (ref J3) (pin 9))
-      (node (ref AE6) (pin 2))
-      (node (ref U8) (pin 4))
-      (node (ref C3) (pin 2))
-      (node (ref U3) (pin B7))
       (node (ref U3) (pin D4))
       (node (ref U3) (pin D6))
+      (node (ref J3) (pin 9))
       (node (ref U3) (pin E1))
       (node (ref U3) (pin E2))
-      (node (ref U3) (pin G6))
-      (node (ref U3) (pin H5))
-      (node (ref U3) (pin G7))
-      (node (ref U3) (pin G5))
-      (node (ref U3) (pin G3))
-      (node (ref C19) (pin 1))
-      (node (ref U3) (pin G2))
-      (node (ref U3) (pin F2))
-      (node (ref C21) (pin 2))
-      (node (ref C5) (pin 2))
-      (node (ref C6) (pin 2))
+      (node (ref J3) (pin 6))
+      (node (ref J3) (pin 39))
+      (node (ref J3) (pin 34))
+      (node (ref U6) (pin 1))
+      (node (ref U6) (pin 2))
+      (node (ref U6) (pin 4))
       (node (ref U3) (pin A2))
-      (node (ref C11) (pin 2))
-      (node (ref C10) (pin 2))
+      (node (ref C17) (pin 2))
+      (node (ref U3) (pin B2))
+      (node (ref U3) (pin B3))
+      (node (ref U6) (pin 3))
       (node (ref U3) (pin B5))
+      (node (ref U3) (pin B7))
+      (node (ref J3) (pin 20))
       (node (ref TP1) (pin 1))
-      (node (ref U3) (pin B3))
-      (node (ref U3) (pin B2))
-      (node (ref C17) (pin 2)))
-    (net (code 6) (name /Sheet60040980/ID_SC)
-      (node (ref U6) (pin 6))
+      (node (ref C19) (pin 1))
+      (node (ref J6) (pin 2))
+      (node (ref U9) (pin 4))
+      (node (ref U3) (pin F2)))
+    (net (code 5) (name /Sheet60040980/ID_SC)
       (node (ref R12) (pin 2))
+      (node (ref U6) (pin 6))
       (node (ref U7) (pin 6))
       (node (ref J3) (pin 28)))
+    (net (code 6) (name /Sheet60040980/ID_SD)
+      (node (ref U7) (pin 5))
+      (node (ref U6) (pin 5))
+      (node (ref R11) (pin 2))
+      (node (ref J3) (pin 27)))
     (net (code 7) (name /Sheet5F53D5B4/USB_BUS)
-      (node (ref C5) (pin 1))
-      (node (ref U2) (pin 6))
-      (node (ref U2) (pin 4))
       (node (ref R6) (pin 1))
       (node (ref R5) (pin 1))
-      (node (ref U3) (pin F3))
-      (node (ref C6) (pin 1)))
+      (node (ref U2) (pin 6))
+      (node (ref U2) (pin 4))
+      (node (ref C6) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref U3) (pin F3)))
     (net (code 8) (name /Sheet5F53D5B4/USB_P)
-      (node (ref U5) (pin 1))
-      (node (ref J2) (pin B6))
       (node (ref U3) (pin C8))
-      (node (ref J2) (pin A6)))
+      (node (ref J2) (pin A6))
+      (node (ref J2) (pin B6))
+      (node (ref U5) (pin 1)))
     (net (code 9) (name /Sheet5F53D5B4/USB_N)
-      (node (ref J2) (pin A7))
+      (node (ref U3) (pin B8))
       (node (ref J2) (pin B7))
-      (node (ref U5) (pin 6))
-      (node (ref U3) (pin B8)))
+      (node (ref J2) (pin A7))
+      (node (ref U5) (pin 6)))
     (net (code 10) (name /Sheet5F53D5B4/SWDCLK)
-      (node (ref U3) (pin C5))
-      (node (ref J4) (pin 4)))
+      (node (ref J4) (pin 4))
+      (node (ref U3) (pin C5)))
     (net (code 11) (name /Sheet5F53D5B4/I2C_SCL)
       (node (ref U9) (pin 6))
-      (node (ref U3) (pin E6))
       (node (ref U8) (pin 6))
-      (node (ref R14) (pin 2)))
+      (node (ref R14) (pin 2))
+      (node (ref U3) (pin E6)))
     (net (code 12) (name /Sheet5F53D5B4/UART_RX)
+      (node (ref JP3) (pin 1))
       (node (ref J5) (pin 4))
-      (node (ref U3) (pin C4))
-      (node (ref JP3) (pin 1)))
+      (node (ref U3) (pin C4)))
     (net (code 13) (name /Sheet5F53D5B4/CMDRST)
-      (node (ref C20) (pin 1))
       (node (ref U3) (pin B6))
+      (node (ref C20) (pin 1))
       (node (ref R9) (pin 2))
-      (node (ref J4) (pin 10))
-      (node (ref SW1) (pin 1)))
+      (node (ref SW1) (pin 1))
+      (node (ref J4) (pin 10)))
     (net (code 14) (name /Sheet5F53D5B4/SWDIO)
-      (node (ref J4) (pin 2))
-      (node (ref U3) (pin D5)))
+      (node (ref U3) (pin D5))
+      (node (ref J4) (pin 2)))
     (net (code 15) (name /Sheet5F53D5B4/RFSWPWR)
+      (node (ref XC1) (pin 4))
       (node (ref U3) (pin F5))
-      (node (ref C22) (pin 2))
       (node (ref C21) (pin 1))
       (node (ref U4) (pin 6))
-      (node (ref XC1) (pin 4)))
+      (node (ref C22) (pin 2)))
     (net (code 16) (name /Sheet5F53D5B4/POWAMP)
-      (node (ref L5) (pin 2))
       (node (ref U3) (pin D1))
+      (node (ref L5) (pin 2))
       (node (ref L7) (pin 1))
-      (node (ref C31) (pin 1))
-      (node (ref C32) (pin 1)))
+      (node (ref C32) (pin 1))
+      (node (ref C31) (pin 1)))
     (net (code 17) (name /Sheet5F53D5B4/HPOUT)
-      (node (ref L4) (pin 2))
-      (node (ref U3) (pin F1)))
+      (node (ref U3) (pin F1))
+      (node (ref L4) (pin 2)))
     (net (code 18) (name /Sheet5F53D5B4/HFOUT)
       (node (ref C35) (pin 1))
-      (node (ref L7) (pin 2))
       (node (ref C39) (pin 1))
-      (node (ref U3) (pin B1)))
+      (node (ref U3) (pin B1))
+      (node (ref L7) (pin 2)))
     (net (code 19) (name /Sheet5F53D5B4/HFIN)
       (node (ref U3) (pin A1))
       (node (ref L6) (pin 2)))
@@ -1773,29 +1800,29 @@
       (node (ref U4) (pin 4))
       (node (ref U3) (pin F6)))
     (net (code 22) (name /Sheet5F53D5B4/UART_TX)
-      (node (ref U3) (pin D3))
       (node (ref J5) (pin 5))
-      (node (ref JP2) (pin 1)))
+      (node (ref JP2) (pin 1))
+      (node (ref U3) (pin D3)))
     (net (code 23) (name /Sheet5F53D5B4/I2C_SDA)
-      (node (ref U9) (pin 5))
-      (node (ref R15) (pin 2))
       (node (ref U3) (pin F7))
-      (node (ref U8) (pin 5)))
+      (node (ref U9) (pin 5))
+      (node (ref U8) (pin 5))
+      (node (ref R15) (pin 2)))
     (net (code 24) (name "Net-(U3-PadH6)")
-      (node (ref U3) (pin H6))
-      (node (ref XC1) (pin 3)))
+      (node (ref XC1) (pin 3))
+      (node (ref U3) (pin H6)))
     (net (code 25) (name "Net-(U3-PadH7)")
       (node (ref U3) (pin H7)))
     (net (code 26) (name "Net-(R4-Pad1)")
-      (node (ref R4) (pin 1))
-      (node (ref U3) (pin C6)))
+      (node (ref U3) (pin C6))
+      (node (ref R4) (pin 1)))
     (net (code 27) (name "Net-(D1-Pad1)")
       (node (ref U3) (pin E7))
       (node (ref D1) (pin 1)))
     (net (code 28) (name "Net-(C7-Pad1)")
-      (node (ref JP1) (pin 1))
+      (node (ref C7) (pin 1))
       (node (ref U2) (pin 1))
-      (node (ref C7) (pin 1)))
+      (node (ref JP1) (pin 1)))
     (net (code 29) (name "Net-(D1-Pad2)")
       (node (ref D1) (pin 2))
       (node (ref R1) (pin 2)))
@@ -1808,8 +1835,8 @@
     (net (code 32) (name "Net-(U3-PadH1)")
       (node (ref U3) (pin H1)))
     (net (code 33) (name "Net-(C13-Pad1)")
-      (node (ref C13) (pin 1))
-      (node (ref U3) (pin H4)))
+      (node (ref U3) (pin H4))
+      (node (ref C13) (pin 1)))
     (net (code 34) (name /Sheet5F53D5B4/CRYSTAL_XOUT-RESERVED)
       (node (ref U3) (pin G8)))
     (net (code 35) (name "Net-(U3-PadG1)")
@@ -1819,20 +1846,20 @@
     (net (code 37) (name "Net-(U3-PadF4)")
       (node (ref U3) (pin F4)))
     (net (code 38) (name "Net-(C19-Pad2)")
+      (node (ref Y1) (pin 2))
       (node (ref U3) (pin A4))
-      (node (ref C19) (pin 2))
-      (node (ref Y1) (pin 2)))
+      (node (ref C19) (pin 2)))
     (net (code 39) (name "Net-(C18-Pad2)")
+      (node (ref Y1) (pin 1))
       (node (ref C18) (pin 2))
-      (node (ref U3) (pin A3))
-      (node (ref Y1) (pin 1)))
+      (node (ref U3) (pin A3)))
     (net (code 40) (name "Net-(L1-Pad2)")
       (node (ref U3) (pin A6))
       (node (ref L1) (pin 2)))
     (net (code 41) (name "Net-(C17-Pad1)")
       (node (ref U3) (pin A5))
-      (node (ref C17) (pin 1))
-      (node (ref L1) (pin 1)))
+      (node (ref L1) (pin 1))
+      (node (ref C17) (pin 1)))
     (net (code 42) (name "Net-(U3-PadE5)")
       (node (ref U3) (pin E5)))
     (net (code 43) (name "Net-(U3-PadE4)")
@@ -1846,25 +1873,25 @@
     (net (code 47) (name "Net-(U3-PadC7)")
       (node (ref U3) (pin C7)))
     (net (code 48) (name "Net-(C1-Pad1)")
-      (node (ref U3) (pin C2))
-      (node (ref C9) (pin 1))
-      (node (ref U3) (pin C1))
-      (node (ref C1) (pin 1))
-      (node (ref C3) (pin 1))
+      (node (ref C2) (pin 1))
       (node (ref FB1) (pin 2))
-      (node (ref U3) (pin H3))
       (node (ref C4) (pin 1))
-      (node (ref C2) (pin 1)))
+      (node (ref U3) (pin H3))
+      (node (ref C3) (pin 1))
+      (node (ref U3) (pin C1))
+      (node (ref C1) (pin 1))
+      (node (ref U3) (pin C2))
+      (node (ref C9) (pin 1)))
     (net (code 49) (name "Net-(U3-PadB4)")
       (node (ref U3) (pin B4)))
     (net (code 50) (name "Net-(XC1-Pad1)")
       (node (ref XC1) (pin 1)))
     (net (code 51) (name /Sheet5F53D5B4/CN_VBAT)
-      (node (ref J1) (pin 2))
-      (node (ref U3) (pin C3)))
+      (node (ref U3) (pin C3))
+      (node (ref J1) (pin 2)))
     (net (code 52) (name "Net-(BT1-Pad1)")
-      (node (ref J1) (pin 1))
-      (node (ref BT1) (pin 1)))
+      (node (ref BT1) (pin 1))
+      (node (ref J1) (pin 1)))
     (net (code 53) (name "Net-(R3-Pad1)")
       (node (ref SW1) (pin 2))
       (node (ref R3) (pin 1)))
@@ -1877,9 +1904,9 @@
       (node (ref SW2) (pin 1))
       (node (ref R4) (pin 2)))
     (net (code 57) (name "Net-(C14-Pad1)")
+      (node (ref U3) (pin H2))
       (node (ref C14) (pin 1))
-      (node (ref C15) (pin 1))
-      (node (ref U3) (pin H2)))
+      (node (ref C15) (pin 1)))
     (net (code 58) (name "Net-(U1-Pad21)")
       (node (ref U1) (pin 21)))
     (net (code 59) (name "Net-(U1-Pad22)")
@@ -1979,18 +2006,18 @@
     (net (code 106) (name "Net-(U1-Pad41)")
       (node (ref U1) (pin 41)))
     (net (code 107) (name "Net-(C24-Pad1)")
+      (node (ref C24) (pin 1))
       (node (ref L4) (pin 1))
       (node (ref L5) (pin 1))
-      (node (ref C28) (pin 1))
-      (node (ref C24) (pin 1)))
+      (node (ref C28) (pin 1)))
     (net (code 108) (name "Net-(C24-Pad2)")
-      (node (ref C24) (pin 2))
       (node (ref L3) (pin 2))
+      (node (ref C24) (pin 2))
       (node (ref C27) (pin 1)))
     (net (code 109) (name "Net-(C23-Pad2)")
-      (node (ref U4) (pin 1))
       (node (ref C23) (pin 2))
       (node (ref C25) (pin 1))
+      (node (ref U4) (pin 1))
       (node (ref L2) (pin 1)))
     (net (code 110) (name "Net-(AE5-Pad2)")
       (node (ref AE5) (pin 2)))
@@ -1998,41 +2025,41 @@
       (node (ref C29) (pin 2))
       (node (ref U4) (pin 9)))
     (net (code 112) (name "Net-(C29-Pad1)")
-      (node (ref C29) (pin 1))
       (node (ref L6) (pin 1))
-      (node (ref C30) (pin 1)))
+      (node (ref C30) (pin 1))
+      (node (ref C29) (pin 1)))
     (net (code 113) (name "Net-(C33-Pad2)")
-      (node (ref L8) (pin 1))
-      (node (ref C36) (pin 1))
+      (node (ref U4) (pin 3))
       (node (ref C33) (pin 2))
-      (node (ref U4) (pin 3)))
+      (node (ref C36) (pin 1))
+      (node (ref L8) (pin 1)))
     (net (code 114) (name "Net-(AE1-Pad1)")
-      (node (ref AE3) (pin 2))
+      (node (ref AE2) (pin 1))
       (node (ref AE5) (pin 1))
+      (node (ref AE3) (pin 2))
+      (node (ref AE6) (pin 1))
       (node (ref AE1) (pin 1))
       (node (ref AE7) (pin 1))
-      (node (ref AE4) (pin 1))
       (node (ref U4) (pin 11))
-      (node (ref AE6) (pin 1))
-      (node (ref AE2) (pin 1)))
+      (node (ref AE4) (pin 1)))
     (net (code 115) (name "Net-(C34-Pad1)")
       (node (ref L10) (pin 1))
-      (node (ref C38) (pin 1))
       (node (ref C34) (pin 1))
+      (node (ref C38) (pin 1))
       (node (ref L9) (pin 2)))
     (net (code 116) (name "Net-(C23-Pad1)")
-      (node (ref C26) (pin 1))
+      (node (ref C23) (pin 1))
       (node (ref L3) (pin 1))
-      (node (ref L2) (pin 2))
-      (node (ref C23) (pin 1)))
+      (node (ref C26) (pin 1))
+      (node (ref L2) (pin 2)))
     (net (code 117) (name "Net-(C35-Pad2)")
-      (node (ref L10) (pin 2))
-      (node (ref C35) (pin 2)))
+      (node (ref C35) (pin 2))
+      (node (ref L10) (pin 2)))
     (net (code 118) (name "Net-(C33-Pad1)")
+      (node (ref C34) (pin 2))
       (node (ref C37) (pin 1))
-      (node (ref L9) (pin 1))
       (node (ref C33) (pin 1))
-      (node (ref C34) (pin 2))
+      (node (ref L9) (pin 1))
       (node (ref L8) (pin 2)))
     (net (code 119) (name "Net-(J2-PadB5)")
       (node (ref J2) (pin B5))
@@ -2043,17 +2070,17 @@
       (node (ref J2) (pin B8)))
     (net (code 122) (name "Net-(J2-PadA4)")
       (node (ref R5) (pin 2))
-      (node (ref U5) (pin 5))
       (node (ref J2) (pin B9))
-      (node (ref J2) (pin A4))
       (node (ref J2) (pin B4))
-      (node (ref J2) (pin A9)))
+      (node (ref J2) (pin A4))
+      (node (ref J2) (pin A9))
+      (node (ref U5) (pin 5)))
     (net (code 123) (name "Net-(J2-PadA5)")
-      (node (ref R8) (pin 1))
-      (node (ref J2) (pin A5)))
+      (node (ref J2) (pin A5))
+      (node (ref R8) (pin 1)))
     (net (code 124) (name "Net-(J3-Pad8)")
-      (node (ref J3) (pin 8))
-      (node (ref JP2) (pin 2)))
+      (node (ref JP2) (pin 2))
+      (node (ref J3) (pin 8)))
     (net (code 125) (name "Net-(J3-Pad10)")
       (node (ref J3) (pin 10))
       (node (ref JP3) (pin 2)))
@@ -2088,7 +2115,7 @@
     (net (code 139) (name "Net-(J3-Pad11)")
       (node (ref J3) (pin 11)))
     (net (code 140) (name "Net-(J5-Pad3)")
-      (node (ref TP5) (pin 1))
+      (node (ref TP7) (pin 1))
       (node (ref J5) (pin 3)))
     (net (code 141) (name "Net-(J5-Pad6)")
       (node (ref J5) (pin 6)))
@@ -2133,10 +2160,10 @@
     (net (code 161) (name "Net-(U9-Pad7)")
       (node (ref U9) (pin 7)))
     (net (code 162) (name "Net-(J6-Pad1)")
-      (node (ref J6) (pin 1))
       (node (ref U7) (pin 7))
-      (node (ref R13) (pin 2))
-      (node (ref U6) (pin 7)))
+      (node (ref U6) (pin 7))
+      (node (ref J6) (pin 1))
+      (node (ref R13) (pin 2)))
     (net (code 163) (name "Net-(U9-Pad1)")
       (node (ref U9) (pin 1)))
     (net (code 164) (name "Net-(U9-Pad2)")
diff --git a/hardware/dscomm.sch b/hardware/dscomm.sch
index a2240bc..c8e81a0 100644
--- a/hardware/dscomm.sch
+++ b/hardware/dscomm.sch
@@ -408,8 +408,6 @@ F 3 "~" H 4750 7300 50  0001 C CNN
 	1    4550 7300
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4550 7300
-NoConn ~ 3950 7300
 $Sheet
 S 3400 1150 1200 800 
 U 5F5C0728
@@ -488,4 +486,30 @@ F 3 "~" H 6300 7150 50  0001 C CNN
 	1    6300 7150
 	1    0    0    -1  
 $EndComp
+$Comp
+L Connector:TestPoint_Probe TP5
+U 1 1 5F97637F
+P 3950 7500
+F 0 "TP5" H 4102 7601 50  0000 L CNN
+F 1 "Probe" H 4102 7510 50  0000 L CNN
+F 2 "TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm" H 4150 7500 50  0001 C CNN
+F 3 "~" H 4150 7500 50  0001 C CNN
+	1    3950 7500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:TestPoint_Probe TP6
+U 1 1 5F97786E
+P 4550 7500
+F 0 "TP6" H 4702 7601 50  0000 L CNN
+F 1 "Probe" H 4702 7510 50  0000 L CNN
+F 2 "TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm" H 4750 7500 50  0001 C CNN
+F 3 "~" H 4750 7500 50  0001 C CNN
+	1    4550 7500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3950 7300 3950 7500
+Wire Wire Line
+	4550 7300 4550 7500
 $EndSCHEMATC