diff --git a/domopi.kicad_pcb b/domopi.kicad_pcb
index 83aa058..24e1b3a 100644
--- a/domopi.kicad_pcb
+++ b/domopi.kicad_pcb
@@ -1,12 +1,12 @@
-(kicad_pcb (version 4) (host pcbnew "(2015-09-30 BZR 6231)-product")
+(kicad_pcb (version 4) (host pcbnew 4.0.2+dfsg1-2~bpo8+1-stable)
 
   (general
     (links 42)
-    (no_connects 0)
-    (area 66.841 25.230285 108.667572 53.689)
+    (no_connects 2)
+    (area 66.841 25.230285 108.667572 54.324)
     (thickness 1.6)
     (drawings 6)
-    (tracks 191)
+    (tracks 170)
     (zones 0)
     (modules 13)
     (nets 20)
@@ -20,8 +20,8 @@
     (37 F.SilkS user)
     (38 B.Mask user)
     (39 F.Mask user)
-    (42 Eco1.User user)
-    (43 Eco2.User user)
+    (42 Eco1.User user hide)
+    (43 Eco2.User user hide)
     (44 Edge.Cuts user)
     (48 B.Fab user hide)
     (49 F.Fab user hide)
@@ -30,7 +30,7 @@
   (setup
     (last_trace_width 0.254)
     (trace_clearance 0.1524)
-    (zone_clearance 0.508)
+    (zone_clearance 0.254)
     (zone_45_only no)
     (trace_min 0.1524)
     (segment_width 0.2)
@@ -522,7 +522,7 @@
   )
 
   (module Capacitors_ThroughHole:C_Radial_D6.3_L11.2_P2.5 (layer Top) (tedit 0) (tstamp 56F54544)
-    (at 91.44 48.895)
+    (at 91.48 48.895)
     (descr "Radial Electrolytic Capacitor, Diameter 6.3mm x Length 11.2mm, Pitch 2.5mm")
     (tags "Electrolytic Capacitor")
     (path /56F57B33)
@@ -732,36 +732,27 @@
     (effects (font (size 2.032 2.032) (thickness 0.3)))
   )
 
-  (segment (start 97.79 50.36821) (end 93.910559 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 93.910559 50.36821) (end 92.23821 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 93.94 50.125) (end 93.910559 50.154441) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 93.910559 50.154441) (end 93.910559 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 93.94 48.895) (end 93.94 50.125) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 104.14 43.18) (end 105.572562 43.18) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 81.28 48.26) (end 81.28 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 105.791 50.8) (end 97.79 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 97.79 50.8) (end 93.98 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 97.79 48.895) (end 97.79 50.8) (width 0.4064) (layer Bottom) (net 1) (status 10))
+  (segment (start 93.98 48.935) (end 93.98 50.8) (width 0.4064) (layer Bottom) (net 1) (status 10))
+  (segment (start 93.98 50.8) (end 76.2 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 76.2 50.8) (end 74.295 48.895) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 104.14 43.18) (end 105.572562 43.18) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 105.572562 43.18) (end 106.807 44.414438) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 106.807 44.414438) (end 106.807 49.784) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 106.807 49.784) (end 105.791 50.8) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 105.791 50.8) (end 98.22179 50.8) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 98.22179 50.8) (end 97.79 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 92.035 50.165) (end 81.28 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 81.28 50.165) (end 75.565 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 81.28 48.26) (end 81.28 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 75.565 50.165) (end 74.295 48.895) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 77.51 35.56) (end 82.55 35.56) (width 0.4064) (layer Bottom) (net 1) (status 30))
+  (segment (start 73.66 35.1536) (end 73.66 35.56) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 73.66 35.56) (end 77.43 35.56) (width 0.4064) (layer Bottom) (net 1) (status 20))
   (segment (start 74.295 48.895) (end 74.295 41.275) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 74.295 41.275) (end 73.66 40.64) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 97.79 48.895) (end 97.79 50.36821) (width 0.4064) (layer Bottom) (net 1) (status 10))
-  (segment (start 92.23821 50.36821) (end 92.035 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 97.79 48.895) (end 97.79 49.0474) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 97.155 48.26) (end 97.79 48.895) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 97.79 46.355) (end 97.79 48.895) (width 0.4064) (layer Bottom) (net 1) (status 30))
   (segment (start 73.66 33.02) (end 73.66 35.1536) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 73.66 38.1) (end 73.66 35.1536) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 77.47 44.45) (end 73.66 40.64) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 73.66 40.64) (end 73.66 38.1) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 73.66 38.1) (end 71.12 38.1) (width 0.4064) (layer Bottom) (net 1) (status 20))
-  (segment (start 73.66 35.1536) (end 73.66 35.56) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 73.66 35.56) (end 73.7 35.6) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 73.7 35.6) (end 77.47 35.6) (width 0.4064) (layer Bottom) (net 1) (status 20))
   (segment (start 77.520801 25.984199) (end 76.250801 25.984199) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 76.250801 25.984199) (end 76.2 26.035) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 76.2 26.035) (end 76.2 27.305) (width 0.4064) (layer Bottom) (net 1) (status 20))
@@ -769,34 +760,26 @@
   (segment (start 69.215 36.195) (end 69.215 27.255214) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 69.215 27.255214) (end 70.486015 25.984199) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 70.486015 25.984199) (end 77.520801 25.984199) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 77.47 35.6) (end 82.51 35.6) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 81.28 48.26) (end 81.28 48.1076) (width 0.4064) (layer Top) (net 1) (status 30))
-  (segment (start 82.51 35.6) (end 82.55 35.56) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 77.47 35.56) (end 77.47 35.6) (width 0.4064) (layer Bottom) (net 1) (status 30))
   (segment (start 93.98 27.305) (end 92.659199 25.984199) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 92.659199 25.984199) (end 77.520801 25.984199) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 99.06 32.385) (end 100.965 32.385) (width 0.4064) (layer Top) (net 2))
-  (segment (start 100.965 32.385) (end 103.340001 34.760001) (width 0.4064) (layer Top) (net 2))
-  (segment (start 103.340001 34.760001) (end 104.14 35.56) (width 0.4064) (layer Top) (net 2))
+  (segment (start 99.06 32.385) (end 100.965 32.385) (width 0.4064) (layer Top) (net 2) (status 10))
+  (segment (start 100.965 32.385) (end 104.14 35.56) (width 0.4064) (layer Top) (net 2) (status 20))
   (segment (start 91.44 29.845) (end 91.44 31.115) (width 0.4064) (layer Top) (net 2) (status 10))
   (segment (start 91.44 31.115) (end 92.075 31.75) (width 0.4064) (layer Top) (net 2))
   (segment (start 92.075 31.75) (end 97.011508 31.75) (width 0.4064) (layer Top) (net 2))
   (segment (start 97.011508 31.75) (end 97.646508 32.385) (width 0.4064) (layer Top) (net 2))
   (segment (start 97.646508 32.385) (end 99.06 32.385) (width 0.4064) (layer Top) (net 2) (status 20))
   (segment (start 91.504198 29.845) (end 91.44 29.845) (width 0.4064) (layer Top) (net 2) (status 30))
-  (segment (start 91.44 48.895) (end 91.44 49.9514) (width 0.4064) (layer Top) (net 3))
+  (segment (start 83.82 48.26) (end 84.455 48.895) (width 0.4064) (layer Top) (net 3) (status 30))
+  (segment (start 84.455 48.895) (end 91.44 48.895) (width 0.4064) (layer Top) (net 3) (status 30))
+  (segment (start 91.44 48.895) (end 91.44 49.9514) (width 0.4064) (layer Top) (net 3) (status 10))
   (segment (start 91.44 49.9514) (end 92.2886 50.8) (width 0.4064) (layer Top) (net 3))
-  (segment (start 92.2886 50.8) (end 92.9236 50.8) (width 0.4064) (layer Top) (net 3))
-  (segment (start 86.995 48.26) (end 87.63 48.895) (width 0.4064) (layer Top) (net 3))
-  (segment (start 87.63 48.895) (end 91.44 48.895) (width 0.4064) (layer Top) (net 3))
-  (segment (start 83.82 48.26) (end 86.995 48.26) (width 0.4064) (layer Top) (net 3))
-  (segment (start 92.9236 50.8) (end 103.6574 50.8) (width 0.4064) (layer Top) (net 3))
-  (segment (start 103.6574 50.8) (end 105.41 49.0474) (width 0.4064) (layer Top) (net 3))
-  (segment (start 105.41 49.0474) (end 105.41 48.895) (width 0.4064) (layer Top) (net 3))
-  (segment (start 105.41 48.895) (end 105.41 49.0474) (width 0.4064) (layer Bottom) (net 3) (status 30))
-  (segment (start 83.82 47.2436) (end 83.82 48.26) (width 0.4064) (layer Top) (net 3) (status 20))
-  (segment (start 78.5264 41.95) (end 83.82 47.2436) (width 0.4064) (layer Top) (net 3))
-  (segment (start 77.47 41.95) (end 78.5264 41.95) (width 0.4064) (layer Top) (net 3) (status 10))
+  (segment (start 92.2886 50.8) (end 103.6574 50.8) (width 0.4064) (layer Top) (net 3))
+  (segment (start 103.6574 50.8) (end 105.41 49.0474) (width 0.4064) (layer Top) (net 3) (status 20))
+  (segment (start 105.41 49.0474) (end 105.41 48.895) (width 0.4064) (layer Top) (net 3) (status 30))
+  (segment (start 77.47 41.95) (end 78.78 41.95) (width 0.4064) (layer Top) (net 3) (status 10))
+  (segment (start 78.78 41.95) (end 83.82 46.99) (width 0.4064) (layer Top) (net 3))
+  (segment (start 83.82 46.99) (end 83.82 48.26) (width 0.4064) (layer Top) (net 3) (status 20))
   (segment (start 71.12 33.02) (end 69.6976 33.02) (width 0.4064) (layer Top) (net 3) (status 10))
   (segment (start 69.6976 33.02) (end 69.215 32.5374) (width 0.4064) (layer Top) (net 3))
   (segment (start 69.215 32.5374) (end 69.215 32.1056) (width 0.4064) (layer Top) (net 3))
@@ -812,13 +795,13 @@
   (segment (start 69.215 27.988686) (end 69.215 32.1056) (width 0.4064) (layer Top) (net 3))
   (segment (start 77.43 41.91) (end 77.47 41.95) (width 0.4064) (layer Top) (net 3) (status 30))
   (segment (start 71.12 27.305) (end 73.66 27.305) (width 0.4064) (layer Top) (net 3) (status 30))
-  (segment (start 91.44 27.305) (end 90.17 28.575) (width 0.254) (layer Bottom) (net 4))
+  (segment (start 91.44 27.305) (end 90.17 28.575) (width 0.254) (layer Bottom) (net 4) (status 10))
   (segment (start 88.265 28.575) (end 87.63 29.21) (width 0.254) (layer Bottom) (net 4))
   (segment (start 90.17 28.575) (end 88.265 28.575) (width 0.254) (layer Bottom) (net 4))
   (segment (start 87.63 29.21) (end 87.63 31.17799) (width 0.254) (layer Bottom) (net 4))
   (segment (start 87.63 31.17799) (end 83.82 34.98799) (width 0.254) (layer Bottom) (net 4))
   (segment (start 83.82 34.98799) (end 83.82 36.83) (width 0.254) (layer Bottom) (net 4))
-  (segment (start 83.82 36.83) (end 82.55 38.1) (width 0.254) (layer Bottom) (net 4))
+  (segment (start 83.82 36.83) (end 82.55 38.1) (width 0.254) (layer Bottom) (net 4) (status 20))
   (segment (start 85.09 38.1) (end 86.995 36.195) (width 0.254) (layer Bottom) (net 5) (status 10))
   (segment (start 86.995 36.195) (end 86.995 35.56) (width 0.254) (layer Bottom) (net 5))
   (segment (start 86.995 35.56) (end 88.519 34.036) (width 0.254) (layer Bottom) (net 5))
@@ -851,29 +834,27 @@
   (segment (start 88.9 43.18) (end 87.63 44.45) (width 0.254) (layer Top) (net 8) (status 10))
   (segment (start 87.63 44.45) (end 83.82 44.45) (width 0.254) (layer Top) (net 8))
   (segment (start 83.82 44.45) (end 82.55 43.18) (width 0.254) (layer Top) (net 8) (status 20))
-  (segment (start 78.74 48.26) (end 78.74 46.355) (width 0.254) (layer Bottom) (net 9))
-  (segment (start 100.965 43.18) (end 101.6 43.18) (width 0.254) (layer Bottom) (net 9))
+  (segment (start 78.74 48.26) (end 78.74 46.355) (width 0.254) (layer Bottom) (net 9) (status 10))
+  (segment (start 100.965 43.18) (end 101.6 43.18) (width 0.254) (layer Bottom) (net 9) (status 30))
   (segment (start 78.74 46.355) (end 79.375 45.72) (width 0.254) (layer Bottom) (net 9))
   (segment (start 79.375 45.72) (end 95.631 45.72) (width 0.254) (layer Bottom) (net 9))
   (segment (start 95.631 45.72) (end 97.02801 44.32299) (width 0.254) (layer Bottom) (net 9))
   (segment (start 97.02801 44.32299) (end 99.82201 44.32299) (width 0.254) (layer Bottom) (net 9))
-  (segment (start 99.82201 44.32299) (end 100.965 43.18) (width 0.254) (layer Bottom) (net 9))
+  (segment (start 99.82201 44.32299) (end 100.965 43.18) (width 0.254) (layer Bottom) (net 9) (status 20))
   (segment (start 78.74 48.1076) (end 78.74 48.26) (width 0.254) (layer Bottom) (net 9) (status 30))
-  (segment (start 96.812101 33.362899) (end 97.155 33.02) (width 0.254) (layer Bottom) (net 10))
-  (segment (start 96.52 33.655) (end 96.812101 33.362899) (width 0.254) (layer Bottom) (net 10))
-  (segment (start 96.52 35.56) (end 96.52 33.655) (width 0.254) (layer Bottom) (net 10))
-  (segment (start 96.52 32.385) (end 96.812101 32.677101) (width 0.254) (layer Top) (net 10))
-  (segment (start 88.9 32.385) (end 96.52 32.385) (width 0.254) (layer Top) (net 10))
-  (segment (start 96.812101 32.677101) (end 97.155 33.02) (width 0.254) (layer Top) (net 10))
+  (segment (start 96.52 33.655) (end 97.155 33.02) (width 0.254) (layer Bottom) (net 10))
+  (segment (start 96.52 35.56) (end 96.52 33.655) (width 0.254) (layer Bottom) (net 10) (status 10))
+  (segment (start 96.52 32.385) (end 97.155 33.02) (width 0.254) (layer Top) (net 10))
+  (segment (start 88.9 32.385) (end 96.52 32.385) (width 0.254) (layer Top) (net 10) (status 10))
   (via (at 97.155 33.02) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 10))
-  (segment (start 88.9 29.845) (end 88.9 32.385) (width 0.254) (layer Top) (net 10))
-  (segment (start 99.06 35.56) (end 97.79 34.29) (width 0.254) (layer Top) (net 11))
+  (segment (start 88.9 29.845) (end 88.9 32.385) (width 0.254) (layer Top) (net 10) (status 30))
+  (segment (start 99.06 35.56) (end 97.79 34.29) (width 0.254) (layer Top) (net 11) (status 10))
   (segment (start 97.79 34.29) (end 87.376 34.29) (width 0.254) (layer Top) (net 11))
   (segment (start 84.836 31.75) (end 80.645 31.75) (width 0.254) (layer Top) (net 11))
   (segment (start 87.376 34.29) (end 84.836 31.75) (width 0.254) (layer Top) (net 11))
   (segment (start 80.645 31.75) (end 80.01 31.115) (width 0.254) (layer Top) (net 11))
   (segment (start 80.01 31.115) (end 80.01 28.575) (width 0.254) (layer Top) (net 11))
-  (segment (start 80.01 28.575) (end 78.74 27.305) (width 0.254) (layer Top) (net 11))
+  (segment (start 80.01 28.575) (end 78.74 27.305) (width 0.254) (layer Top) (net 11) (status 20))
   (segment (start 99.06 27.305) (end 97.79 28.575) (width 0.254) (layer Bottom) (net 12) (status 10))
   (segment (start 93.98 34.42863) (end 93.98 35.56) (width 0.254) (layer Bottom) (net 12) (status 20))
   (segment (start 97.79 30.61863) (end 93.98 34.42863) (width 0.254) (layer Bottom) (net 12))
@@ -885,37 +866,35 @@
   (segment (start 85.02975 31.115) (end 83.185 31.115) (width 0.254) (layer Top) (net 13))
   (segment (start 83.185 31.115) (end 82.55 30.48) (width 0.254) (layer Top) (net 13))
   (segment (start 82.55 30.48) (end 82.55 28.575) (width 0.254) (layer Top) (net 13))
-  (segment (start 100.33 45.72) (end 100.33 42.545) (width 0.254) (layer Top) (net 14) (status 10))
+  (segment (start 100.33 45.72) (end 100.33 42.545) (width 0.254) (layer Top) (net 14))
   (segment (start 100.33 42.545) (end 99.695 41.91) (width 0.254) (layer Top) (net 14))
   (segment (start 99.695 41.91) (end 95.25 41.91) (width 0.254) (layer Top) (net 14))
-  (segment (start 95.25 41.91) (end 93.98 43.18) (width 0.254) (layer Top) (net 14) (status 20))
-  (segment (start 100.33 45.72) (end 100.33 45.5676) (width 0.254) (layer Top) (net 14) (status 30))
-  (segment (start 100.33 46.2026) (end 100.33 46.355) (width 0.254) (layer Top) (net 14) (status 30))
-  (segment (start 100.179933 41.275) (end 99.695 41.275) (width 0.254) (layer Top) (net 15))
-  (segment (start 101.6 41.275) (end 100.179933 41.275) (width 0.254) (layer Top) (net 15))
-  (segment (start 102.87 42.545) (end 101.6 41.275) (width 0.254) (layer Top) (net 15))
+  (segment (start 95.25 41.91) (end 93.98 43.18) (width 0.254) (layer Top) (net 14))
   (segment (start 102.87 45.72) (end 102.87 42.545) (width 0.254) (layer Top) (net 15))
-  (segment (start 98.425 41.275) (end 99.695 41.275) (width 0.254) (layer Bottom) (net 15))
-  (via (at 99.695 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 15))
+  (segment (start 102.87 42.545) (end 101.6 41.275) (width 0.254) (layer Top) (net 15))
+  (segment (start 101.6 41.275) (end 98.909933 41.275) (width 0.254) (layer Top) (net 15))
+  (segment (start 98.909933 41.275) (end 98.425 41.275) (width 0.254) (layer Top) (net 15))
   (segment (start 96.52 43.18) (end 98.425 41.275) (width 0.254) (layer Bottom) (net 15))
+  (via (at 98.425 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 15))
   (segment (start 102.87 45.72) (end 102.87 45.5676) (width 0.254) (layer Top) (net 15) (status 30))
-  (segment (start 103.989939 41.275) (end 102.87 41.275) (width 0.254) (layer Top) (net 16))
-  (segment (start 105.41 42.695061) (end 103.989939 41.275) (width 0.254) (layer Top) (net 16))
-  (segment (start 105.41 45.72) (end 105.41 42.695061) (width 0.254) (layer Top) (net 16) (status 10))
-  (segment (start 100.965 41.275) (end 102.87 41.275) (width 0.254) (layer Bottom) (net 16))
-  (segment (start 99.06 43.18) (end 100.965 41.275) (width 0.254) (layer Bottom) (net 16) (status 10))
-  (via (at 102.87 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 16))
-  (segment (start 105.41 46.355) (end 105.41 46.2026) (width 0.254) (layer Top) (net 16) (status 30))
+  (segment (start 105.41 45.72) (end 105.41 42.545) (width 0.254) (layer Top) (net 16))
+  (segment (start 104.14 41.275) (end 103.100933 41.275) (width 0.254) (layer Top) (net 16))
+  (segment (start 105.41 42.545) (end 104.14 41.275) (width 0.254) (layer Top) (net 16))
+  (segment (start 103.100933 41.275) (end 102.616 41.275) (width 0.254) (layer Top) (net 16))
+  (segment (start 102.131067 41.275) (end 102.616 41.275) (width 0.254) (layer Bottom) (net 16))
+  (segment (start 100.965 41.275) (end 102.131067 41.275) (width 0.254) (layer Bottom) (net 16))
+  (segment (start 99.06 43.18) (end 100.965 41.275) (width 0.254) (layer Bottom) (net 16))
+  (via (at 102.616 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 16))
   (segment (start 76.2 48.26) (end 71.12 48.26) (width 0.508) (layer Top) (net 17) (status 30))
+  (segment (start 85.09 35.56) (end 83.185 33.655) (width 0.4064) (layer Top) (net 18))
+  (segment (start 83.185 33.655) (end 80.899 33.655) (width 0.4064) (layer Top) (net 18))
+  (segment (start 80.899 33.655) (end 79.502 35.052) (width 0.4064) (layer Top) (net 18))
+  (segment (start 79.502 35.052) (end 79.502 37.1244) (width 0.4064) (layer Top) (net 18))
+  (segment (start 79.502 37.1244) (end 78.5264 38.1) (width 0.4064) (layer Top) (net 18))
+  (segment (start 78.5264 38.1) (end 77.47 38.1) (width 0.4064) (layer Top) (net 18))
   (segment (start 73.025 40.64) (end 75.565 38.1) (width 0.4064) (layer Top) (net 18))
   (segment (start 75.565 38.1) (end 77.47 38.1) (width 0.4064) (layer Top) (net 18) (status 20))
   (segment (start 71.12 40.64) (end 73.025 40.64) (width 0.4064) (layer Top) (net 18) (status 10))
-  (segment (start 79.502 37.1244) (end 78.5264 38.1) (width 0.4064) (layer Top) (net 18))
-  (segment (start 81.026 33.528) (end 79.502 35.052) (width 0.4064) (layer Top) (net 18))
-  (segment (start 79.502 35.052) (end 79.502 37.1244) (width 0.4064) (layer Top) (net 18))
-  (segment (start 83.058 33.528) (end 81.026 33.528) (width 0.4064) (layer Top) (net 18))
-  (segment (start 78.5264 38.1) (end 77.47 38.1) (width 0.4064) (layer Top) (net 18) (status 20))
-  (segment (start 85.09 35.56) (end 83.058 33.528) (width 0.4064) (layer Top) (net 18) (status 10))
   (segment (start 92.71 43.815) (end 92.71 36.83) (width 0.254) (layer Top) (net 19))
   (segment (start 100.33 48.895) (end 100.33 48.7426) (width 0.254) (layer Top) (net 19) (status 30))
   (segment (start 100.33 48.7426) (end 98.816399 47.228999) (width 0.254) (layer Top) (net 19) (status 10))
diff --git a/domopi.kicad_pcb-bak b/domopi.kicad_pcb-bak
index 37b8e09..39c04ba 100644
--- a/domopi.kicad_pcb-bak
+++ b/domopi.kicad_pcb-bak
@@ -1,12 +1,12 @@
-(kicad_pcb (version 4) (host pcbnew "(2015-09-30 BZR 6231)-product")
+(kicad_pcb (version 4) (host pcbnew 4.0.2+dfsg1-2~bpo8+1-stable)
 
   (general
     (links 42)
-    (no_connects 0)
-    (area 66.841 25.230285 108.667572 53.689)
+    (no_connects 2)
+    (area 66.841 25.230285 108.667572 54.324)
     (thickness 1.6)
     (drawings 6)
-    (tracks 184)
+    (tracks 170)
     (zones 0)
     (modules 13)
     (nets 20)
@@ -20,8 +20,8 @@
     (37 F.SilkS user)
     (38 B.Mask user)
     (39 F.Mask user)
-    (42 Eco1.User user)
-    (43 Eco2.User user)
+    (42 Eco1.User user hide)
+    (43 Eco2.User user hide)
     (44 Edge.Cuts user)
     (48 B.Fab user hide)
     (49 F.Fab user hide)
@@ -30,7 +30,7 @@
   (setup
     (last_trace_width 0.254)
     (trace_clearance 0.1524)
-    (zone_clearance 0.508)
+    (zone_clearance 0.254)
     (zone_45_only no)
     (trace_min 0.1524)
     (segment_width 0.2)
@@ -522,7 +522,7 @@
   )
 
   (module Capacitors_ThroughHole:C_Radial_D6.3_L11.2_P2.5 (layer Top) (tedit 0) (tstamp 56F54544)
-    (at 91.44 48.26)
+    (at 91.48 48.895)
     (descr "Radial Electrolytic Capacitor, Diameter 6.3mm x Length 11.2mm, Pitch 2.5mm")
     (tags "Electrolytic Capacitor")
     (path /56F57B33)
@@ -721,9 +721,9 @@
     )
   )
 
-  (gr_line (start 68.58 50.8) (end 68.58 25.4) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 107.315 50.8) (end 68.58 50.8) (angle 90) (layer Edge.Cuts) (width 0.15))
-  (gr_line (start 107.315 25.4) (end 107.315 50.8) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 68.58 51.435) (end 68.58 25.4) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 107.315 51.435) (end 68.58 51.435) (angle 90) (layer Edge.Cuts) (width 0.15))
+  (gr_line (start 107.315 25.4) (end 107.315 51.435) (angle 90) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 68.58 25.4) (end 107.315 25.4) (angle 90) (layer Edge.Cuts) (width 0.15))
   (gr_text "-DomoPi v2-" (at 96.52 39.37) (layer B.SilkS)
     (effects (font (size 2.032 2.032) (thickness 0.3)) (justify mirror))
@@ -732,32 +732,27 @@
     (effects (font (size 2.032 2.032) (thickness 0.3)))
   )
 
-  (segment (start 92.035 50.165) (end 81.28 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 81.28 50.165) (end 75.565 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 81.28 48.26) (end 81.28 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 75.565 50.165) (end 74.295 48.895) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 81.28 48.26) (end 81.28 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 105.791 50.8) (end 97.79 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 97.79 50.8) (end 93.98 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 97.79 48.895) (end 97.79 50.8) (width 0.4064) (layer Bottom) (net 1) (status 10))
+  (segment (start 93.98 48.935) (end 93.98 50.8) (width 0.4064) (layer Bottom) (net 1) (status 10))
+  (segment (start 93.98 50.8) (end 76.2 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 76.2 50.8) (end 74.295 48.895) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 104.14 43.18) (end 105.572562 43.18) (width 0.4064) (layer Bottom) (net 1) (status 10))
+  (segment (start 105.572562 43.18) (end 106.807 44.414438) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 106.807 44.414438) (end 106.807 49.784) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 106.807 49.784) (end 105.791 50.8) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 77.51 35.56) (end 82.55 35.56) (width 0.4064) (layer Bottom) (net 1) (status 30))
+  (segment (start 73.66 35.1536) (end 73.66 35.56) (width 0.4064) (layer Bottom) (net 1))
+  (segment (start 73.66 35.56) (end 77.43 35.56) (width 0.4064) (layer Bottom) (net 1) (status 20))
   (segment (start 74.295 48.895) (end 74.295 41.275) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 74.295 41.275) (end 73.66 40.64) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 105.957097 50.36821) (end 97.79 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 97.79 50.36821) (end 92.23821 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 97.79 48.895) (end 97.79 50.36821) (width 0.4064) (layer Bottom) (net 1) (status 10))
-  (segment (start 104.14 43.18) (end 105.572562 43.18) (width 0.4064) (layer Bottom) (net 1) (status 10))
-  (segment (start 105.572562 43.18) (end 106.730801 44.338239) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 106.730801 44.338239) (end 106.730801 49.594506) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 106.730801 49.594506) (end 105.957097 50.36821) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 92.23821 50.36821) (end 92.035 50.165) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 93.94 48.26) (end 92.035 50.165) (width 0.4064) (layer Bottom) (net 1) (status 10))
-  (segment (start 97.79 48.895) (end 97.79 49.0474) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 97.155 48.26) (end 97.79 48.895) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 97.79 46.355) (end 97.79 48.895) (width 0.4064) (layer Bottom) (net 1) (status 30))
   (segment (start 73.66 33.02) (end 73.66 35.1536) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 73.66 38.1) (end 73.66 35.1536) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 77.47 44.45) (end 73.66 40.64) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 73.66 40.64) (end 73.66 38.1) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 73.66 38.1) (end 71.12 38.1) (width 0.4064) (layer Bottom) (net 1) (status 20))
-  (segment (start 73.66 35.1536) (end 73.66 35.56) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 73.66 35.56) (end 73.7 35.6) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 73.7 35.6) (end 77.47 35.6) (width 0.4064) (layer Bottom) (net 1) (status 20))
   (segment (start 77.520801 25.984199) (end 76.250801 25.984199) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 76.250801 25.984199) (end 76.2 26.035) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 76.2 26.035) (end 76.2 27.305) (width 0.4064) (layer Bottom) (net 1) (status 20))
@@ -765,31 +760,26 @@
   (segment (start 69.215 36.195) (end 69.215 27.255214) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 69.215 27.255214) (end 70.486015 25.984199) (width 0.4064) (layer Bottom) (net 1))
   (segment (start 70.486015 25.984199) (end 77.520801 25.984199) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 77.47 35.6) (end 82.51 35.6) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 81.28 48.26) (end 81.28 48.1076) (width 0.4064) (layer Top) (net 1) (status 30))
-  (segment (start 82.51 35.6) (end 82.55 35.56) (width 0.4064) (layer Bottom) (net 1) (status 30))
-  (segment (start 77.47 35.56) (end 77.47 35.6) (width 0.4064) (layer Bottom) (net 1) (status 30))
   (segment (start 93.98 27.305) (end 92.659199 25.984199) (width 0.4064) (layer Bottom) (net 1) (status 10))
   (segment (start 92.659199 25.984199) (end 77.520801 25.984199) (width 0.4064) (layer Bottom) (net 1))
-  (segment (start 99.06 32.385) (end 100.965 32.385) (width 0.4064) (layer Top) (net 2))
-  (segment (start 100.965 32.385) (end 103.340001 34.760001) (width 0.4064) (layer Top) (net 2))
-  (segment (start 103.340001 34.760001) (end 104.14 35.56) (width 0.4064) (layer Top) (net 2))
+  (segment (start 99.06 32.385) (end 100.965 32.385) (width 0.4064) (layer Top) (net 2) (status 10))
+  (segment (start 100.965 32.385) (end 104.14 35.56) (width 0.4064) (layer Top) (net 2) (status 20))
   (segment (start 91.44 29.845) (end 91.44 31.115) (width 0.4064) (layer Top) (net 2) (status 10))
   (segment (start 91.44 31.115) (end 92.075 31.75) (width 0.4064) (layer Top) (net 2))
   (segment (start 92.075 31.75) (end 97.011508 31.75) (width 0.4064) (layer Top) (net 2))
   (segment (start 97.011508 31.75) (end 97.646508 32.385) (width 0.4064) (layer Top) (net 2))
   (segment (start 97.646508 32.385) (end 99.06 32.385) (width 0.4064) (layer Top) (net 2) (status 20))
   (segment (start 91.504198 29.845) (end 91.44 29.845) (width 0.4064) (layer Top) (net 2) (status 30))
-  (segment (start 91.44 48.26) (end 91.44 49.3164) (width 0.4064) (layer Top) (net 3) (status 10))
-  (segment (start 91.44 49.3164) (end 92.49181 50.36821) (width 0.4064) (layer Top) (net 3))
+  (segment (start 83.82 48.26) (end 84.455 48.895) (width 0.4064) (layer Top) (net 3) (status 30))
+  (segment (start 84.455 48.895) (end 91.44 48.895) (width 0.4064) (layer Top) (net 3) (status 30))
+  (segment (start 91.44 48.895) (end 91.44 49.9514) (width 0.4064) (layer Top) (net 3) (status 10))
+  (segment (start 91.44 49.9514) (end 92.2886 50.8) (width 0.4064) (layer Top) (net 3))
+  (segment (start 92.2886 50.8) (end 103.6574 50.8) (width 0.4064) (layer Top) (net 3))
+  (segment (start 103.6574 50.8) (end 105.41 49.0474) (width 0.4064) (layer Top) (net 3) (status 20))
   (segment (start 105.41 49.0474) (end 105.41 48.895) (width 0.4064) (layer Top) (net 3) (status 30))
-  (segment (start 92.49181 50.36821) (end 104.08919 50.36821) (width 0.4064) (layer Top) (net 3))
-  (segment (start 104.08919 50.36821) (end 105.41 49.0474) (width 0.4064) (layer Top) (net 3) (status 20))
-  (segment (start 105.41 48.895) (end 105.41 49.0474) (width 0.4064) (layer Bottom) (net 3) (status 30))
-  (segment (start 83.82 47.2436) (end 83.82 48.26) (width 0.4064) (layer Top) (net 3) (status 20))
-  (segment (start 78.5264 41.95) (end 83.82 47.2436) (width 0.4064) (layer Top) (net 3))
-  (segment (start 77.47 41.95) (end 78.5264 41.95) (width 0.4064) (layer Top) (net 3) (status 10))
-  (segment (start 83.82 48.26) (end 91.44 48.26) (width 0.4064) (layer Top) (net 3) (status 30))
+  (segment (start 77.47 41.95) (end 78.78 41.95) (width 0.4064) (layer Top) (net 3) (status 10))
+  (segment (start 78.78 41.95) (end 83.82 46.99) (width 0.4064) (layer Top) (net 3))
+  (segment (start 83.82 46.99) (end 83.82 48.26) (width 0.4064) (layer Top) (net 3) (status 20))
   (segment (start 71.12 33.02) (end 69.6976 33.02) (width 0.4064) (layer Top) (net 3) (status 10))
   (segment (start 69.6976 33.02) (end 69.215 32.5374) (width 0.4064) (layer Top) (net 3))
   (segment (start 69.215 32.5374) (end 69.215 32.1056) (width 0.4064) (layer Top) (net 3))
@@ -805,13 +795,13 @@
   (segment (start 69.215 27.988686) (end 69.215 32.1056) (width 0.4064) (layer Top) (net 3))
   (segment (start 77.43 41.91) (end 77.47 41.95) (width 0.4064) (layer Top) (net 3) (status 30))
   (segment (start 71.12 27.305) (end 73.66 27.305) (width 0.4064) (layer Top) (net 3) (status 30))
-  (segment (start 91.44 27.305) (end 90.17 28.575) (width 0.254) (layer Bottom) (net 4))
+  (segment (start 91.44 27.305) (end 90.17 28.575) (width 0.254) (layer Bottom) (net 4) (status 10))
   (segment (start 88.265 28.575) (end 87.63 29.21) (width 0.254) (layer Bottom) (net 4))
   (segment (start 90.17 28.575) (end 88.265 28.575) (width 0.254) (layer Bottom) (net 4))
   (segment (start 87.63 29.21) (end 87.63 31.17799) (width 0.254) (layer Bottom) (net 4))
   (segment (start 87.63 31.17799) (end 83.82 34.98799) (width 0.254) (layer Bottom) (net 4))
   (segment (start 83.82 34.98799) (end 83.82 36.83) (width 0.254) (layer Bottom) (net 4))
-  (segment (start 83.82 36.83) (end 82.55 38.1) (width 0.254) (layer Bottom) (net 4))
+  (segment (start 83.82 36.83) (end 82.55 38.1) (width 0.254) (layer Bottom) (net 4) (status 20))
   (segment (start 85.09 38.1) (end 86.995 36.195) (width 0.254) (layer Bottom) (net 5) (status 10))
   (segment (start 86.995 36.195) (end 86.995 35.56) (width 0.254) (layer Bottom) (net 5))
   (segment (start 86.995 35.56) (end 88.519 34.036) (width 0.254) (layer Bottom) (net 5))
@@ -844,29 +834,27 @@
   (segment (start 88.9 43.18) (end 87.63 44.45) (width 0.254) (layer Top) (net 8) (status 10))
   (segment (start 87.63 44.45) (end 83.82 44.45) (width 0.254) (layer Top) (net 8))
   (segment (start 83.82 44.45) (end 82.55 43.18) (width 0.254) (layer Top) (net 8) (status 20))
-  (segment (start 78.74 48.26) (end 78.74 46.355) (width 0.254) (layer Bottom) (net 9))
-  (segment (start 100.965 43.18) (end 101.6 43.18) (width 0.254) (layer Bottom) (net 9))
+  (segment (start 78.74 48.26) (end 78.74 46.355) (width 0.254) (layer Bottom) (net 9) (status 10))
+  (segment (start 100.965 43.18) (end 101.6 43.18) (width 0.254) (layer Bottom) (net 9) (status 30))
   (segment (start 78.74 46.355) (end 79.375 45.72) (width 0.254) (layer Bottom) (net 9))
   (segment (start 79.375 45.72) (end 95.631 45.72) (width 0.254) (layer Bottom) (net 9))
   (segment (start 95.631 45.72) (end 97.02801 44.32299) (width 0.254) (layer Bottom) (net 9))
   (segment (start 97.02801 44.32299) (end 99.82201 44.32299) (width 0.254) (layer Bottom) (net 9))
-  (segment (start 99.82201 44.32299) (end 100.965 43.18) (width 0.254) (layer Bottom) (net 9))
+  (segment (start 99.82201 44.32299) (end 100.965 43.18) (width 0.254) (layer Bottom) (net 9) (status 20))
   (segment (start 78.74 48.1076) (end 78.74 48.26) (width 0.254) (layer Bottom) (net 9) (status 30))
-  (segment (start 96.812101 33.362899) (end 97.155 33.02) (width 0.254) (layer Bottom) (net 10))
-  (segment (start 96.52 33.655) (end 96.812101 33.362899) (width 0.254) (layer Bottom) (net 10))
-  (segment (start 96.52 35.56) (end 96.52 33.655) (width 0.254) (layer Bottom) (net 10))
-  (segment (start 96.52 32.385) (end 96.812101 32.677101) (width 0.254) (layer Top) (net 10))
-  (segment (start 88.9 32.385) (end 96.52 32.385) (width 0.254) (layer Top) (net 10))
-  (segment (start 96.812101 32.677101) (end 97.155 33.02) (width 0.254) (layer Top) (net 10))
+  (segment (start 96.52 33.655) (end 97.155 33.02) (width 0.254) (layer Bottom) (net 10))
+  (segment (start 96.52 35.56) (end 96.52 33.655) (width 0.254) (layer Bottom) (net 10) (status 10))
+  (segment (start 96.52 32.385) (end 97.155 33.02) (width 0.254) (layer Top) (net 10))
+  (segment (start 88.9 32.385) (end 96.52 32.385) (width 0.254) (layer Top) (net 10) (status 10))
   (via (at 97.155 33.02) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 10))
-  (segment (start 88.9 29.845) (end 88.9 32.385) (width 0.254) (layer Top) (net 10))
-  (segment (start 99.06 35.56) (end 97.79 34.29) (width 0.254) (layer Top) (net 11))
+  (segment (start 88.9 29.845) (end 88.9 32.385) (width 0.254) (layer Top) (net 10) (status 30))
+  (segment (start 99.06 35.56) (end 97.79 34.29) (width 0.254) (layer Top) (net 11) (status 10))
   (segment (start 97.79 34.29) (end 87.376 34.29) (width 0.254) (layer Top) (net 11))
   (segment (start 84.836 31.75) (end 80.645 31.75) (width 0.254) (layer Top) (net 11))
   (segment (start 87.376 34.29) (end 84.836 31.75) (width 0.254) (layer Top) (net 11))
   (segment (start 80.645 31.75) (end 80.01 31.115) (width 0.254) (layer Top) (net 11))
   (segment (start 80.01 31.115) (end 80.01 28.575) (width 0.254) (layer Top) (net 11))
-  (segment (start 80.01 28.575) (end 78.74 27.305) (width 0.254) (layer Top) (net 11))
+  (segment (start 80.01 28.575) (end 78.74 27.305) (width 0.254) (layer Top) (net 11) (status 20))
   (segment (start 99.06 27.305) (end 97.79 28.575) (width 0.254) (layer Bottom) (net 12) (status 10))
   (segment (start 93.98 34.42863) (end 93.98 35.56) (width 0.254) (layer Bottom) (net 12) (status 20))
   (segment (start 97.79 30.61863) (end 93.98 34.42863) (width 0.254) (layer Bottom) (net 12))
@@ -878,27 +866,25 @@
   (segment (start 85.02975 31.115) (end 83.185 31.115) (width 0.254) (layer Top) (net 13))
   (segment (start 83.185 31.115) (end 82.55 30.48) (width 0.254) (layer Top) (net 13))
   (segment (start 82.55 30.48) (end 82.55 28.575) (width 0.254) (layer Top) (net 13))
-  (segment (start 100.33 45.72) (end 100.33 42.545) (width 0.254) (layer Top) (net 14) (status 10))
+  (segment (start 100.33 45.72) (end 100.33 42.545) (width 0.254) (layer Top) (net 14))
   (segment (start 100.33 42.545) (end 99.695 41.91) (width 0.254) (layer Top) (net 14))
   (segment (start 99.695 41.91) (end 95.25 41.91) (width 0.254) (layer Top) (net 14))
-  (segment (start 95.25 41.91) (end 93.98 43.18) (width 0.254) (layer Top) (net 14) (status 20))
-  (segment (start 100.33 45.72) (end 100.33 45.5676) (width 0.254) (layer Top) (net 14) (status 30))
-  (segment (start 100.33 46.2026) (end 100.33 46.355) (width 0.254) (layer Top) (net 14) (status 30))
-  (segment (start 100.179933 41.275) (end 99.695 41.275) (width 0.254) (layer Top) (net 15))
-  (segment (start 101.6 41.275) (end 100.179933 41.275) (width 0.254) (layer Top) (net 15))
-  (segment (start 102.87 42.545) (end 101.6 41.275) (width 0.254) (layer Top) (net 15))
+  (segment (start 95.25 41.91) (end 93.98 43.18) (width 0.254) (layer Top) (net 14))
   (segment (start 102.87 45.72) (end 102.87 42.545) (width 0.254) (layer Top) (net 15))
-  (segment (start 98.425 41.275) (end 99.695 41.275) (width 0.254) (layer Bottom) (net 15))
-  (via (at 99.695 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 15))
+  (segment (start 102.87 42.545) (end 101.6 41.275) (width 0.254) (layer Top) (net 15))
+  (segment (start 101.6 41.275) (end 98.909933 41.275) (width 0.254) (layer Top) (net 15))
+  (segment (start 98.909933 41.275) (end 98.425 41.275) (width 0.254) (layer Top) (net 15))
   (segment (start 96.52 43.18) (end 98.425 41.275) (width 0.254) (layer Bottom) (net 15))
+  (via (at 98.425 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 15))
   (segment (start 102.87 45.72) (end 102.87 45.5676) (width 0.254) (layer Top) (net 15) (status 30))
-  (segment (start 103.989939 41.275) (end 102.87 41.275) (width 0.254) (layer Top) (net 16))
-  (segment (start 105.41 42.695061) (end 103.989939 41.275) (width 0.254) (layer Top) (net 16))
-  (segment (start 105.41 45.72) (end 105.41 42.695061) (width 0.254) (layer Top) (net 16) (status 10))
-  (segment (start 100.965 41.275) (end 102.87 41.275) (width 0.254) (layer Bottom) (net 16))
-  (segment (start 99.06 43.18) (end 100.965 41.275) (width 0.254) (layer Bottom) (net 16) (status 10))
-  (via (at 102.87 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 16))
-  (segment (start 105.41 46.355) (end 105.41 46.2026) (width 0.254) (layer Top) (net 16) (status 30))
+  (segment (start 105.41 45.72) (end 105.41 42.545) (width 0.254) (layer Top) (net 16))
+  (segment (start 104.14 41.275) (end 103.100933 41.275) (width 0.254) (layer Top) (net 16))
+  (segment (start 105.41 42.545) (end 104.14 41.275) (width 0.254) (layer Top) (net 16))
+  (segment (start 103.100933 41.275) (end 102.616 41.275) (width 0.254) (layer Top) (net 16))
+  (segment (start 102.131067 41.275) (end 102.616 41.275) (width 0.254) (layer Bottom) (net 16))
+  (segment (start 100.965 41.275) (end 102.131067 41.275) (width 0.254) (layer Bottom) (net 16))
+  (segment (start 99.06 43.18) (end 100.965 41.275) (width 0.254) (layer Bottom) (net 16))
+  (via (at 102.616 41.275) (size 0.6858) (drill 0.3302) (layers Top Bottom) (net 16))
   (segment (start 76.2 48.26) (end 71.12 48.26) (width 0.508) (layer Top) (net 17) (status 30))
   (segment (start 73.025 40.64) (end 75.565 38.1) (width 0.4064) (layer Top) (net 18))
   (segment (start 75.565 38.1) (end 77.47 38.1) (width 0.4064) (layer Top) (net 18) (status 20))