diff --git a/control/control-cache.lib b/control/control-cache.lib
index 50749bf..f827ac2 100644
--- a/control/control-cache.lib
+++ b/control/control-cache.lib
@@ -142,16 +142,45 @@ X ~ 2 0 -150 110 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONNECTOR
+# CONN_01X01
 #
-DEF CONNECTOR P 0 40 Y N 1 F N
-F0 "P" 350 100 70 H V C CNN
-F1 "CONNECTOR" 350 -100 70 H V C CNN
+DEF CONN_01X01 P 0 40 Y N 1 F N
+F0 "P" 0 100 50 H V C CNN
+F1 "CONN_01X01" 100 0 50 V V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X01
+ Pin_Header_Angled_1X01
+ Socket_Strip_Straight_1X01
+ Socket_Strip_Angled_1X01
+$ENDFPLIST
 DRAW
-S 300 50 350 -50 0 1 0 N
-X W 1 0 0 300 R 60 60 1 1 P I
+S -50 5 10 -5 0 1 0 N
+S -50 50 50 -50 0 1 0 N
+X P1 1 -200 0 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_01X02
+#
+DEF CONN_01X02 P 0 40 Y N 1 F N
+F0 "P" 0 150 50 H V C CNN
+F1 "CONN_01X02" 100 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X02
+ Pin_Header_Angled_1X02
+ Socket_Strip_Straight_1X02
+ Socket_Strip_Angled_1X02
+$ENDFPLIST
+DRAW
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 100 50 -100 0 1 0 N
+X P1 1 -200 50 150 R 50 50 1 1 P
+X P2 2 -200 -50 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -207,6 +236,124 @@ X P17 17 -200 -800 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_02X03
+#
+DEF CONN_02X03 P 0 1 Y N 1 F N
+F0 "P" 0 200 50 H V C CNN
+F1 "CONN_02X03" 0 -200 50 H V C CNN
+F2 "" 0 -1200 60 H V C CNN
+F3 "" 0 -1200 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X03
+ Pin_Header_Angled_2X03
+ Socket_Strip_Straight_2X03
+ Socket_Strip_Angled_2X03
+$ENDFPLIST
+DRAW
+S -100 -95 -50 -105 0 1 0 N
+S -100 5 -50 -5 0 1 0 N
+S -100 105 -50 95 0 1 0 N
+S -100 150 100 -150 0 1 0 N
+S 50 -95 100 -105 0 1 0 N
+S 50 5 100 -5 0 1 0 N
+S 50 105 100 95 0 1 0 N
+X P1 1 -250 100 150 R 50 50 1 1 P
+X P2 2 250 100 150 L 50 50 1 1 P
+X P3 3 -250 0 150 R 50 50 1 1 P
+X P4 4 250 0 150 L 50 50 1 1 P
+X P5 5 -250 -100 150 R 50 50 1 1 P
+X P6 6 250 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_02X05
+#
+DEF CONN_02X05 P 0 1 Y N 1 F N
+F0 "P" 0 300 50 H V C CNN
+F1 "CONN_02X05" 0 -300 50 H V C CNN
+F2 "" 0 -1200 60 H V C CNN
+F3 "" 0 -1200 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X05
+ Pin_Header_Angled_2X05
+ Socket_Strip_Straight_2X05
+ Socket_Strip_Angled_2X05
+$ENDFPLIST
+DRAW
+S -100 -195 -50 -205 0 1 0 N
+S -100 -95 -50 -105 0 1 0 N
+S -100 5 -50 -5 0 1 0 N
+S -100 105 -50 95 0 1 0 N
+S -100 205 -50 195 0 1 0 N
+S -100 250 100 -250 0 1 0 N
+S 50 -195 100 -205 0 1 0 N
+S 50 -95 100 -105 0 1 0 N
+S 50 5 100 -5 0 1 0 N
+S 50 105 100 95 0 1 0 N
+S 50 205 100 195 0 1 0 N
+X P1 1 -250 200 150 R 50 50 1 1 P
+X P2 2 250 200 150 L 50 50 1 1 P
+X P3 3 -250 100 150 R 50 50 1 1 P
+X P4 4 250 100 150 L 50 50 1 1 P
+X P5 5 -250 0 150 R 50 50 1 1 P
+X P6 6 250 0 150 L 50 50 1 1 P
+X P7 7 -250 -100 150 R 50 50 1 1 P
+X P8 8 250 -100 150 L 50 50 1 1 P
+X P9 9 -250 -200 150 R 50 50 1 1 P
+X P10 10 250 -200 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_02X08
+#
+DEF CONN_02X08 P 0 1 Y N 1 F N
+F0 "P" 0 450 50 H V C CNN
+F1 "CONN_02X08" 0 0 50 V V C CNN
+F2 "" 0 -1200 60 H V C CNN
+F3 "" 0 -1200 60 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X08
+ Pin_Header_Angled_2X08
+ Socket_Strip_Straight_2X08
+ Socket_Strip_Angled_2X08
+$ENDFPLIST
+DRAW
+S -100 -345 -50 -355 0 1 0 N
+S -100 -245 -50 -255 0 1 0 N
+S -100 -145 -50 -155 0 1 0 N
+S -100 -45 -50 -55 0 1 0 N
+S -100 55 -50 45 0 1 0 N
+S -100 155 -50 145 0 1 0 N
+S -100 255 -50 245 0 1 0 N
+S -100 355 -50 345 0 1 0 N
+S -100 400 100 -400 0 1 0 N
+S 50 -345 100 -355 0 1 0 N
+S 50 -245 100 -255 0 1 0 N
+S 50 -145 100 -155 0 1 0 N
+S 50 -45 100 -55 0 1 0 N
+S 50 55 100 45 0 1 0 N
+S 50 155 100 145 0 1 0 N
+S 50 255 100 245 0 1 0 N
+S 50 355 100 345 0 1 0 N
+X P1 1 -250 350 150 R 50 50 1 1 P
+X P2 2 250 350 150 L 50 50 1 1 P
+X P3 3 -250 250 150 R 50 50 1 1 P
+X P4 4 250 250 150 L 50 50 1 1 P
+X P5 5 -250 150 150 R 50 50 1 1 P
+X P6 6 250 150 150 L 50 50 1 1 P
+X P7 7 -250 50 150 R 50 50 1 1 P
+X P8 8 250 50 150 L 50 50 1 1 P
+X P9 9 -250 -50 150 R 50 50 1 1 P
+X P10 10 250 -50 150 L 50 50 1 1 P
+X P11 11 -250 -150 150 R 50 50 1 1 P
+X P12 12 250 -150 150 L 50 50 1 1 P
+X P13 13 -250 -250 150 R 50 50 1 1 P
+X P14 14 250 -250 150 L 50 50 1 1 P
+X P15 15 -250 -350 150 R 50 50 1 1 P
+X P16 16 250 -350 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_02X13
 #
 DEF CONN_02X13 P 0 1 Y N 1 F N
@@ -277,88 +424,6 @@ X P19 19 -250 -300 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CONN_2
-#
-DEF CONN_2 P 0 40 Y N 1 F N
-F0 "P" -50 0 40 V V C CNN
-F1 "CONN_2" 50 0 40 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -100 150 100 -150 0 1 0 N
-X P1 1 -350 100 250 R 60 60 1 1 P I
-X PM 2 -350 -100 250 R 60 60 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# CONN_3X2
-#
-DEF CONN_3X2 P 0 40 Y N 1 F N
-F0 "P" 0 250 50 H V C CNN
-F1 "CONN_3X2" 0 50 40 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -100 200 100 -100 0 1 0 N
-X 1 1 -400 150 300 R 60 60 1 1 P I
-X 2 2 400 150 300 L 60 60 1 1 P I
-X 3 3 -400 50 300 R 60 60 1 1 P I
-X 4 4 400 50 300 L 60 60 1 1 P I
-X 5 5 -400 -50 300 R 60 60 1 1 P I
-X 6 6 400 -50 300 L 60 60 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# CONN_5X2
-#
-DEF CONN_5X2 P 0 40 Y Y 1 F N
-F0 "P" 0 300 60 H V C CNN
-F1 "CONN_5X2" 0 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -100 250 100 -250 0 1 0 N
-X ~ 1 -400 200 300 R 60 60 1 1 P I
-X ~ 2 400 200 300 L 60 60 1 1 P I
-X ~ 3 -400 100 300 R 60 60 1 1 P I
-X ~ 4 400 100 300 L 60 60 1 1 P I
-X ~ 5 -400 0 300 R 60 60 1 1 P I
-X ~ 6 400 0 300 L 60 60 1 1 P I
-X ~ 7 -400 -100 300 R 60 60 1 1 P I
-X ~ 8 400 -100 300 L 60 60 1 1 P I
-X ~ 9 -400 -200 300 R 60 60 1 1 P I
-X ~ 10 400 -200 300 L 60 60 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# CONN_8X2
-#
-DEF CONN_8X2 P 0 40 Y Y 1 F N
-F0 "P" 0 450 60 H V C CNN
-F1 "CONN_8X2" 0 0 50 V V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -100 400 100 -400 0 1 0 N
-X ~ 1 -400 350 300 R 60 60 1 1 P I
-X ~ 2 400 350 300 L 60 60 1 1 P I
-X ~ 3 -400 250 300 R 60 60 1 1 P I
-X ~ 4 400 250 300 L 60 60 1 1 P I
-X ~ 5 -400 150 300 R 60 60 1 1 P I
-X ~ 6 400 150 300 L 60 60 1 1 P I
-X ~ 7 -400 50 300 R 60 60 1 1 P I
-X ~ 8 400 50 300 L 60 60 1 1 P I
-X ~ 9 -400 -50 300 R 60 60 1 1 P I
-X ~ 10 400 -50 300 L 60 60 1 1 P I
-X ~ 11 -400 -150 300 R 60 60 1 1 P I
-X ~ 12 400 -150 300 L 60 60 1 1 P I
-X ~ 13 -400 -250 300 R 60 60 1 1 P I
-X ~ 14 400 -250 300 L 60 60 1 1 P I
-X ~ 15 -400 -350 300 R 60 60 1 1 P I
-X ~ 16 400 -350 300 L 60 60 1 1 P I
-ENDDRAW
-ENDDEF
-#
 # CP
 #
 DEF CP C 0 10 N Y 1 F N
@@ -588,6 +653,26 @@ X A 2 200 0 150 L 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# LM2937
+#
+DEF LM2937 U 0 30 Y Y 1 F N
+F0 "U" 150 -195 60 H V C CNN
+F1 "LM2937" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LM7905 LM7912 79L05
+$FPLIST
+ TO263
+ TO220
+$ENDFPLIST
+DRAW
+S -200 -150 200 150 0 1 0 N
+X VI 1 -400 50 200 R 40 40 1 1 I
+X GND 2 0 -250 100 U 40 30 1 1 I
+X VO 3 400 50 200 L 40 40 1 1 w
+ENDDRAW
+ENDDEF
+#
 # MAX232
 #
 DEF MAX232 U 0 40 Y Y 1 F N
diff --git a/control/control.sch b/control/control.sch
index b810df5..5a02b18 100644
--- a/control/control.sch
+++ b/control/control.sch
@@ -90,14 +90,14 @@ F 3 "" H 2500 2500 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_3X2 P7
+L CONN_02X03 P7
 U 1 1 5051315C
-P 11900 6800
-F 0 "P7" H 11900 7050 50  0000 C CNN
-F 1 "ISP" V 11900 6850 40  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_2x03" H 11900 6800 60  0001 C CNN
-F 3 "" H 11900 6800 60  0001 C CNN
-	1    11900 6800
+P 10650 7700
+F 0 "P7" H 10650 7950 50  0000 C CNN
+F 1 "ISP" V 10650 7750 40  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x03" H 10650 7700 60  0001 C CNN
+F 3 "" H 10650 7700 60  0001 C CNN
+	1    10650 7700
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -114,12 +114,12 @@ $EndComp
 $Comp
 L VCC #PWR04
 U 1 1 50513174
-P 12300 6550
-F 0 "#PWR04" H 12300 6650 30  0001 C CNN
-F 1 "VCC" H 12300 6650 30  0000 C CNN
-F 2 "" H 12300 6550 60  0001 C CNN
-F 3 "" H 12300 6550 60  0001 C CNN
-	1    12300 6550
+P 10900 7500
+F 0 "#PWR04" H 10900 7600 30  0001 C CNN
+F 1 "VCC" H 10900 7600 30  0000 C CNN
+F 2 "" H 10900 7500 60  0001 C CNN
+F 3 "" H 10900 7500 60  0001 C CNN
+	1    10900 7500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -147,12 +147,12 @@ $EndComp
 $Comp
 L GND #PWR06
 U 1 1 50513584
-P 12300 6950
-F 0 "#PWR06" H 12300 6950 30  0001 C CNN
-F 1 "GND" H 12300 6880 30  0001 C CNN
-F 2 "" H 12300 6950 60  0001 C CNN
-F 3 "" H 12300 6950 60  0001 C CNN
-	1    12300 6950
+P 10900 7900
+F 0 "#PWR06" H 10900 7900 30  0001 C CNN
+F 1 "GND" H 10900 7830 30  0001 C CNN
+F 2 "" H 10900 7900 60  0001 C CNN
+F 3 "" H 10900 7900 60  0001 C CNN
+	1    10900 7900
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -334,56 +334,56 @@ $EndComp
 $Comp
 L GND #PWR015
 U 1 1 50FF22C7
-P 13000 9050
-F 0 "#PWR015" H 13000 9050 30  0001 C CNN
-F 1 "GND" H 13000 8980 30  0001 C CNN
-F 2 "" H 13000 9050 60  0001 C CNN
-F 3 "" H 13000 9050 60  0001 C CNN
-	1    13000 9050
+P 12900 9500
+F 0 "#PWR015" H 12900 9500 30  0001 C CNN
+F 1 "GND" H 12900 9430 30  0001 C CNN
+F 2 "" H 12900 9500 60  0001 C CNN
+F 3 "" H 12900 9500 60  0001 C CNN
+	1    12900 9500
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONNECTOR TP4
+L CONN_01X01 TP4
 U 1 1 50FF22CD
-P 13900 8950
-F 0 "TP4" H 14250 9050 70  0000 C CNN
-F 1 "3mm" H 14250 8850 70  0000 C CNN
-F 2 "Mounting_Holes:MountingHole_3mm" H 13900 8950 60  0001 C CNN
-F 3 "" H 13900 8950 60  0001 C CNN
-	1    13900 8950
+P 13800 9200
+F 0 "TP4" H 14150 9300 70  0000 C CNN
+F 1 "3mm" H 14150 9100 70  0000 C CNN
+F 2 "Mounting_Holes:MountingHole_3mm" H 13800 9200 60  0001 C CNN
+F 3 "" H 13800 9200 60  0001 C CNN
+	1    13800 9200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONNECTOR TP3
+L CONN_01X01 TP3
 U 1 1 50FF22D3
-P 13600 8950
-F 0 "TP3" H 13950 9050 70  0000 C CNN
-F 1 "3mm" H 13950 8850 70  0000 C CNN
-F 2 "Mounting_Holes:MountingHole_3mm" H 13600 8950 60  0001 C CNN
-F 3 "" H 13600 8950 60  0001 C CNN
-	1    13600 8950
+P 13500 9200
+F 0 "TP3" H 13850 9300 70  0000 C CNN
+F 1 "3mm" H 13850 9100 70  0000 C CNN
+F 2 "Mounting_Holes:MountingHole_3mm" H 13500 9200 60  0001 C CNN
+F 3 "" H 13500 9200 60  0001 C CNN
+	1    13500 9200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONNECTOR TP2
+L CONN_01X01 TP2
 U 1 1 50FF22D9
-P 13300 8950
-F 0 "TP2" H 13650 9050 70  0000 C CNN
-F 1 "3mm" H 13650 8850 70  0000 C CNN
-F 2 "Mounting_Holes:MountingHole_3mm" H 13300 8950 60  0001 C CNN
-F 3 "" H 13300 8950 60  0001 C CNN
-	1    13300 8950
+P 13200 9200
+F 0 "TP2" H 13550 9300 70  0000 C CNN
+F 1 "3mm" H 13550 9100 70  0000 C CNN
+F 2 "Mounting_Holes:MountingHole_3mm" H 13200 9200 60  0001 C CNN
+F 3 "" H 13200 9200 60  0001 C CNN
+	1    13200 9200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L CONNECTOR TP1
+L CONN_01X01 TP1
 U 1 1 50FF22DF
-P 13000 8950
-F 0 "TP1" H 13350 9050 70  0000 C CNN
-F 1 "3mm" H 13350 8850 70  0000 C CNN
-F 2 "Mounting_Holes:MountingHole_3mm" H 13000 8950 60  0001 C CNN
-F 3 "" H 13000 8950 60  0001 C CNN
-	1    13000 8950
+P 12900 9200
+F 0 "TP1" H 13250 9300 70  0000 C CNN
+F 1 "3mm" H 13250 9100 70  0000 C CNN
+F 2 "Mounting_Holes:MountingHole_3mm" H 12900 9200 60  0001 C CNN
+F 3 "" H 12900 9200 60  0001 C CNN
+	1    12900 9200
 	0    -1   -1   0   
 $EndComp
 Text Label 6250 4850 0    60   ~ 0
@@ -599,12 +599,12 @@ $EndComp
 $Comp
 L VCC #PWR023
 U 1 1 5107BA28
-P 12000 8400
-F 0 "#PWR023" H 12000 8500 30  0001 C CNN
-F 1 "VCC" H 12000 8500 30  0000 C CNN
-F 2 "" H 12000 8400 60  0001 C CNN
-F 3 "" H 12000 8400 60  0001 C CNN
-	1    12000 8400
+P 12000 8600
+F 0 "#PWR023" H 12000 8700 30  0001 C CNN
+F 1 "VCC" H 12000 8700 30  0000 C CNN
+F 2 "" H 12000 8600 60  0001 C CNN
+F 3 "" H 12000 8600 60  0001 C CNN
+	1    12000 8600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -621,12 +621,12 @@ $EndComp
 $Comp
 L R R61
 U 1 1 5107E2AF
-P 12000 8550
-F 0 "R61" H 12075 8500 50  0000 C CNN
-F 1 "10k" V 12000 8550 40  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" H 12000 8550 60  0001 C CNN
-F 3 "" H 12000 8550 60  0001 C CNN
-	1    12000 8550
+P 12000 8750
+F 0 "R61" H 12075 8700 50  0000 C CNN
+F 1 "10k" V 12000 8750 40  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 12000 8750 60  0001 C CNN
+F 3 "" H 12000 8750 60  0001 C CNN
+	1    12000 8750
 	-1   0    0    1   
 $EndComp
 $Comp
@@ -676,45 +676,45 @@ $EndComp
 $Comp
 L VCC #PWR029
 U 1 1 5107F09B
-P 14050 7550
-F 0 "#PWR029" H 14050 7650 30  0001 C CNN
-F 1 "VCC" H 14050 7650 30  0000 C CNN
-F 2 "" H 14050 7550 60  0001 C CNN
-F 3 "" H 14050 7550 60  0001 C CNN
-	1    14050 7550
+P 13700 7550
+F 0 "#PWR029" H 13700 7650 30  0001 C CNN
+F 1 "VCC" H 13700 7650 30  0000 C CNN
+F 2 "" H 13700 7550 60  0001 C CNN
+F 3 "" H 13700 7550 60  0001 C CNN
+	1    13700 7550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR030
 U 1 1 5107F0AA
-P 14050 8000
-F 0 "#PWR030" H 14050 8000 30  0001 C CNN
-F 1 "GND" H 14050 7930 30  0001 C CNN
-F 2 "" H 14050 8000 60  0001 C CNN
-F 3 "" H 14050 8000 60  0001 C CNN
-	1    14050 8000
+P 13700 8000
+F 0 "#PWR030" H 13700 8000 30  0001 C CNN
+F 1 "GND" H 13700 7930 30  0001 C CNN
+F 2 "" H 13700 8000 60  0001 C CNN
+F 3 "" H 13700 8000 60  0001 C CNN
+	1    13700 8000
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C27
 U 1 1 5107F0B9
-P 14350 7750
-F 0 "C27" H 14425 7850 50  0000 C CNN
-F 1 "100n" H 14450 7650 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 14350 7750 60  0001 C CNN
-F 3 "" H 14350 7750 60  0001 C CNN
-	1    14350 7750
+P 14000 7750
+F 0 "C27" H 14075 7850 50  0000 C CNN
+F 1 "100n" H 14100 7650 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 14000 7750 60  0001 C CNN
+F 3 "" H 14000 7750 60  0001 C CNN
+	1    14000 7750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C26
 U 1 1 5107F3DB
-P 14050 7750
-F 0 "C26" H 14125 7850 50  0000 C CNN
-F 1 "10u" H 14150 7650 50  0000 C CNN
-F 2 "Capacitors_ThroughHole:C_Radial_D5_L11_P2.5" H 14050 7750 60  0001 C CNN
-F 3 "" H 14050 7750 60  0001 C CNN
-	1    14050 7750
+P 13700 7750
+F 0 "C26" H 13775 7850 50  0000 C CNN
+F 1 "10u" H 13800 7650 50  0000 C CNN
+F 2 "Capacitors_ThroughHole:C_Radial_D5_L11_P2.5" H 13700 7750 60  0001 C CNN
+F 3 "" H 13700 7750 60  0001 C CNN
+	1    13700 7750
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -739,7 +739,7 @@ F 3 "" H 13300 6250 60  0001 C CNN
 	1    13300 6250
 	1    0    0    -1  
 $EndComp
-Text Label 12300 6750 0    60   ~ 0
+Text Label 10900 7700 0    60   ~ 0
 PDI
 Text Label 15000 2100 0    60   ~ 0
 UART0_RTS
@@ -749,7 +749,7 @@ Text Label 12750 5600 2    60   ~ 0
 UART0_RTS
 Text Label 12750 5400 2    60   ~ 0
 UART0_CTS
-Text Label 11500 6850 2    60   ~ 0
+Text Label 10400 7800 2    60   ~ 0
 ~RST~
 Text Label 15000 1900 0    60   ~ 0
 UART0_RX
@@ -759,7 +759,7 @@ Text Label 12750 5500 2    60   ~ 0
 UART0_RX
 Text Label 12750 5300 2    60   ~ 0
 UART0_TX
-Text Label 11500 6750 2    60   ~ 0
+Text Label 10400 7700 2    60   ~ 0
 SCK
 Text Label 15000 6550 0    60   ~ 0
 SCK
@@ -768,60 +768,60 @@ SCK
 $Comp
 L VCC #PWR036
 U 1 1 5108708E
-P 9250 1500
-F 0 "#PWR036" H 9250 1600 30  0001 C CNN
-F 1 "VCC" H 9250 1600 30  0000 C CNN
-F 2 "" H 9250 1500 60  0001 C CNN
-F 3 "" H 9250 1500 60  0001 C CNN
-	1    9250 1500
+P 9400 1500
+F 0 "#PWR036" H 9400 1600 30  0001 C CNN
+F 1 "VCC" H 9400 1600 30  0000 C CNN
+F 2 "" H 9400 1500 60  0001 C CNN
+F 3 "" H 9400 1500 60  0001 C CNN
+	1    9400 1500
 	1    0    0    -1  
 $EndComp
-Text Label 8950 1600 2    60   ~ 0
+Text Label 9100 1600 2    60   ~ 0
 SDA
 $Comp
 L R R36
 U 1 1 51087098
-P 9100 1600
-F 0 "R36" H 9175 1550 50  0000 C CNN
-F 1 "1k8" V 9100 1600 40  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" H 9100 1600 60  0001 C CNN
-F 3 "" H 9100 1600 60  0001 C CNN
-	1    9100 1600
+P 9250 1600
+F 0 "R36" H 9325 1550 50  0000 C CNN
+F 1 "1k8" V 9250 1600 40  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 9250 1600 60  0001 C CNN
+F 3 "" H 9250 1600 60  0001 C CNN
+	1    9250 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R39
 U 1 1 510870A5
-P 9400 1600
-F 0 "R39" H 9475 1550 50  0000 C CNN
-F 1 "1k8" V 9400 1600 40  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" H 9400 1600 60  0001 C CNN
-F 3 "" H 9400 1600 60  0001 C CNN
-	1    9400 1600
+P 9550 1600
+F 0 "R39" H 9625 1550 50  0000 C CNN
+F 1 "1k8" V 9550 1600 40  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 9550 1600 60  0001 C CNN
+F 3 "" H 9550 1600 60  0001 C CNN
+	1    9550 1600
 	0    -1   -1   0   
 $EndComp
-Text Label 9550 1600 0    60   ~ 0
+Text Label 9700 1600 0    60   ~ 0
 SCL
 $Comp
-L CONN_5X2 P3
+L CONN_02X05 P3
 U 1 1 510869B1
-P 9250 2750
-F 0 "P3" H 9250 3050 60  0000 C CNN
-F 1 "I2C1" V 9250 2750 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_2x05" H 9250 2750 60  0001 C CNN
-F 3 "" H 9250 2750 60  0001 C CNN
-	1    9250 2750
+P 9400 2750
+F 0 "P3" H 9400 3050 60  0000 C CNN
+F 1 "I2C1" V 9400 2750 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x05" H 9400 2750 60  0001 C CNN
+F 3 "" H 9400 2750 60  0001 C CNN
+	1    9400 2750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR037
 U 1 1 510869BF
-P 8750 3050
-F 0 "#PWR037" H 8750 3050 30  0001 C CNN
-F 1 "GND" H 8750 2980 30  0001 C CNN
-F 2 "" H 8750 3050 60  0001 C CNN
-F 3 "" H 8750 3050 60  0001 C CNN
-	1    8750 3050
+P 9050 3050
+F 0 "#PWR037" H 9050 3050 30  0001 C CNN
+F 1 "GND" H 9050 2980 30  0001 C CNN
+F 2 "" H 9050 3050 60  0001 C CNN
+F 3 "" H 9050 3050 60  0001 C CNN
+	1    9050 3050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -836,14 +836,14 @@ F 3 "" H 9800 2550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_5X2 P2
+L CONN_02X05 P2
 U 1 1 51169D5E
-P 9250 2050
-F 0 "P2" H 9250 2350 60  0000 C CNN
-F 1 "I2C0" V 9250 2050 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_2x05" H 9250 2050 60  0001 C CNN
-F 3 "" H 9250 2050 60  0001 C CNN
-	1    9250 2050
+P 9400 2050
+F 0 "P2" H 9400 2350 60  0000 C CNN
+F 1 "I2C0" V 9400 2050 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x05" H 9400 2050 60  0001 C CNN
+F 3 "" H 9400 2050 60  0001 C CNN
+	1    9400 2050
 	1    0    0    -1  
 $EndComp
 Text Label 9950 2150 0    60   ~ 0
@@ -851,12 +851,12 @@ SDA
 $Comp
 L GND #PWR039
 U 1 1 51169D65
-P 8750 2350
-F 0 "#PWR039" H 8750 2350 30  0001 C CNN
-F 1 "GND" H 8750 2280 30  0001 C CNN
-F 2 "" H 8750 2350 60  0001 C CNN
-F 3 "" H 8750 2350 60  0001 C CNN
-	1    8750 2350
+P 9050 2350
+F 0 "#PWR039" H 9050 2350 30  0001 C CNN
+F 1 "GND" H 9050 2280 30  0001 C CNN
+F 2 "" H 9050 2350 60  0001 C CNN
+F 3 "" H 9050 2350 60  0001 C CNN
+	1    9050 2350
 	1    0    0    -1  
 $EndComp
 Text Label 9950 2050 0    60   ~ 0
@@ -988,25 +988,25 @@ LED A
 Text Label 3050 3150 2    60   ~ 0
 LED C
 $Comp
-L CONN_5X2 P4
+L CONN_02X05 P4
 U 1 1 5117A1B2
-P 9250 3450
-F 0 "P4" H 9250 3750 60  0000 C CNN
-F 1 "I2C2" V 9250 3450 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_2x05" H 9250 3450 60  0001 C CNN
-F 3 "" H 9250 3450 60  0001 C CNN
-	1    9250 3450
+P 9400 3450
+F 0 "P4" H 9400 3750 60  0000 C CNN
+F 1 "I2C2" V 9400 3450 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x05" H 9400 3450 60  0001 C CNN
+F 3 "" H 9400 3450 60  0001 C CNN
+	1    9400 3450
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR045
 U 1 1 5117A1B9
-P 8750 3750
-F 0 "#PWR045" H 8750 3750 30  0001 C CNN
-F 1 "GND" H 8750 3680 30  0001 C CNN
-F 2 "" H 8750 3750 60  0001 C CNN
-F 3 "" H 8750 3750 60  0001 C CNN
-	1    8750 3750
+P 9050 3750
+F 0 "#PWR045" H 9050 3750 30  0001 C CNN
+F 1 "GND" H 9050 3680 30  0001 C CNN
+F 2 "" H 9050 3750 60  0001 C CNN
+F 3 "" H 9050 3750 60  0001 C CNN
+	1    9050 3750
 	1    0    0    -1  
 $EndComp
 Text Label 3050 3550 2    60   ~ 0
@@ -1045,7 +1045,7 @@ F 3 "" H 2250 4800 60  0001 C CNN
 $EndComp
 Text Label 2250 4050 1    60   ~ 0
 PDI
-Text Label 11500 6650 2    60   ~ 0
+Text Label 10400 7600 2    60   ~ 0
 PDO
 Text Label 2400 4050 1    60   ~ 0
 PDO
@@ -1197,23 +1197,23 @@ $EndComp
 $Comp
 L VCC #PWR049
 U 1 1 513688FA
-P 7550 4600
-F 0 "#PWR049" H 7550 4700 30  0001 C CNN
-F 1 "VCC" H 7550 4700 30  0000 C CNN
-F 2 "" H 7550 4600 60  0001 C CNN
-F 3 "" H 7550 4600 60  0001 C CNN
-	1    7550 4600
+P 7850 4600
+F 0 "#PWR049" H 7850 4700 30  0001 C CNN
+F 1 "VCC" H 7850 4700 30  0000 C CNN
+F 2 "" H 7850 4600 60  0001 C CNN
+F 3 "" H 7850 4600 60  0001 C CNN
+	1    7850 4600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR050
 U 1 1 51368A46
-P 7650 5500
-F 0 "#PWR050" H 7650 5500 30  0001 C CNN
-F 1 "GND" H 7650 5430 30  0001 C CNN
-F 2 "" H 7650 5500 60  0001 C CNN
-F 3 "" H 7650 5500 60  0001 C CNN
-	1    7650 5500
+P 7950 5500
+F 0 "#PWR050" H 7950 5500 30  0001 C CNN
+F 1 "GND" H 7950 5430 30  0001 C CNN
+F 2 "" H 7950 5500 60  0001 C CNN
+F 3 "" H 7950 5500 60  0001 C CNN
+	1    7950 5500
 	1    0    0    -1  
 $EndComp
 Text Label 6250 1950 0    60   ~ 0
@@ -1221,14 +1221,14 @@ DIGITAL_2
 Text Label 6250 2050 0    60   ~ 0
 DIGITAL_3
 $Comp
-L CONN_8X2 P1
+L CONN_02X08 P1
 U 1 1 51369C61
-P 8150 5050
-F 0 "P1" H 8150 5500 60  0000 C CNN
-F 1 "SENSOR" V 8150 5050 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_2x08" H 8150 5050 60  0001 C CNN
-F 3 "" H 8150 5050 60  0001 C CNN
-	1    8150 5050
+P 8300 5050
+F 0 "P1" H 8300 5500 60  0000 C CNN
+F 1 "SENSOR" V 8300 5050 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x08" H 8300 5050 60  0001 C CNN
+F 3 "" H 8300 5050 60  0001 C CNN
+	1    8300 5050
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1415,47 +1415,47 @@ $EndComp
 $Comp
 L JUMPER3 JP1
 U 1 1 5136DEA7
-P 11400 8950
-F 0 "JP1" H 11450 8850 40  0000 L CNN
-F 1 "1-2 FLASH EN" H 11400 9050 40  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x03" H 11400 8950 60  0001 C CNN
-F 3 "" H 11400 8950 60  0001 C CNN
-	1    11400 8950
+P 11400 9150
+F 0 "JP1" H 11450 9050 40  0000 L CNN
+F 1 "1-2 FLASH EN" H 11400 9250 40  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x03" H 11400 9150 60  0001 C CNN
+F 3 "" H 11400 9150 60  0001 C CNN
+	1    11400 9150
 	0    1    1    0   
 $EndComp
-Text Label 11300 8700 2    60   ~ 0
+Text Label 11300 8900 2    60   ~ 0
 ~FLASH_EN~
 $Comp
 L R R60
 U 1 1 5136DEB5
-P 11400 8550
-F 0 "R60" H 11475 8500 50  0000 C CNN
-F 1 "10k" V 11400 8550 40  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" H 11400 8550 60  0001 C CNN
-F 3 "" H 11400 8550 60  0001 C CNN
-	1    11400 8550
+P 11400 8750
+F 0 "R60" H 11475 8700 50  0000 C CNN
+F 1 "10k" V 11400 8750 40  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" H 11400 8750 60  0001 C CNN
+F 3 "" H 11400 8750 60  0001 C CNN
+	1    11400 8750
 	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR052
 U 1 1 5136E048
-P 11300 9300
-F 0 "#PWR052" H 11300 9300 30  0001 C CNN
-F 1 "GND" H 11300 9230 30  0001 C CNN
-F 2 "" H 11300 9300 60  0001 C CNN
-F 3 "" H 11300 9300 60  0001 C CNN
-	1    11300 9300
+P 11300 9500
+F 0 "#PWR052" H 11300 9500 30  0001 C CNN
+F 1 "GND" H 11300 9430 30  0001 C CNN
+F 2 "" H 11300 9500 60  0001 C CNN
+F 3 "" H 11300 9500 60  0001 C CNN
+	1    11300 9500
 	1    0    0    -1  
 $EndComp
 $Comp
 L VCC #PWR053
 U 1 1 5136E316
-P 11400 8400
-F 0 "#PWR053" H 11400 8500 30  0001 C CNN
-F 1 "VCC" H 11400 8500 30  0000 C CNN
-F 2 "" H 11400 8400 60  0001 C CNN
-F 3 "" H 11400 8400 60  0001 C CNN
-	1    11400 8400
+P 11400 8600
+F 0 "#PWR053" H 11400 8700 30  0001 C CNN
+F 1 "VCC" H 11400 8700 30  0000 C CNN
+F 2 "" H 11400 8600 60  0001 C CNN
+F 3 "" H 11400 8600 60  0001 C CNN
+	1    11400 8600
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1637,25 +1637,25 @@ $EndComp
 $Comp
 L VCC #PWR055
 U 1 1 513FD79F
-P 8950 4250
-F 0 "#PWR055" H 8950 4350 30  0001 C CNN
-F 1 "VCC" H 8950 4350 30  0000 C CNN
-F 2 "" H 8950 4250 60  0001 C CNN
-F 3 "" H 8950 4250 60  0001 C CNN
-	1    8950 4250
+P 9250 4250
+F 0 "#PWR055" H 9250 4350 30  0001 C CNN
+F 1 "VCC" H 9250 4350 30  0000 C CNN
+F 2 "" H 9250 4250 60  0001 C CNN
+F 3 "" H 9250 4250 60  0001 C CNN
+	1    9250 4250
 	1    0    0    -1  
 $EndComp
-Text Label 11900 8700 2    60   ~ 0
+Text Label 11900 8900 2    60   ~ 0
 ~RST~
 $Comp
 L GND #PWR056
 U 1 1 513FEF93
-P 12000 9300
-F 0 "#PWR056" H 12000 9300 30  0001 C CNN
-F 1 "GND" H 12000 9230 30  0001 C CNN
-F 2 "" H 12000 9300 60  0001 C CNN
-F 3 "" H 12000 9300 60  0001 C CNN
-	1    12000 9300
+P 12000 9500
+F 0 "#PWR056" H 12000 9500 30  0001 C CNN
+F 1 "GND" H 12000 9430 30  0001 C CNN
+F 2 "" H 12000 9500 60  0001 C CNN
+F 3 "" H 12000 9500 60  0001 C CNN
+	1    12000 9500
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -1694,12 +1694,12 @@ $EndComp
 $Comp
 L JUMPER JP2
 U 1 1 5148AD0E
-P 12000 9000
-F 0 "JP2" H 12050 8900 40  0000 L CNN
-F 1 "RESET" H 12000 9100 40  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x03" H 12000 9000 60  0001 C CNN
-F 3 "" H 12000 9000 60  0001 C CNN
-	1    12000 9000
+P 12000 9200
+F 0 "JP2" H 12050 9100 40  0000 L CNN
+F 1 "RESET" H 12000 9300 40  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x03" H 12000 9200 60  0001 C CNN
+F 3 "" H 12000 9200 60  0001 C CNN
+	1    12000 9200
 	0    1    1    0   
 $EndComp
 $Comp
@@ -1824,69 +1824,69 @@ F 3 "" H 9800 3250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_2 P9
+L CONN_01X02 P9
 U 1 1 51699FA8
-P 13750 8250
-F 0 "P9" V 13700 8250 40  0000 C CNN
-F 1 "5V" V 13800 8250 40  0000 C CNN
-F 2 "matemat:Bornier_B2_Phoenix" H 13750 8250 60  0001 C CNN
-F 3 "" H 13750 8250 60  0000 C CNN
-	1    13750 8250
+P 13350 8100
+F 0 "P9" V 13300 8100 40  0000 C CNN
+F 1 "5V" V 13400 8100 40  0000 C CNN
+F 2 "matemat:Bornier_B2_Phoenix" H 13350 8100 60  0001 C CNN
+F 3 "" H 13350 8100 60  0000 C CNN
+	1    13350 8100
 	0    1    1    0   
 $EndComp
 $Comp
-L CONN_2 P8
+L CONN_01X02 P8
 U 1 1 51699FB5
-P 13350 8250
-F 0 "P8" V 13300 8250 40  0000 C CNN
-F 1 "12V" V 13400 8250 40  0000 C CNN
-F 2 "matemat:Bornier_B2_Phoenix" H 13350 8250 60  0001 C CNN
-F 3 "" H 13350 8250 60  0000 C CNN
-	1    13350 8250
+P 12450 8100
+F 0 "P8" V 12400 8100 40  0000 C CNN
+F 1 "12V" V 12500 8100 40  0000 C CNN
+F 2 "matemat:Bornier_B2_Phoenix" H 12450 8100 60  0001 C CNN
+F 3 "" H 12450 8100 60  0000 C CNN
+	1    12450 8100
 	0    -1   1    0   
 $EndComp
 $Comp
 L +12V #PWR059
 U 1 1 5169A1D5
-P 13050 7550
-F 0 "#PWR059" H 13050 7500 20  0001 C CNN
-F 1 "+12V" H 13050 7700 50  0000 C CNN
-F 2 "" H 13050 7550 60  0001 C CNN
-F 3 "" H 13050 7550 60  0001 C CNN
-	1    13050 7550
+P 12100 7550
+F 0 "#PWR059" H 12100 7500 20  0001 C CNN
+F 1 "+12V" H 12100 7700 50  0000 C CNN
+F 2 "" H 12100 7550 60  0001 C CNN
+F 3 "" H 12100 7550 60  0001 C CNN
+	1    12100 7550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C32
 U 1 1 5169A1EA
-P 13050 7750
-F 0 "C32" H 13125 7850 50  0000 C CNN
-F 1 "10u" H 13150 7650 50  0000 C CNN
-F 2 "Capacitors_ThroughHole:C_Radial_D5_L11_P2.5" H 13050 7750 60  0001 C CNN
-F 3 "" H 13050 7750 60  0001 C CNN
-	1    13050 7750
+P 12100 7750
+F 0 "C32" H 12175 7850 50  0000 C CNN
+F 1 "10u" H 12200 7650 50  0000 C CNN
+F 2 "Capacitors_ThroughHole:C_Radial_D5_L11_P2.5" H 12100 7750 60  0001 C CNN
+F 3 "" H 12100 7750 60  0001 C CNN
+	1    12100 7750
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C31
 U 1 1 5169A1F0
-P 12750 7750
-F 0 "C31" H 12825 7850 50  0000 C CNN
-F 1 "100n" H 12850 7650 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 12750 7750 60  0001 C CNN
-F 3 "" H 12750 7750 60  0001 C CNN
-	1    12750 7750
+P 11800 7750
+F 0 "C31" H 11875 7850 50  0000 C CNN
+F 1 "100n" H 11900 7650 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 11800 7750 60  0001 C CNN
+F 3 "" H 11800 7750 60  0001 C CNN
+	1    11800 7750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR060
 U 1 1 5169AB07
-P 13050 8000
-F 0 "#PWR060" H 13050 8000 30  0001 C CNN
-F 1 "GND" H 13050 7930 30  0001 C CNN
-F 2 "" H 13050 8000 60  0001 C CNN
-F 3 "" H 13050 8000 60  0001 C CNN
-	1    13050 8000
+P 12100 8000
+F 0 "#PWR060" H 12100 8000 30  0001 C CNN
+F 1 "GND" H 12100 7930 30  0001 C CNN
+F 2 "" H 12100 8000 60  0001 C CNN
+F 3 "" H 12100 8000 60  0001 C CNN
+	1    12100 8000
 	1    0    0    -1  
 $EndComp
 Text Label 12300 2700 0    60   ~ 0
@@ -2467,37 +2467,65 @@ F 3 "" H 7800 6450 60  0001 C CNN
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	12250 1800 12250 2600
+	12250 1800 12250 2400
+Wire Wire Line
+	12250 2400 12250 2600
 Wire Wire Line
 	12250 2600 12700 2600
 Wire Wire Line
-	13000 8950 13900 8950
+	12900 9400 13200 9400
+Wire Wire Line
+	13200 9400 13500 9400
+Wire Wire Line
+	13500 9400 13800 9400
 Wire Wire Line
 	2400 4550 3200 4550
 Wire Wire Line
 	3200 6200 3200 7700
 Wire Wire Line
-	8950 4300 10350 4300
+	8950 4300 9150 4300
+Wire Wire Line
+	9150 4300 9350 4300
+Wire Wire Line
+	9350 4300 9550 4300
+Wire Wire Line
+	9550 4300 9750 4300
+Wire Wire Line
+	9750 4300 9950 4300
+Wire Wire Line
+	9950 4300 10150 4300
+Wire Wire Line
+	10150 4300 10350 4300
 Wire Wire Line
 	8950 4300 8950 4250
 Connection ~ 9150 5800
 Connection ~ 9150 5300
 Wire Wire Line
-	9150 4600 9150 5500
+	9150 4600 9150 5300
+Wire Wire Line
+	9150 5300 9150 5500
 Wire Wire Line
 	2250 4450 3200 4450
 Connection ~ 2400 4550
 Wire Wire Line
-	2400 4350 2400 4650
+	2400 4350 2400 4550
 Wire Wire Line
-	2250 4350 2250 4650
+	2400 4550 2400 4650
+Wire Wire Line
+	2250 4350 2250 4450
+Wire Wire Line
+	2250 4450 2250 4650
 Connection ~ 4200 9650
 Wire Wire Line
-	4200 9650 4200 10350
+	4200 9650 4200 9850
+Wire Wire Line
+	4200 9850 4200 10350
 Connection ~ 4200 9850
 Connection ~ 4100 10250
 Wire Wire Line
-	2800 7400 4100 7400
+	2800 7400 3400 7400
+Wire Wire Line
+	3400 7400 4100 7400
 Wire Wire Line
 	4100 7400 4100 10250
 Wire Wire Line
@@ -2510,7 +2538,7 @@ Wire Wire Line
 Wire Wire Line
 	4600 9750 4600 9450
 Wire Wire Line
-	11400 8700 11300 8700
+	11400 8900 11300 8900
 Connection ~ 10150 4300
 Connection ~ 9950 4300
 Connection ~ 9350 4300
@@ -2519,9 +2547,13 @@ Connection ~ 9550 4300
 Connection ~ 9150 4300
 Connection ~ 8950 4300
 Wire Wire Line
-	10150 4600 10150 5500
+	10150 4600 10150 4800
 Wire Wire Line
-	10350 4600 10350 5500
+	10150 4800 10150 5500
+Wire Wire Line
+	10350 4600 10350 4700
+Wire Wire Line
+	10350 4700 10350 5500
 Connection ~ 10150 5800
 Connection ~ 9950 5800
 Connection ~ 9750 5800
@@ -2529,7 +2561,19 @@ Connection ~ 9550 5800
 Connection ~ 9350 5800
 Connection ~ 8950 5800
 Wire Wire Line
-	8950 5800 10350 5800
+	8950 5800 9150 5800
+Wire Wire Line
+	9150 5800 9350 5800
+Wire Wire Line
+	9350 5800 9550 5800
+Wire Wire Line
+	9550 5800 9750 5800
+Wire Wire Line
+	9750 5800 9950 5800
+Wire Wire Line
+	9950 5800 10150 5800
+Wire Wire Line
+	10150 5800 10350 5800
 Connection ~ 10350 4700
 Connection ~ 10150 4800
 Connection ~ 9950 4900
@@ -2538,57 +2582,95 @@ Connection ~ 9550 5100
 Connection ~ 9350 5200
 Connection ~ 8950 5400
 Wire Wire Line
-	8850 4700 10450 4700
+	8850 4700 10350 4700
 Wire Wire Line
-	8850 4800 10450 4800
+	10350 4700 10450 4700
 Wire Wire Line
-	9950 4600 9950 5500
+	8850 4800 10150 4800
 Wire Wire Line
-	8850 4900 10450 4900
+	10150 4800 10450 4800
 Wire Wire Line
-	9750 4600 9750 5500
+	9950 4600 9950 4900
 Wire Wire Line
-	8850 5000 10450 5000
+	9950 4900 9950 5500
 Wire Wire Line
-	9550 4600 9550 5500
+	8850 4900 9950 4900
 Wire Wire Line
-	8850 5100 10450 5100
+	9950 4900 10450 4900
 Wire Wire Line
-	9350 4600 9350 5500
+	9750 4600 9750 5000
 Wire Wire Line
-	8850 5200 10450 5200
+	9750 5000 9750 5500
 Wire Wire Line
-	8850 5300 10450 5300
+	8850 5000 9750 5000
 Wire Wire Line
-	8950 4600 8950 5500
+	9750 5000 10450 5000
 Wire Wire Line
-	8850 5400 10450 5400
-Connection ~ 7650 5400
+	9550 4600 9550 5100
 Wire Wire Line
-	7650 5400 7750 5400
-Connection ~ 7650 5200
+	9550 5100 9550 5500
 Wire Wire Line
-	7650 5200 7750 5200
-Connection ~ 7650 5000
+	8850 5100 9550 5100
 Wire Wire Line
-	7750 5000 7650 5000
+	9550 5100 10450 5100
 Wire Wire Line
-	7650 4800 7750 4800
+	9350 4600 9350 5200
 Wire Wire Line
-	7650 4800 7650 5500
-Connection ~ 7550 5100
+	9350 5200 9350 5500
 Wire Wire Line
-	7550 5100 7750 5100
-Connection ~ 7550 4900
+	8850 5200 9350 5200
 Wire Wire Line
-	7550 4900 7750 4900
-Connection ~ 7550 4700
+	9350 5200 10450 5200
 Wire Wire Line
-	7550 4700 7750 4700
+	8850 5300 9150 5300
 Wire Wire Line
-	7550 5300 7750 5300
+	9150 5300 10450 5300
 Wire Wire Line
-	7550 4600 7550 5300
+	8950 4600 8950 5400
+Wire Wire Line
+	8950 5400 8950 5500
+Wire Wire Line
+	8850 5400 8950 5400
+Wire Wire Line
+	8950 5400 10450 5400
+Connection ~ 7950 5400
+Wire Wire Line
+	7950 5400 8050 5400
+Connection ~ 7950 5200
+Wire Wire Line
+	7950 5200 8050 5200
+Connection ~ 7950 5000
+Wire Wire Line
+	8050 5000 7950 5000
+Wire Wire Line
+	7950 4800 8050 4800
+Wire Wire Line
+	7950 4800 7950 5000
+Wire Wire Line
+	7950 5000 7950 5200
+Wire Wire Line
+	7950 5200 7950 5400
+Wire Wire Line
+	7950 5400 7950 5500
+Connection ~ 7850 5100
+Wire Wire Line
+	7850 5100 8050 5100
+Connection ~ 7850 4900
+Wire Wire Line
+	7850 4900 8050 4900
+Connection ~ 7850 4700
+Wire Wire Line
+	7850 4700 8050 4700
+Wire Wire Line
+	7850 5300 8050 5300
+Wire Wire Line
+	7850 4600 7850 4700
+Wire Wire Line
+	7850 4700 7850 4900
+Wire Wire Line
+	7850 4900 7850 5100
+Wire Wire Line
+	7850 5100 7850 5300
 Wire Wire Line
 	5800 2050 6250 2050
 Wire Wire Line
@@ -2659,22 +2741,26 @@ Wire Wire Line
 	3200 4850 3050 4850
 Wire Wire Line
 	9650 3350 9650 3250
-Connection ~ 8850 3450
-Connection ~ 8850 3550
-Connection ~ 8850 3350
+Connection ~ 9150 3450
+Connection ~ 9150 3550
+Connection ~ 9150 3350
 Connection ~ 9650 3250
 Wire Wire Line
-	8850 3550 8750 3550
+	9150 3550 9050 3550
 Wire Wire Line
-	8850 3750 8850 3650
+	9150 3750 9150 3650
 Wire Wire Line
-	9650 3750 8850 3750
+	9650 3750 9150 3750
 Wire Wire Line
 	9650 3650 9650 3750
 Wire Wire Line
-	8750 3550 8750 3750
+	9050 3550 9050 3750
 Wire Wire Line
-	8850 3250 8850 3550
+	9150 3250 9150 3350
+Wire Wire Line
+	9150 3350 9150 3450
+Wire Wire Line
+	9150 3450 9150 3550
 Wire Wire Line
 	2400 2750 3200 2750
 Connection ~ 3400 9850
@@ -2684,17 +2770,25 @@ Wire Wire Line
 Wire Wire Line
 	3400 9550 3100 9550
 Wire Wire Line
-	3400 9650 4700 9650
+	3400 9650 4200 9650
+Wire Wire Line
+	4200 9650 4700 9650
 Wire Wire Line
 	3100 10350 3850 10350
 Wire Wire Line
-	3100 10250 5000 10250
+	3100 10250 4100 10250
+Wire Wire Line
+	4100 10250 5000 10250
 Wire Wire Line
 	3100 10150 3650 10150
 Wire Wire Line
-	3100 10050 5000 10050
+	3100 10050 4500 10050
 Wire Wire Line
-	3850 10150 5000 10150
+	4500 10050 5000 10050
+Wire Wire Line
+	3850 10150 4000 10150
+Wire Wire Line
+	4000 10150 5000 10150
 Wire Wire Line
 	3850 10350 3850 10150
 Wire Wire Line
@@ -2704,7 +2798,13 @@ Wire Wire Line
 Connection ~ 3400 9350
 Connection ~ 3400 9550
 Wire Wire Line
-	3400 8950 3400 9850
+	3400 8950 3400 9350
+Wire Wire Line
+	3400 9350 3400 9550
+Wire Wire Line
+	3400 9550 3400 9650
+Wire Wire Line
+	3400 9650 3400 9850
 Wire Wire Line
 	3050 4750 3200 4750
 Wire Wire Line
@@ -2714,47 +2814,55 @@ Wire Wire Line
 Connection ~ 1950 7100
 Wire Wire Line
 	9650 1950 9650 1850
-Connection ~ 8850 2050
-Connection ~ 8850 2150
-Connection ~ 8850 1950
+Connection ~ 9150 2050
+Connection ~ 9150 2150
+Connection ~ 9150 1950
 Connection ~ 9650 1850
 Wire Wire Line
-	8850 2150 8750 2150
+	9150 2150 9050 2150
 Wire Wire Line
-	8850 2350 8850 2250
+	9150 2350 9150 2250
 Wire Wire Line
-	9650 2350 8850 2350
+	9650 2350 9150 2350
 Wire Wire Line
 	9650 2250 9650 2350
 Wire Wire Line
 	9650 1850 9800 1850
 Wire Wire Line
-	8750 2150 8750 2350
+	9050 2150 9050 2350
 Wire Wire Line
-	8850 1850 8850 2150
+	9150 1850 9150 1950
+Wire Wire Line
+	9150 1950 9150 2050
+Wire Wire Line
+	9150 2050 9150 2150
 Wire Wire Line
 	9650 2650 9650 2550
-Connection ~ 8850 2750
-Connection ~ 8850 2850
-Connection ~ 8850 2650
+Connection ~ 9150 2750
+Connection ~ 9150 2850
+Connection ~ 9150 2650
 Connection ~ 9650 2550
 Wire Wire Line
-	8850 2850 8750 2850
+	9150 2850 9050 2850
 Wire Wire Line
-	8850 3050 8850 2950
+	9150 3050 9150 2950
 Wire Wire Line
-	9650 3050 8850 3050
+	9650 3050 9150 3050
 Wire Wire Line
 	9650 2950 9650 3050
 Wire Wire Line
 	9650 2550 9800 2550
 Wire Wire Line
-	8750 2850 8750 3050
+	9050 2850 9050 3050
 Wire Wire Line
-	8850 2550 8850 2850
-Connection ~ 9250 1600
+	9150 2550 9150 2650
 Wire Wire Line
-	9250 1600 9250 1500
+	9150 2650 9150 2750
+Wire Wire Line
+	9150 2750 9150 2850
+Connection ~ 9400 1600
+Wire Wire Line
+	9400 1600 9400 1500
 Wire Wire Line
 	14750 6550 15000 6550
 Wire Wire Line
@@ -2764,10 +2872,12 @@ Wire Wire Line
 Wire Wire Line
 	14850 6450 14850 6250
 Wire Wire Line
-	14050 7900 14050 8000
-Connection ~ 14050 7900
+	13700 7900 13700 8000
+Connection ~ 13700 7900
 Wire Wire Line
-	13650 7600 14350 7600
+	13300 7600 13700 7600
+Wire Wire Line
+	13700 7600 14000 7600
 Wire Wire Line
 	2500 2200 2500 2500
 Wire Wire Line
@@ -2782,11 +2892,15 @@ Wire Wire Line
 	3200 1750 3050 1750
 Connection ~ 4250 1450
 Wire Wire Line
-	4250 1150 4250 1450
+	4250 1150 4250 1250
+Wire Wire Line
+	4250 1250 4250 1450
 Connection ~ 4350 5450
 Connection ~ 4250 5450
 Wire Wire Line
-	4250 5450 4650 5450
+	4250 5450 4350 5450
+Wire Wire Line
+	4350 5450 4650 5450
 Wire Wire Line
 	13300 6550 13450 6550
 Wire Wire Line
@@ -2797,8 +2911,8 @@ Wire Wire Line
 	15000 7050 14750 7050
 Wire Wire Line
 	15000 6850 14750 6850
-Connection ~ 13600 8950
-Connection ~ 13000 8950
+Connection ~ 13500 9400
+Connection ~ 12900 9400
 Connection ~ 1600 7800
 Wire Wire Line
 	1600 7800 1600 8000
@@ -2807,11 +2921,19 @@ Wire Wire Line
 Wire Wire Line
 	1050 5900 1650 5900
 Wire Wire Line
-	1050 7800 1700 7800
+	1050 7800 1600 7800
 Wire Wire Line
-	2250 6900 2250 7100
+	1600 7800 1700 7800
 Wire Wire Line
-	2700 8000 4000 8000
+	2250 6900 2250 7000
+Wire Wire Line
+	2250 7000 2250 7100
+Wire Wire Line
+	2700 8000 3000 8000
+Wire Wire Line
+	3000 8000 3400 8000
+Wire Wire Line
+	3400 8000 4000 8000
 Wire Wire Line
 	3000 8000 3000 5900
 Wire Wire Line
@@ -2826,9 +2948,13 @@ Connection ~ 6100 4650
 Wire Wire Line
 	6100 4650 6100 5050
 Wire Wire Line
-	5800 4750 6250 4750
+	5800 4750 6000 4750
 Wire Wire Line
-	5800 4650 6250 4650
+	6000 4750 6250 4750
+Wire Wire Line
+	5800 4650 6100 4650
+Wire Wire Line
+	6100 4650 6250 4650
 Wire Wire Line
 	6250 4450 5800 4450
 Wire Wire Line
@@ -2875,7 +3001,9 @@ Wire Wire Line
 Wire Wire Line
 	2800 7800 2700 7800
 Wire Wire Line
-	2800 6500 2800 7800
+	2800 6500 2800 7400
+Wire Wire Line
+	2800 7400 2800 7800
 Wire Wire Line
 	1050 8200 1700 8200
 Wire Wire Line
@@ -2887,8 +3015,8 @@ Wire Wire Line
 Wire Wire Line
 	2800 6500 2550 6500
 Wire Wire Line
-	13000 8950 13000 9050
-Connection ~ 13300 8950
+	12900 9400 12900 9500
+Connection ~ 13200 9400
 Wire Wire Line
 	15000 6950 14750 6950
 Wire Wire Line
@@ -2928,7 +3056,13 @@ Wire Wire Line
 Connection ~ 14650 4600
 Connection ~ 14650 4900
 Wire Wire Line
-	14650 4200 14650 5100
+	14650 4200 14650 4600
+Wire Wire Line
+	14650 4600 14650 4800
+Wire Wire Line
+	14650 4800 14650 4900
+Wire Wire Line
+	14650 4900 14650 5100
 Connection ~ 14250 3800
 Wire Wire Line
 	12450 1450 12450 1550
@@ -2939,27 +3073,41 @@ Connection ~ 12450 1550
 Connection ~ 12950 1850
 Connection ~ 12700 1850
 Wire Wire Line
-	13150 1550 13150 1950
+	13150 1550 13150 1850
+Wire Wire Line
+	13150 1850 13150 1950
 Wire Wire Line
 	12950 1850 12950 1950
 Wire Wire Line
-	12450 1850 12950 1850
+	12450 1850 12700 1850
 Wire Wire Line
-	12450 1550 13150 1550
+	12700 1850 12950 1850
+Wire Wire Line
+	12450 1550 12700 1550
+Wire Wire Line
+	12700 1550 12950 1550
+Wire Wire Line
+	12950 1550 13150 1550
 Wire Wire Line
 	13150 2600 13000 2600
 Connection ~ 13000 2600
 Wire Wire Line
-	12300 6850 12300 6950
+	10900 7800 10900 7900
 Connection ~ 13800 3800
 Connection ~ 13950 3800
 Connection ~ 14100 3800
 Wire Wire Line
-	13800 3800 14400 3800
+	13800 3800 13950 3800
+Wire Wire Line
+	13950 3800 14100 3800
+Wire Wire Line
+	14100 3800 14250 3800
+Wire Wire Line
+	14250 3800 14400 3800
 Wire Wire Line
 	13800 3800 13800 3900
 Wire Wire Line
-	12300 6650 12300 6550
+	10900 7600 10900 7500
 Connection ~ 2500 2500
 Wire Wire Line
 	11800 1800 12250 1800
@@ -2971,13 +3119,17 @@ Wire Wire Line
 Wire Wire Line
 	11800 2100 11900 2100
 Wire Wire Line
-	11900 2100 11900 3000
+	11900 2100 11900 2800
+Wire Wire Line
+	11900 2800 11900 3000
 Wire Wire Line
 	11800 2800 11900 2800
 Connection ~ 11900 2800
 Connection ~ 11900 3000
 Wire Wire Line
-	12100 1900 12100 2500
+	12100 1900 12100 2200
+Wire Wire Line
+	12100 2200 12100 2500
 Wire Wire Line
 	12100 1900 11800 1900
 Wire Wire Line
@@ -2987,24 +3139,30 @@ Wire Wire Line
 Wire Wire Line
 	9650 3250 9800 3250
 Wire Wire Line
-	13650 7600 13650 7900
+	13300 7600 13300 7900
 Wire Wire Line
-	12750 7600 13450 7600
+	11800 7600 12100 7600
 Wire Wire Line
-	13450 7600 13450 7900
+	12100 7600 12500 7600
 Wire Wire Line
-	13050 7900 13050 8000
+	12500 7600 12500 7900
 Wire Wire Line
-	14050 7600 14050 7550
-Connection ~ 14050 7600
+	12100 7900 12100 8000
 Wire Wire Line
-	13050 7600 13050 7550
-Connection ~ 13050 7600
+	13700 7600 13700 7550
+Connection ~ 13700 7600
 Wire Wire Line
-	12750 7900 13250 7900
+	12100 7600 12100 7550
+Connection ~ 12100 7600
 Wire Wire Line
-	13850 7900 14350 7900
-Connection ~ 13050 7900
+	11800 7900 12100 7900
+Wire Wire Line
+	12100 7900 12400 7900
+Wire Wire Line
+	13400 7900 13700 7900
+Wire Wire Line
+	13700 7900 14000 7900
+Connection ~ 12100 7900
 Wire Wire Line
 	13450 6350 13300 6350
 Wire Wire Line
@@ -3017,7 +3175,9 @@ Connection ~ 12100 2200
 Wire Wire Line
 	12100 2200 13150 2200
 Wire Wire Line
-	12000 2000 12000 2600
+	12000 2000 12000 2300
+Wire Wire Line
+	12000 2300 12000 2600
 Connection ~ 12000 2300
 Wire Wire Line
 	15500 8350 15500 8450
@@ -3032,12 +3192,16 @@ Wire Wire Line
 Wire Wire Line
 	15700 8850 15700 9050
 Wire Wire Line
-	2800 2500 3200 2500
+	2800 2500 2900 2500
 Wire Wire Line
-	2800 2200 3200 2200
+	2900 2500 3200 2500
+Wire Wire Line
+	2800 2200 2900 2200
+Wire Wire Line
+	2900 2200 3200 2200
 Connection ~ 2900 2200
 Connection ~ 2900 2500
-Connection ~ 11400 8700
+Connection ~ 11400 8900
 Connection ~ 2250 7000
 Wire Wire Line
 	3200 7700 3400 7700
@@ -3077,9 +3241,13 @@ Wire Wire Line
 	3950 1250 3950 1450
 Connection ~ 3950 1450
 Wire Wire Line
-	8800 8700 8800 6900
+	8800 8700 8800 7800
 Wire Wire Line
-	7700 6900 8900 6900
+	8800 7800 8800 6900
+Wire Wire Line
+	7700 6900 8800 6900
+Wire Wire Line
+	8800 6900 8900 6900
 Wire Wire Line
 	8900 7800 8800 7800
 Connection ~ 8800 7800
@@ -3088,17 +3256,29 @@ Wire Wire Line
 Wire Wire Line
 	8700 7700 8700 6300
 Wire Wire Line
-	7700 6700 8900 6700
+	7700 6700 8000 6700
 Wire Wire Line
-	7700 6800 8900 6800
+	8000 6700 8900 6700
 Wire Wire Line
-	7700 7000 8900 7000
+	7700 6800 8100 6800
 Wire Wire Line
-	7700 7200 8900 7200
+	8100 6800 8900 6800
 Wire Wire Line
-	7700 7300 8900 7300
+	7700 7000 8200 7000
 Wire Wire Line
-	7700 7500 8900 7500
+	8200 7000 8900 7000
+Wire Wire Line
+	7700 7200 8300 7200
+Wire Wire Line
+	8300 7200 8900 7200
+Wire Wire Line
+	7700 7300 8400 7300
+Wire Wire Line
+	8400 7300 8900 7300
+Wire Wire Line
+	7700 7500 8500 7500
+Wire Wire Line
+	8500 7500 8900 7500
 Wire Wire Line
 	8000 6600 8000 6700
 Connection ~ 8000 6700
@@ -3118,7 +3298,21 @@ Wire Wire Line
 	8500 6600 8500 7500
 Connection ~ 8500 7500
 Wire Wire Line
-	7800 6300 8600 6300
+	7800 6300 7900 6300
+Wire Wire Line
+	7900 6300 8000 6300
+Wire Wire Line
+	8000 6300 8100 6300
+Wire Wire Line
+	8100 6300 8200 6300
+Wire Wire Line
+	8200 6300 8300 6300
+Wire Wire Line
+	8300 6300 8400 6300
+Wire Wire Line
+	8400 6300 8500 6300
+Wire Wire Line
+	8500 6300 8600 6300
 Connection ~ 8500 6300
 Connection ~ 8400 6300
 Connection ~ 8300 6300
@@ -3126,9 +3320,13 @@ Connection ~ 8200 6300
 Connection ~ 8100 6300
 Connection ~ 8800 6900
 Wire Wire Line
-	7700 7400 8900 7400
+	7700 7400 7800 7400
 Wire Wire Line
-	7700 7600 8900 7600
+	7800 7400 8900 7400
+Wire Wire Line
+	7700 7600 7900 7600
+Wire Wire Line
+	7900 7600 8900 7600
 Wire Wire Line
 	7900 7900 8900 7900
 Wire Wire Line
@@ -3140,7 +3338,19 @@ Wire Wire Line
 Wire Wire Line
 	7900 8300 8900 8300
 Wire Wire Line
-	7900 6600 7900 8400
+	7900 6600 7900 7600
+Wire Wire Line
+	7900 7600 7900 7900
+Wire Wire Line
+	7900 7900 7900 8000
+Wire Wire Line
+	7900 8000 7900 8100
+Wire Wire Line
+	7900 8100 7900 8200
+Wire Wire Line
+	7900 8200 7900 8300
+Wire Wire Line
+	7900 8300 7900 8400
 Connection ~ 7900 7600
 Connection ~ 7900 7900
 Connection ~ 7900 8000
@@ -3149,31 +3359,67 @@ Connection ~ 7900 8200
 Connection ~ 8000 6300
 Connection ~ 7900 8300
 Wire Wire Line
-	7800 8700 8800 8700
+	7800 8700 7900 8700
+Wire Wire Line
+	7900 8700 8800 8700
 Connection ~ 8800 8700
 Wire Wire Line
-	11900 8700 12000 8700
-Connection ~ 12000 8700
+	11900 8900 12000 8900
+Connection ~ 12000 8900
 Wire Wire Line
-	11300 9300 11300 8950
+	11300 9500 11300 9150
 Wire Wire Line
 	9250 9400 9350 9400
 Wire Wire Line
-	9350 9400 9350 10600
+	9350 9400 9350 9500
+Wire Wire Line
+	9350 9500 9350 9600
+Wire Wire Line
+	9350 9600 9350 9700
+Wire Wire Line
+	9350 9700 9350 9800
+Wire Wire Line
+	9350 9800 9350 9900
+Wire Wire Line
+	9350 9900 9350 10000
+Wire Wire Line
+	9350 10000 9350 10400
+Wire Wire Line
+	9350 10400 9350 10500
+Wire Wire Line
+	9350 10500 9350 10600
 Wire Wire Line
 	9250 9500 9350 9500
 Connection ~ 9350 9500
 Wire Wire Line
-	8650 9200 8650 9500
+	8650 9200 8650 9400
+Wire Wire Line
+	8650 9400 8650 9500
 Wire Wire Line
 	8650 9500 8750 9500
 Wire Wire Line
 	8750 9400 8650 9400
 Connection ~ 8650 9400
 Wire Wire Line
-	7850 9200 8550 9200
+	7850 9200 7950 9200
 Wire Wire Line
-	8550 9200 8550 10300
+	7950 9200 8050 9200
+Wire Wire Line
+	8050 9200 8150 9200
+Wire Wire Line
+	8150 9200 8250 9200
+Wire Wire Line
+	8250 9200 8350 9200
+Wire Wire Line
+	8350 9200 8450 9200
+Wire Wire Line
+	8450 9200 8550 9200
+Wire Wire Line
+	8550 9200 8550 10100
+Wire Wire Line
+	8550 10100 8550 10200
+Wire Wire Line
+	8550 10200 8550 10300
 Wire Wire Line
 	8550 10100 8750 10100
 Wire Wire Line
@@ -3183,19 +3429,33 @@ Wire Wire Line
 	8550 10300 8750 10300
 Connection ~ 8550 10200
 Wire Wire Line
-	7750 9600 8750 9600
+	7750 9600 7850 9600
 Wire Wire Line
-	7750 9700 8750 9700
+	7850 9600 8750 9600
 Wire Wire Line
-	7750 9800 8750 9800
+	7750 9700 7950 9700
 Wire Wire Line
-	7750 9900 8750 9900
+	7950 9700 8750 9700
 Wire Wire Line
-	7750 10000 8750 10000
+	7750 9800 8050 9800
 Wire Wire Line
-	7750 10400 8750 10400
+	8050 9800 8750 9800
 Wire Wire Line
-	7750 10500 8750 10500
+	7750 9900 8150 9900
+Wire Wire Line
+	8150 9900 8750 9900
+Wire Wire Line
+	7750 10000 8250 10000
+Wire Wire Line
+	8250 10000 8750 10000
+Wire Wire Line
+	7750 10400 8350 10400
+Wire Wire Line
+	8350 10400 8750 10400
+Wire Wire Line
+	7750 10500 8450 10500
+Wire Wire Line
+	8450 10500 8750 10500
 Wire Wire Line
 	7850 9500 7850 9600
 Connection ~ 7850 9600
@@ -3225,15 +3485,23 @@ Connection ~ 8150 9200
 Connection ~ 8050 9200
 Connection ~ 7950 9200
 Wire Wire Line
-	9450 9200 9650 9200
+	9450 9200 9550 9200
+Wire Wire Line
+	9550 9200 9650 9200
 Connection ~ 9550 9200
 Connection ~ 9450 9200
 Wire Wire Line
-	9250 10100 9850 10100
+	9250 10100 9450 10100
 Wire Wire Line
-	9250 10200 9850 10200
+	9450 10100 9850 10100
 Wire Wire Line
-	9250 10300 9850 10300
+	9250 10200 9550 10200
+Wire Wire Line
+	9550 10200 9850 10200
+Wire Wire Line
+	9250 10300 9650 10300
+Wire Wire Line
+	9650 10300 9850 10300
 Wire Wire Line
 	9450 9500 9450 10100
 Connection ~ 9450 10100
@@ -3269,7 +3537,9 @@ Wire Wire Line
 Connection ~ 9350 10600
 Connection ~ 7900 6300
 Wire Wire Line
-	7800 6600 7800 8400
+	7800 6600 7800 7400
+Wire Wire Line
+	7800 7400 7800 8400
 Connection ~ 7800 7400
 Connection ~ 7900 8700
 Wire Wire Line
@@ -3316,4 +3586,28 @@ Text Label 6250 2650 0    60   ~ 0
 COIN_INH
 Wire Wire Line
 	6250 5150 5800 5150
+$Comp
+L LM2937 U?
+U 1 1 568A89E0
+P 12900 7650
+F 0 "U?" H 13050 7455 60  0000 C CNN
+F 1 "DNP LM2940-N 5V" H 12900 7850 60  0000 C CNN
+F 2 "" H 12900 7650 60  0000 C CNN
+F 3 "" H 12900 7650 60  0000 C CNN
+	1    12900 7650
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR?
+U 1 1 568A92DA
+P 12900 7900
+F 0 "#PWR?" H 12900 7900 30  0001 C CNN
+F 1 "GND" H 12900 7830 30  0001 C CNN
+F 2 "" H 12900 7900 60  0001 C CNN
+F 3 "" H 12900 7900 60  0001 C CNN
+	1    12900 7900
+	1    0    0    -1  
+$EndComp
+Connection ~ 12500 7600
+Connection ~ 13300 7600
 $EndSCHEMATC
diff --git a/matemat.lib b/matemat.lib
index 4f08361..aa8b2b0 100644
--- a/matemat.lib
+++ b/matemat.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Sun 05 Apr 2015 03:42:15 CEST
+EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
 # BT136
@@ -6,8 +6,8 @@ EESchema-LIBRARY Version 2.3  Date: Sun 05 Apr 2015 03:42:15 CEST
 DEF BT136 T 0 0 N Y 1 F N
 F0 "T" 0 -150 40 V V C CNN
 F1 "BT136" -100 -100 40 V V C CNN
-F2 "~" 50 -100 60 H V C CNN
-F3 "~" 50 -100 60 H V C CNN
+F2 "" 50 -100 60 H V C CNN
+F3 "" 50 -100 60 H V C CNN
 $FPLIST
  TO-220*
 $ENDFPLIST
@@ -28,8 +28,8 @@ ENDDEF
 DEF Bus_I2C J 0 40 Y Y 1 F N
 F0 "J" 0 450 70 H V C CNN
 F1 "Bus_I2C" 0 -450 70 H V C CNN
-F2 "~" 0 0 60 H V C CNN
-F3 "~" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -350 400 350 -400 0 1 0 N
 X 5V 1 -650 350 300 R 60 60 1 1 P
@@ -53,11 +53,11 @@ ENDDEF
 #
 # LM2937
 #
-DEF LM2937 U 0 30 N Y 1 F N
+DEF LM2937 U 0 30 Y Y 1 F N
 F0 "U" 150 -195 60 H V C CNN
 F1 "LM2937" 0 200 60 H V C CNN
-F2 "~" 0 0 60 H V C CNN
-F3 "~" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS LM7905 LM7912 79L05
 $FPLIST
  TO263
@@ -76,8 +76,8 @@ ENDDEF
 DEF MAX3535E IC 0 40 Y Y 1 F N
 F0 "IC" -450 -650 40 H V C CNN
 F1 "MAX3535E" 350 -650 40 H V C CNN
-F2 "~" 1050 50 60 H V C CNN
-F3 "~" 1050 50 60 H V C CNN
+F2 "" 1050 50 60 H V C CNN
+F3 "" 1050 50 60 H V C CNN
 DRAW
 C -215 100 15 0 1 5 N
 C 215 -300 15 0 1 5 N
@@ -137,7 +137,7 @@ DEF MAX481CSA IC 0 40 Y Y 1 F N
 F0 "IC" -400 550 50 H V L BNN
 F1 "MAX481CSA" -400 -600 50 H V L BNN
 F2 "maxim-SO08" 0 0 50 H I C CNN
-F3 "~" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  SO8*
 $ENDFPLIST
@@ -204,7 +204,7 @@ DEF TJA1040 IC 0 40 Y Y 1 F N
 F0 "IC" 50 550 50 H V C CNN
 F1 "TJA1040" 50 0 50 H V C CNN
 F2 "nxp-SO8" 50 -250 50 H I C CNN
-F3 "~" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  SO8*
 $ENDFPLIST
@@ -229,8 +229,8 @@ ENDDEF
 DEF ~USB_B_5 J 0 40 Y Y 1 F N
 F0 "J" -75 300 60 H V C CNN
 F1 "USB_B_5" 0 -300 60 H I C CNN
-F2 "~" 0 -50 60 H V C CNN
-F3 "~" 0 -50 60 H V C CNN
+F2 "" 0 -50 60 H V C CNN
+F3 "" 0 -50 60 H V C CNN
 $FPLIST
  *USB_B
 $ENDFPLIST
@@ -250,8 +250,8 @@ ENDDEF
 DEF ~USB_MINI_B_6 J 0 40 Y Y 1 F N
 F0 "J" -75 350 60 H V C CNN
 F1 "USB_MINI_B_6" 50 -350 60 H I C CNN
-F2 "~" 0 0 60 H V C CNN
-F3 "~" 0 0 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  *USB_MINI_B
 $ENDFPLIST