diff --git a/Makefile b/Makefile
index 68a62c5c888c2fcc728434e07e1689d05422450b..dde29fceffe1306b952d321010e7416fc1d6ac1f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,14 @@ DYLD_LIBRARY_PATH=/Applications/Kicad/kicad.app/Contents/Frameworks
 export PYTHONPATH
 export DYLD_LIBRARY_PATH
 
+PROJS=pinky brain
+
 all:
 
+bmaaa.csv: $(foreach f,$(PROJS),$(f)/$(f).csv)
+	echo Qty,Ref,Footprint,Value,Desc,MFN,PN,S1PN,S2PN > $@
+	grep -v Qty $^ | sed -e 's;\([^/]*\)[^:]*:\([0-9]*\),\("\?\);\2,\3\1-;' >> $@
+
 define proj
 
 $(1)/$(1)-all.pdf $(1)/$(1)-multicb.zip $(1)/$(1)-elecrow.zip $(1)/$(1)-superpcb.zip: $(1)-generate
@@ -24,8 +30,7 @@ $(1)-upload: $(1)/$(1)-all.pdf $(1)/$(1)-multicb.zip $(1)/$(1)-elecrow.zip $(1)/
 
 endef
 
-$(eval $(call proj,brain,ssh:site/hardware/2016-09-02-brain/))
-$(eval $(call proj,pinky,ssh:site/hardware/2016-08-18-pinky/))
+$(eval $(foreach p,$(PROJS),$(call proj,$(p),ssh:site/hardware/bmaaa/$(p)/)))
 
 .PHONY: force
 
diff --git a/brain/brain.sch b/brain/brain.sch
index eb910bdaf593376269fc0ac3f6e42390526459f1..74238ee9ad7a75ba5d3c6cc9cc02d19eb91ad0e7 100644
--- a/brain/brain.sch
+++ b/brain/brain.sch
@@ -63,7 +63,7 @@ Sheet 1 8
 Title "AAA Controller"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -178,10 +178,10 @@ F 4 "OB" H 6500 7550 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR3
+L GND #PWR01
 U 1 1 57C3594A
 P 6500 7550
-F 0 "#PWR3" H 6500 7300 50  0001 C CNN
+F 0 "#PWR01" H 6500 7300 50  0001 C CNN
 F 1 "GND" H 6500 7400 50  0000 C CNN
 F 2 "" H 6500 7550 50  0000 C CNN
 F 3 "" H 6500 7550 50  0000 C CNN
@@ -201,10 +201,10 @@ F 4 "OB" H 6300 7550 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR2
+L GND #PWR02
 U 1 1 57C359EB
 P 6300 7550
-F 0 "#PWR2" H 6300 7300 50  0001 C CNN
+F 0 "#PWR02" H 6300 7300 50  0001 C CNN
 F 1 "GND" H 6300 7400 50  0000 C CNN
 F 2 "" H 6300 7550 50  0000 C CNN
 F 3 "" H 6300 7550 50  0000 C CNN
@@ -224,10 +224,10 @@ F 4 "OB" H 6100 7550 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR1
+L GND #PWR03
 U 1 1 57C359F8
 P 6100 7550
-F 0 "#PWR1" H 6100 7300 50  0001 C CNN
+F 0 "#PWR03" H 6100 7300 50  0001 C CNN
 F 1 "GND" H 6100 7400 50  0000 C CNN
 F 2 "" H 6100 7550 50  0000 C CNN
 F 3 "" H 6100 7550 50  0000 C CNN
@@ -247,10 +247,10 @@ F 4 "OB" H 6700 7550 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR04
 U 1 1 57C61447
 P 6700 7550
-F 0 "#PWR4" H 6700 7300 50  0001 C CNN
+F 0 "#PWR04" H 6700 7300 50  0001 C CNN
 F 1 "GND" H 6700 7400 50  0000 C CNN
 F 2 "" H 6700 7550 50  0000 C CNN
 F 3 "" H 6700 7550 50  0000 C CNN
diff --git a/brain/can.sch b/brain/can.sch
index d9603d8cdcc928be73b4ccfc2edf148a7f8889d1..7d43c5d477ae384b92336669607220581366de3c 100644
--- a/brain/can.sch
+++ b/brain/can.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 7 8
-Title "AAA Controller"
+Title "CAN transceiver"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -89,10 +89,10 @@ Wire Wire Line
 Wire Wire Line
 	6650 4200 6650 4500
 $Comp
-L GND #PWR87
+L GND #PWR082
 U 1 1 57A22C28
 P 6650 4500
-F 0 "#PWR87" H 6650 4250 50  0001 C CNN
+F 0 "#PWR082" H 6650 4250 50  0001 C CNN
 F 1 "GND" H 6658 4326 50  0000 C CNN
 F 2 "" H 6650 4500 50  0000 C CNN
 F 3 "" H 6650 4500 50  0000 C CNN
@@ -108,10 +108,10 @@ Wire Wire Line
 Wire Wire Line
 	4950 4100 4950 4500
 $Comp
-L GND #PWR85
+L GND #PWR083
 U 1 1 57A22F20
 P 4950 4500
-F 0 "#PWR85" H 4950 4250 50  0001 C CNN
+F 0 "#PWR083" H 4950 4250 50  0001 C CNN
 F 1 "GND" H 4958 4326 50  0000 C CNN
 F 2 "" H 4950 4500 50  0000 C CNN
 F 3 "" H 4950 4500 50  0000 C CNN
@@ -142,8 +142,8 @@ F 1 "MCP2562" H 5550 4381 60  0000 C CNN
 F 2 "Housings_SOIC:SOIC-8-1EP_3.9x4.9mm_Pitch1.27mm" H 5550 3850 60  0001 C CNN
 F 3 "" H 5550 3850 60  0000 C CNN
 F 4 "Microchip" H 5550 3850 60  0001 C CNN "MFN"
-F 5 "MCP2562-H/SN" H 5550 3850 60  0001 C CNN "MFP"
-F 6 "579-MCP2562-H/SN" H 5550 3850 60  0001 C CNN "S1PN"
+F 5 "MCP2562T-E/SN" H 5550 3850 60  0001 C CNN "MFP"
+F 6 "579-MCP2562T-E/SN" H 5550 3850 60  0001 C CNN "S1PN"
 F 7 "Can transceiver with separate Vio" H 5550 3850 60  0001 C CNN "Description"
 	1    5550 3850
 	1    0    0    -1  
@@ -174,10 +174,10 @@ Wire Wire Line
 Text HLabel 4300 3100 0    60   UnSpc ~ 0
 VSup
 $Comp
-L +5V #PWR86
+L +5V #PWR084
 U 1 1 57A27102
 P 6150 3400
-F 0 "#PWR86" H 6150 3250 50  0001 C CNN
+F 0 "#PWR084" H 6150 3250 50  0001 C CNN
 F 1 "+5V" H 6168 3574 50  0000 C CNN
 F 2 "" H 6150 3400 50  0000 C CNN
 F 3 "" H 6150 3400 50  0000 C CNN
@@ -191,10 +191,10 @@ Wire Wire Line
 Wire Wire Line
 	4950 3600 4950 3500
 $Comp
-L +3V3 #PWR84
+L +3V3 #PWR085
 U 1 1 57A27159
 P 4950 3500
-F 0 "#PWR84" H 4950 3350 50  0001 C CNN
+F 0 "#PWR085" H 4950 3350 50  0001 C CNN
 F 1 "+3V3" H 4968 3674 50  0000 C CNN
 F 2 "" H 4950 3500 50  0000 C CNN
 F 3 "" H 4950 3500 50  0000 C CNN
@@ -243,10 +243,10 @@ $EndComp
 Wire Wire Line
 	3650 2800 3650 2700
 $Comp
-L +3V3 #PWR82
+L +3V3 #PWR086
 U 1 1 57C77190
 P 3650 2700
-F 0 "#PWR82" H 3650 2550 50  0001 C CNN
+F 0 "#PWR086" H 3650 2550 50  0001 C CNN
 F 1 "+3V3" H 3650 2840 50  0000 C CNN
 F 2 "" H 3650 2700 50  0000 C CNN
 F 3 "" H 3650 2700 50  0000 C CNN
@@ -256,10 +256,10 @@ $EndComp
 Wire Wire Line
 	3650 3100 3650 3200
 $Comp
-L GND #PWR83
+L GND #PWR087
 U 1 1 57C771D4
 P 3650 3200
-F 0 "#PWR83" H 3650 2950 50  0001 C CNN
+F 0 "#PWR087" H 3650 2950 50  0001 C CNN
 F 1 "GND" H 3650 3050 50  0000 C CNN
 F 2 "" H 3650 3200 50  0000 C CNN
 F 3 "" H 3650 3200 50  0000 C CNN
@@ -286,10 +286,10 @@ Wire Wire Line
 Wire Wire Line
 	7450 3100 7450 3200
 $Comp
-L GND #PWR89
+L GND #PWR088
 U 1 1 57C77A05
 P 7450 3200
-F 0 "#PWR89" H 7450 2950 50  0001 C CNN
+F 0 "#PWR088" H 7450 2950 50  0001 C CNN
 F 1 "GND" H 7450 3050 50  0000 C CNN
 F 2 "" H 7450 3200 50  0000 C CNN
 F 3 "" H 7450 3200 50  0000 C CNN
@@ -297,10 +297,10 @@ F 3 "" H 7450 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR88
+L +5V #PWR089
 U 1 1 57C77A26
 P 7450 2700
-F 0 "#PWR88" H 7450 2550 50  0001 C CNN
+F 0 "#PWR089" H 7450 2550 50  0001 C CNN
 F 1 "+5V" H 7450 2840 50  0000 C CNN
 F 2 "" H 7450 2700 50  0000 C CNN
 F 3 "" H 7450 2700 50  0000 C CNN
diff --git a/brain/control.sch b/brain/control.sch
index 9f8a5c4b9c86c9bd37df635fc4db7ddeafe964cc..41fad7a4a317c1f75d1fe533b9a570bd7ae4fdb0 100644
--- a/brain/control.sch
+++ b/brain/control.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 8
-Title "AAA Controller"
+Title "External control"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -72,479 +72,485 @@ $EndDescr
 $Comp
 L CONN_01X02 P10
 U 1 1 57A218EC
-P 9400 5750
-F 0 "P10" H 9477 5788 50  0000 L CNN
-F 1 "Ctrl3" H 9477 5696 50  0000 L CNN
-F 2 "Connect:bornier2" H 9400 5750 50  0001 C CNN
-F 3 "" H 9400 5750 50  0000 C CNN
-F 4 "TE Connectivity" H 3500 2200 60  0001 C CNN "MFN"
-F 5 "282837-2" H 3500 2200 60  0001 C CNN "MFP"
-F 6 "571-2828372" H 3500 2200 60  0001 C CNN "S1PN"
-F 7 "5.08MM PCB MOUNT 2P" H 13950 5500 60  0001 C CNN "Description"
-	1    9400 5750
+P 8900 3350
+F 0 "P10" H 8977 3388 50  0000 L CNN
+F 1 "Ctrl3" H 8977 3296 50  0000 L CNN
+F 2 "Connect:bornier2" H 8900 3350 50  0001 C CNN
+F 3 "" H 8900 3350 50  0000 C CNN
+F 4 "TE Connectivity" H 3000 -200 60  0001 C CNN "MFN"
+F 5 "282837-2" H 3000 -200 60  0001 C CNN "MFP"
+F 6 "571-2828372" H 3000 -200 60  0001 C CNN "S1PN"
+F 7 "5.08MM PCB MOUNT 2P" H 13450 3100 60  0001 C CNN "Description"
+	1    8900 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L STM32F107VCT U1
 U 11 1 57C021E1
-P 4400 5500
-F 0 "U1" H 4349 6515 50  0000 C CNN
-F 1 "STM32F107VCT" H 4349 6424 50  0000 C CNN
-F 2 "Housings_QFP:LQFP-100_14x14mm_Pitch0.5mm" H 4349 6333 50  0001 C CNN
-F 3 "" H 4400 5500 50  0000 C CNN
-F 4 "STMicroelectronics" H 11600 7600 60  0001 C CNN "MFN"
-F 5 "STM32F107VCT7" H 11600 7600 60  0001 C CNN "MFP"
-F 6 "511-STM32F107VCT7" H 11600 7600 60  0001 C CNN "S1PN"
-F 7 "STM32 Connectivity, 72MHz, 256/64kB" H 11600 7600 60  0001 C CNN "Description"
-	11   4400 5500
+P 3900 3100
+F 0 "U1" H 3849 4115 50  0000 C CNN
+F 1 "STM32F107VCT" H 3849 4024 50  0000 C CNN
+F 2 "Housings_QFP:LQFP-100_14x14mm_Pitch0.5mm" H 3849 3933 50  0001 C CNN
+F 3 "" H 3900 3100 50  0000 C CNN
+F 4 "STMicroelectronics" H 11100 5200 60  0001 C CNN "MFN"
+F 5 "STM32F107VCT7" H 11100 5200 60  0001 C CNN "MFP"
+F 6 "511-STM32F107VCT7" H 11100 5200 60  0001 C CNN "S1PN"
+F 7 "STM32 Connectivity, 72MHz, 256/64kB" H 11100 5200 60  0001 C CNN "Description"
+	11   3900 3100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5200 5800 6500 5800
+	4700 3400 6000 3400
 Wire Wire Line
-	5200 5700 6500 5700
+	4700 3300 6000 3300
 Wire Wire Line
-	5200 5600 6500 5600
+	4700 3200 6000 3200
 Wire Wire Line
-	5200 5500 6500 5500
+	4700 3100 6000 3100
 Wire Wire Line
-	8100 5000 8200 5000
+	7600 2600 7700 2600
 Wire Wire Line
-	8100 5700 8200 5700
+	7600 3300 7700 3300
 Wire Wire Line
-	8100 4300 8200 4300
-Connection ~ 8100 5000
+	7600 1900 7700 1900
+Connection ~ 7600 2600
 Wire Wire Line
-	8100 3600 8200 3600
-Connection ~ 8100 4300
+	7600 1200 7700 1200
+Connection ~ 7600 1900
 Wire Wire Line
-	8100 3400 8100 5900
+	7600 1000 7600 3500
 $Comp
-L GND #PWR35
+L GND #PWR031
 U 1 1 57C0301F
-P 6400 6000
-F 0 "#PWR35" H 6400 5750 50  0001 C CNN
-F 1 "GND" H 6405 5827 50  0000 C CNN
-F 2 "" H 6400 6000 50  0000 C CNN
-F 3 "" H 6400 6000 50  0000 C CNN
-	1    6400 6000
+P 5900 3600
+F 0 "#PWR031" H 5900 3350 50  0001 C CNN
+F 1 "GND" H 5905 3427 50  0000 C CNN
+F 2 "" H 5900 3600 50  0000 C CNN
+F 3 "" H 5900 3600 50  0000 C CNN
+	1    5900 3600
 	-1   0    0    -1  
 $EndComp
 $Comp
 L Relay_2_coil_latching U8
 U 1 1 57C1C66F
-P 8600 5700
-F 0 "U8" H 8600 6047 60  0000 C CNN
-F 1 "Relay_2_coil_latching" H 8600 5941 60  0000 C CNN
-F 2 "Panasonic_Relays:ADW12" H 8600 5700 60  0001 C CNN
-F 3 "" H 8600 5700 60  0001 C CNN
-F 4 "Panasonic" H 8600 5700 60  0001 C CNN "MFN"
-F 5 "ADW1205HT" H 8600 5700 60  0001 C CNN "MFP"
-F 6 "769-ADW1205HT" H 8600 5700 60  0001 C CNN "S1PN"
-F 7 "Dual coil latching relay" H 8600 5700 60  0001 C CNN "Description"
-	1    8600 5700
+P 8100 3300
+F 0 "U8" H 8100 3647 60  0000 C CNN
+F 1 "Relay_2_coil_latching" H 8100 3541 60  0000 C CNN
+F 2 "Panasonic_Relays:ADW12" H 8100 3300 60  0001 C CNN
+F 3 "" H 8100 3300 60  0001 C CNN
+F 4 "Panasonic" H 8100 3300 60  0001 C CNN "MFN"
+F 5 "ADW1205HT" H 8100 3300 60  0001 C CNN "MFP"
+F 6 "769-ADW1205HT" H 8100 3300 60  0001 C CNN "S1PN"
+F 7 "Dual coil latching relay" H 8100 3300 60  0001 C CNN "Description"
+	1    8100 3300
 	1    0    0    -1  
 $EndComp
 $Comp
 L ULN2803 U4
 U 1 1 57C1C979
-P 6900 5500
-F 0 "U4" H 6900 6147 60  0000 C CNN
-F 1 "ULN2803" H 6900 6041 60  0000 C CNN
-F 2 "Housings_SOIC:SOIC-18_7.5x11.6mm_Pitch1.27mm" H 6900 5500 60  0001 C CNN
-F 3 "" H 6900 5500 60  0001 C CNN
-F 4 "Texas Instruments" H 6900 5500 60  0001 C CNN "MFN"
-F 5 "ULN2803ADWR" H 6900 5500 60  0001 C CNN "MFP"
-F 6 "595-ULN2803ADWR" H 6900 5500 60  0001 C CNN "S1PN"
-F 7 "8-channel Darlington Transistor Array" H 6900 5500 60  0001 C CNN "Description"
-	1    6900 5500
+P 6400 3100
+F 0 "U4" H 6400 3747 60  0000 C CNN
+F 1 "ULN2803" H 6400 3641 60  0000 C CNN
+F 2 "Housings_SOIC:SOIC-18_7.5x11.6mm_Pitch1.27mm" H 6400 3100 60  0001 C CNN
+F 3 "" H 6400 3100 60  0001 C CNN
+F 4 "Texas Instruments" H 6400 3100 60  0001 C CNN "MFN"
+F 5 "ULN2803ADWR" H 6400 3100 60  0001 C CNN "MFP"
+F 6 "595-ULN2803ADWR" H 6400 3100 60  0001 C CNN "S1PN"
+F 7 "8-channel Darlington Transistor Array" H 6400 3100 60  0001 C CNN "Description"
+	1    6400 3100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5200 5400 6500 5400
+	4700 3000 6000 3000
 Wire Wire Line
-	5200 5300 6500 5300
+	4700 2900 6000 2900
 Wire Wire Line
-	5200 5200 6500 5200
+	4700 2800 6000 2800
 Wire Wire Line
-	5200 5100 6500 5100
+	4700 2700 6000 2700
 Wire Wire Line
-	6400 6000 6400 5900
+	5900 3600 5900 3500
 Wire Wire Line
-	6400 5900 6500 5900
+	5900 3500 6000 3500
 Wire Wire Line
-	9000 5800 9200 5800
+	8500 3400 8700 3400
 Wire Wire Line
-	9000 5600 9100 5600
+	8500 3200 8600 3200
 Wire Wire Line
-	9100 5600 9100 5700
+	8600 3200 8600 3300
 Wire Wire Line
-	9100 5700 9200 5700
+	8600 3300 8700 3300
 $Comp
 L CONN_01X02 P9
 U 1 1 57C1D2D4
-P 9400 5050
-F 0 "P9" H 9477 5088 50  0000 L CNN
-F 1 "Ctrl2" H 9477 4996 50  0000 L CNN
-F 2 "Connect:bornier2" H 9400 5050 50  0001 C CNN
-F 3 "" H 9400 5050 50  0000 C CNN
-F 4 "TE Connectivity" H 3500 2200 60  0001 C CNN "MFN"
-F 5 "282837-2" H 3500 2200 60  0001 C CNN "MFP"
-F 6 "571-2828372" H 3500 2200 60  0001 C CNN "S1PN"
-F 7 "5.08MM PCB MOUNT 2P" H 13950 5500 60  0001 C CNN "Description"
-	1    9400 5050
+P 8900 2650
+F 0 "P9" H 8977 2688 50  0000 L CNN
+F 1 "Ctrl2" H 8977 2596 50  0000 L CNN
+F 2 "Connect:bornier2" H 8900 2650 50  0001 C CNN
+F 3 "" H 8900 2650 50  0000 C CNN
+F 4 "TE Connectivity" H 3000 -200 60  0001 C CNN "MFN"
+F 5 "282837-2" H 3000 -200 60  0001 C CNN "MFP"
+F 6 "571-2828372" H 3000 -200 60  0001 C CNN "S1PN"
+F 7 "5.08MM PCB MOUNT 2P" H 13450 3100 60  0001 C CNN "Description"
+	1    8900 2650
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9000 5100 9200 5100
+	8500 2700 8700 2700
 Wire Wire Line
-	9000 4900 9100 4900
+	8500 2500 8600 2500
 Wire Wire Line
-	9100 4900 9100 5000
+	8600 2500 8600 2600
 Wire Wire Line
-	9100 5000 9200 5000
+	8600 2600 8700 2600
 $Comp
 L CONN_01X02 P8
 U 1 1 57C1D331
-P 9400 4350
-F 0 "P8" H 9477 4388 50  0000 L CNN
-F 1 "Ctrl1" H 9477 4296 50  0000 L CNN
-F 2 "Connect:bornier2" H 9400 4350 50  0001 C CNN
-F 3 "" H 9400 4350 50  0000 C CNN
-F 4 "TE Connectivity" H 3500 2200 60  0001 C CNN "MFN"
-F 5 "282837-2" H 3500 2200 60  0001 C CNN "MFP"
-F 6 "571-2828372" H 3500 2200 60  0001 C CNN "S1PN"
-F 7 "5.08MM PCB MOUNT 2P" H 13950 5500 60  0001 C CNN "Description"
-	1    9400 4350
+P 8900 1950
+F 0 "P8" H 8977 1988 50  0000 L CNN
+F 1 "Ctrl1" H 8977 1896 50  0000 L CNN
+F 2 "Connect:bornier2" H 8900 1950 50  0001 C CNN
+F 3 "" H 8900 1950 50  0000 C CNN
+F 4 "TE Connectivity" H 3000 -200 60  0001 C CNN "MFN"
+F 5 "282837-2" H 3000 -200 60  0001 C CNN "MFP"
+F 6 "571-2828372" H 3000 -200 60  0001 C CNN "S1PN"
+F 7 "5.08MM PCB MOUNT 2P" H 13450 3100 60  0001 C CNN "Description"
+	1    8900 1950
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9000 4400 9200 4400
+	8500 2000 8700 2000
 Wire Wire Line
-	9000 4200 9100 4200
+	8500 1800 8600 1800
 Wire Wire Line
-	9100 4200 9100 4300
+	8600 1800 8600 1900
 Wire Wire Line
-	9100 4300 9200 4300
+	8600 1900 8700 1900
 $Comp
 L CONN_01X02 P7
 U 1 1 57C1D33C
-P 9400 3650
-F 0 "P7" H 9477 3688 50  0000 L CNN
-F 1 "Ctrl0" H 9477 3596 50  0000 L CNN
-F 2 "Connect:bornier2" H 9400 3650 50  0001 C CNN
-F 3 "" H 9400 3650 50  0000 C CNN
-F 4 "TE Connectivity" H 3500 2200 60  0001 C CNN "MFN"
-F 5 "282837-2" H 3500 2200 60  0001 C CNN "MFP"
-F 6 "571-2828372" H 3500 2200 60  0001 C CNN "S1PN"
-F 7 "5.08MM PCB MOUNT 2P" H 13950 5500 60  0001 C CNN "Description"
-	1    9400 3650
+P 8900 1250
+F 0 "P7" H 8977 1288 50  0000 L CNN
+F 1 "Ctrl0" H 8977 1196 50  0000 L CNN
+F 2 "Connect:bornier2" H 8900 1250 50  0001 C CNN
+F 3 "" H 8900 1250 50  0000 C CNN
+F 4 "TE Connectivity" H 3000 -200 60  0001 C CNN "MFN"
+F 5 "282837-2" H 3000 -200 60  0001 C CNN "MFP"
+F 6 "571-2828372" H 3000 -200 60  0001 C CNN "S1PN"
+F 7 "5.08MM PCB MOUNT 2P" H 13450 3100 60  0001 C CNN "Description"
+	1    8900 1250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9000 3700 9200 3700
+	8500 1300 8700 1300
 Wire Wire Line
-	9000 3500 9100 3500
+	8500 1100 8600 1100
 Wire Wire Line
-	9100 3500 9100 3600
+	8600 1100 8600 1200
 Wire Wire Line
-	9100 3600 9200 3600
-Connection ~ 8100 5700
+	8600 1200 8700 1200
+Connection ~ 7600 3300
 $Comp
-L +5V #PWR36
+L +5V #PWR032
 U 1 1 57C1D68C
-P 8100 3400
-F 0 "#PWR36" H 8100 3250 50  0001 C CNN
-F 1 "+5V" H 8115 3573 50  0000 C CNN
-F 2 "" H 8100 3400 50  0000 C CNN
-F 3 "" H 8100 3400 50  0000 C CNN
-	1    8100 3400
+P 7600 1000
+F 0 "#PWR032" H 7600 850 50  0001 C CNN
+F 1 "+5V" H 7615 1173 50  0000 C CNN
+F 2 "" H 7600 1000 50  0000 C CNN
+F 3 "" H 7600 1000 50  0000 C CNN
+	1    7600 1000
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	7300 5800 8200 5800
+	6800 3400 7700 3400
 Wire Wire Line
-	8200 5600 8000 5600
+	7700 3200 7500 3200
 Wire Wire Line
-	8000 5600 8000 5700
+	7500 3200 7500 3300
 Wire Wire Line
-	8000 5700 7300 5700
+	7500 3300 6800 3300
 Wire Wire Line
-	7300 5100 7400 5100
+	6800 2700 6900 2700
 Wire Wire Line
-	7400 5100 7400 3500
+	6900 2700 6900 1100
 Wire Wire Line
-	7400 3500 8200 3500
+	6900 1100 7700 1100
 Wire Wire Line
-	8200 3700 7500 3700
+	7700 1300 7000 1300
 Wire Wire Line
-	7500 3700 7500 5200
+	7000 1300 7000 2800
 Wire Wire Line
-	7500 5200 7300 5200
+	7000 2800 6800 2800
 Wire Wire Line
-	7300 5300 7600 5300
+	6800 2900 7100 2900
 Wire Wire Line
-	7600 5300 7600 4200
+	7100 2900 7100 1800
 Wire Wire Line
-	7600 4200 8200 4200
+	7100 1800 7700 1800
 Wire Wire Line
-	8200 4400 7700 4400
+	7700 2000 7200 2000
 Wire Wire Line
-	7700 4400 7700 5400
+	7200 2000 7200 3000
 Wire Wire Line
-	7700 5400 7300 5400
+	7200 3000 6800 3000
 Wire Wire Line
-	7300 5500 7800 5500
+	6800 3100 7300 3100
 Wire Wire Line
-	7800 5500 7800 4900
+	7300 3100 7300 2500
 Wire Wire Line
-	7800 4900 8200 4900
+	7300 2500 7700 2500
 Wire Wire Line
-	8200 5100 7900 5100
+	7700 2700 7400 2700
 Wire Wire Line
-	7900 5100 7900 5600
+	7400 2700 7400 3200
 Wire Wire Line
-	7900 5600 7300 5600
+	7400 3200 6800 3200
 $Comp
 L Relay_2_coil_latching U7
 U 1 1 57C1E0ED
-P 8600 5000
-F 0 "U7" H 8600 5347 60  0000 C CNN
-F 1 "Relay_2_coil_latching" H 8600 5241 60  0000 C CNN
-F 2 "Panasonic_Relays:ADW12" H 8600 5000 60  0001 C CNN
-F 3 "" H 8600 5000 60  0001 C CNN
-F 4 "Panasonic" H 8600 5000 60  0001 C CNN "MFN"
-F 5 "ADW1205HT" H 8600 5000 60  0001 C CNN "MFP"
-F 6 "769-ADW1205HT" H 8600 5000 60  0001 C CNN "S1PN"
-F 7 "Dual coil latching relay" H 8600 5000 60  0001 C CNN "Description"
-	1    8600 5000
+P 8100 2600
+F 0 "U7" H 8100 2947 60  0000 C CNN
+F 1 "Relay_2_coil_latching" H 8100 2841 60  0000 C CNN
+F 2 "Panasonic_Relays:ADW12" H 8100 2600 60  0001 C CNN
+F 3 "" H 8100 2600 60  0001 C CNN
+F 4 "Panasonic" H 8100 2600 60  0001 C CNN "MFN"
+F 5 "ADW1205HT" H 8100 2600 60  0001 C CNN "MFP"
+F 6 "769-ADW1205HT" H 8100 2600 60  0001 C CNN "S1PN"
+F 7 "Dual coil latching relay" H 8100 2600 60  0001 C CNN "Description"
+	1    8100 2600
 	1    0    0    -1  
 $EndComp
 $Comp
 L Relay_2_coil_latching U6
 U 1 1 57C1E12E
-P 8600 4300
-F 0 "U6" H 8600 4647 60  0000 C CNN
-F 1 "Relay_2_coil_latching" H 8600 4541 60  0000 C CNN
-F 2 "Panasonic_Relays:ADW12" H 8600 4300 60  0001 C CNN
-F 3 "" H 8600 4300 60  0001 C CNN
-F 4 "Panasonic" H 8600 4300 60  0001 C CNN "MFN"
-F 5 "ADW1205HT" H 8600 4300 60  0001 C CNN "MFP"
-F 6 "769-ADW1205HT" H 8600 4300 60  0001 C CNN "S1PN"
-F 7 "Dual coil latching relay" H 8600 4300 60  0001 C CNN "Description"
-	1    8600 4300
+P 8100 1900
+F 0 "U6" H 8100 2247 60  0000 C CNN
+F 1 "Relay_2_coil_latching" H 8100 2141 60  0000 C CNN
+F 2 "Panasonic_Relays:ADW12" H 8100 1900 60  0001 C CNN
+F 3 "" H 8100 1900 60  0001 C CNN
+F 4 "Panasonic" H 8100 1900 60  0001 C CNN "MFN"
+F 5 "ADW1205HT" H 8100 1900 60  0001 C CNN "MFP"
+F 6 "769-ADW1205HT" H 8100 1900 60  0001 C CNN "S1PN"
+F 7 "Dual coil latching relay" H 8100 1900 60  0001 C CNN "Description"
+	1    8100 1900
 	1    0    0    -1  
 $EndComp
 $Comp
 L Relay_2_coil_latching U5
 U 1 1 57C1E16B
-P 8600 3600
-F 0 "U5" H 8600 3947 60  0000 C CNN
-F 1 "Relay_2_coil_latching" H 8600 3841 60  0000 C CNN
-F 2 "Panasonic_Relays:ADW12" H 8600 3600 60  0001 C CNN
-F 3 "" H 8600 3600 60  0001 C CNN
-F 4 "Panasonic" H 8600 3600 60  0001 C CNN "MFN"
-F 5 "ADW1205HT" H 8600 3600 60  0001 C CNN "MFP"
-F 6 "769-ADW1205HT" H 8600 3600 60  0001 C CNN "S1PN"
-F 7 "Dual coil latching relay" H 8600 3600 60  0001 C CNN "Description"
-	1    8600 3600
+P 8100 1200
+F 0 "U5" H 8100 1547 60  0000 C CNN
+F 1 "Relay_2_coil_latching" H 8100 1441 60  0000 C CNN
+F 2 "Panasonic_Relays:ADW12" H 8100 1200 60  0001 C CNN
+F 3 "" H 8100 1200 60  0001 C CNN
+F 4 "Panasonic" H 8100 1200 60  0001 C CNN "MFN"
+F 5 "ADW1205HT" H 8100 1200 60  0001 C CNN "MFP"
+F 6 "769-ADW1205HT" H 8100 1200 60  0001 C CNN "S1PN"
+F 7 "Dual coil latching relay" H 8100 1200 60  0001 C CNN "Description"
+	1    8100 1200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8100 5900 7300 5900
-Connection ~ 8100 3600
+	7600 3500 6800 3500
+Connection ~ 7600 1200
 $Comp
 L CONN_01X04 P6
 U 1 1 57CE54A4
-P 5300 2150
-F 0 "P6" H 5300 2400 50  0000 C CNN
-F 1 "Input" V 5400 2150 50  0000 C CNN
-F 2 "Connect:bornier4" H 5300 2150 50  0001 C CNN
-F 3 "" H 5300 2150 50  0000 C CNN
-F 4 "TE Connectivity" H 3500 2200 60  0001 C CNN "MFN"
-F 5 "282837-4" H 3500 2200 60  0001 C CNN "MFP"
-F 6 "571-2828374" H 3500 2200 60  0001 C CNN "S1PN"
-F 7 "5.08MM PCB MOUNT 4P" H 13950 5500 60  0001 C CNN "Description"
-	1    5300 2150
+P 5900 6150
+F 0 "P6" H 5900 6400 50  0000 C CNN
+F 1 "Input" V 6000 6150 50  0000 C CNN
+F 2 "Connect:bornier4" H 5900 6150 50  0001 C CNN
+F 3 "" H 5900 6150 50  0000 C CNN
+F 4 "TE Connectivity" H 4100 6200 60  0001 C CNN "MFN"
+F 5 "282837-4" H 4100 6200 60  0001 C CNN "MFP"
+F 6 "571-2828374" H 4100 6200 60  0001 C CNN "S1PN"
+F 7 "5.08MM PCB MOUNT 4P" H 14550 9500 60  0001 C CNN "Description"
+	1    5900 6150
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	5100 2300 5000 2300
+	5700 6300 5600 6300
 Wire Wire Line
-	5000 2300 5000 2400
+	5600 6300 5600 6400
 $Comp
-L GND #PWR34
+L GND #PWR033
 U 1 1 57CE54A5
-P 5000 2400
-F 0 "#PWR34" H 5000 2150 50  0001 C CNN
-F 1 "GND" H 5000 2250 50  0000 C CNN
-F 2 "" H 5000 2400 50  0000 C CNN
-F 3 "" H 5000 2400 50  0000 C CNN
-	1    5000 2400
+P 5600 6400
+F 0 "#PWR033" H 5600 6150 50  0001 C CNN
+F 1 "GND" H 5600 6250 50  0000 C CNN
+F 2 "" H 5600 6400 50  0000 C CNN
+F 3 "" H 5600 6400 50  0000 C CNN
+	1    5600 6400
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	4325 2200 5100 2200
+	4925 6200 5700 6200
 Wire Wire Line
-	3725 2100 5100 2100
+	4325 6100 5700 6100
 Wire Wire Line
-	3125 2000 5100 2000
+	3725 6000 5700 6000
 Wire Wire Line
-	4500 2200 4500 1600
-Connection ~ 4500 2200
+	5100 6200 5100 5600
+Connection ~ 5100 6200
 Wire Wire Line
-	4600 2100 4600 1600
-Connection ~ 4600 2100
+	5200 6100 5200 5600
+Connection ~ 5200 6100
 Wire Wire Line
-	4700 2000 4700 1600
-Connection ~ 4700 2000
+	5300 6000 5300 5600
+Connection ~ 5300 6000
 $Comp
 L R_PACK4 R7
 U 1 1 57CE54A6
-P 4850 1400
-F 0 "R7" V 4950 1950 50  0000 C CNN
-F 1 "10k" V 4850 1950 50  0000 C CNN
-F 2 "Resistors_SMD:R_Array_Convex_4x0603" V 4780 1400 50  0001 C CNN
-F 3 "" H 4850 1400 50  0000 C CNN
-F 4 "Panasonic" H 4850 1400 60  0001 C CNN "MFN"
-F 5 "EXB-V8V103JV" H 4850 1400 60  0001 C CNN "MFP"
-F 6 "667-EXB-V8V103JV" H 4850 1400 60  0001 C CNN "S1PN"
-F 7 "10K resistor array 0603" H 4850 1400 60  0001 C CNN "Description"
-	1    4850 1400
+P 5450 5400
+F 0 "R7" V 5550 5950 50  0000 C CNN
+F 1 "10k" V 5450 5950 50  0000 C CNN
+F 2 "Resistors_SMD:R_Array_Convex_4x0603" V 5380 5400 50  0001 C CNN
+F 3 "" H 5450 5400 50  0000 C CNN
+F 4 "Panasonic" H 5450 5400 60  0001 C CNN "MFN"
+F 5 "EXB-V8V103JV" H 5450 5400 60  0001 C CNN "MFP"
+F 6 "667-EXB-V8V103JV" H 5450 5400 60  0001 C CNN "S1PN"
+F 7 "10K resistor array 0603" H 5450 5400 60  0001 C CNN "Description"
+	1    5450 5400
 	0    -1   1    0   
 $EndComp
 Wire Wire Line
-	4500 1200 4500 1100
+	5100 5200 5100 5100
 Wire Wire Line
-	4500 1100 4800 1100
+	5100 5100 5400 5100
 Wire Wire Line
-	4600 1000 4600 1200
+	5200 5000 5200 5200
 Wire Wire Line
-	4700 1100 4700 1200
-Connection ~ 4600 1100
+	5300 5100 5300 5200
+Connection ~ 5200 5100
 $Comp
 L SN74LVC3G06 U3
 U 1 1 57CE54A7
-P 2900 2000
-F 0 "U3" H 3025 2125 60  0000 C CNN
-F 1 "SN74LVC3G06" H 2900 1600 60  0000 C CNN
-F 2 "Housings_SSOP:TSSOP-8_3x3mm_Pitch0.65mm" H 2900 2000 60  0001 C CNN
-F 3 "" H 2900 2000 60  0000 C CNN
-F 4 "Texas Instruments" H 2900 2000 60  0001 C CNN "MFN"
-F 5 "SN74LVC3G04DCTR" H 2900 2000 60  0001 C CNN "MFP"
-F 6 "595-SN74LVC3G04DCTR" H 2900 2000 60  0001 C CNN "S1PN"
-F 7 "Triple inverter" H 2900 2000 60  0001 C CNN "Description"
-	1    2900 2000
+P 3500 6000
+F 0 "U3" H 3625 6125 60  0000 C CNN
+F 1 "SN74LVC3G06" H 3500 5600 60  0000 C CNN
+F 2 "Housings_SSOP:TSSOP-8_3x3mm_Pitch0.65mm" H 3500 6000 60  0001 C CNN
+F 3 "" H 3500 6000 60  0000 C CNN
+F 4 "Texas Instruments" H 3500 6000 60  0001 C CNN "MFN"
+F 5 "SN74LVC3G04DCTR" H 3500 6000 60  0001 C CNN "MFP"
+F 6 "595-SN74LVC3G04DCTR" H 3500 6000 60  0001 C CNN "S1PN"
+F 7 "Triple inverter" H 3500 6000 60  0001 C CNN "Description"
+	1    3500 6000
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	2400 2200 3800 2200
+	3000 6200 4400 6200
 Wire Wire Line
-	3200 2100 2400 2100
+	3800 6100 3000 6100
 Wire Wire Line
-	2400 2000 2600 2000
+	3000 6000 3200 6000
 Wire Wire Line
-	2900 2175 2900 2500
+	3500 6175 3500 6500
 Wire Wire Line
-	2900 2500 4100 2500
+	3500 6500 4700 6500
 Wire Wire Line
-	4100 2500 4100 2375
+	4700 6500 4700 6375
 Wire Wire Line
-	3500 2275 3500 2600
-Connection ~ 3500 2500
+	4100 6275 4100 6600
+Connection ~ 4100 6500
 Wire Wire Line
-	2900 1825 2900 1700
+	3500 5825 3500 5700
 Wire Wire Line
-	2900 1700 4100 1700
+	3500 5700 4700 5700
 Wire Wire Line
-	3500 1600 3500 1925
+	4100 5600 4100 5925
 Wire Wire Line
-	4100 1700 4100 2025
-Connection ~ 3500 1700
+	4700 5700 4700 6025
+Connection ~ 4100 5700
 $Comp
 L SN74LVC3G06 U3
 U 2 1 57CE54A8
-P 3500 2100
-F 0 "U3" H 3625 2225 60  0000 C CNN
-F 1 "SN74LVC3G06" H 3900 2400 60  0000 C CNN
-F 2 "Housings_SSOP:TSSOP-8_3x3mm_Pitch0.65mm" H 3500 2100 60  0001 C CNN
-F 3 "" H 3500 2100 60  0000 C CNN
-F 4 "Texas Instruments" H 3500 2100 60  0001 C CNN "MFN"
-F 5 "SN74LVC3G04DCTR" H 3500 2100 60  0001 C CNN "MFP"
-F 6 "595-SN74LVC3G04DCTR" H 3500 2100 60  0001 C CNN "S1PN"
-F 7 "Triple inverter" H 3500 2100 60  0001 C CNN "Description"
-	2    3500 2100
+P 4100 6100
+F 0 "U3" H 4225 6225 60  0000 C CNN
+F 1 "SN74LVC3G06" H 4500 6400 60  0000 C CNN
+F 2 "Housings_SSOP:TSSOP-8_3x3mm_Pitch0.65mm" H 4100 6100 60  0001 C CNN
+F 3 "" H 4100 6100 60  0000 C CNN
+F 4 "Texas Instruments" H 4100 6100 60  0001 C CNN "MFN"
+F 5 "SN74LVC3G04DCTR" H 4100 6100 60  0001 C CNN "MFP"
+F 6 "595-SN74LVC3G04DCTR" H 4100 6100 60  0001 C CNN "S1PN"
+F 7 "Triple inverter" H 4100 6100 60  0001 C CNN "Description"
+	2    4100 6100
 	-1   0    0    1   
 $EndComp
 $Comp
 L SN74LVC3G06 U3
 U 3 1 57CE54A9
-P 4100 2200
-F 0 "U3" H 4225 2325 60  0000 C CNN
-F 1 "SN74LVC3G06" H 4100 2600 60  0000 C CNN
-F 2 "Housings_SSOP:TSSOP-8_3x3mm_Pitch0.65mm" H 4100 2200 60  0001 C CNN
-F 3 "" H 4100 2200 60  0000 C CNN
-F 4 "Texas Instruments" H 4100 2200 60  0001 C CNN "MFN"
-F 5 "SN74LVC3G04DCTR" H 4100 2200 60  0001 C CNN "MFP"
-F 6 "595-SN74LVC3G04DCTR" H 4100 2200 60  0001 C CNN "S1PN"
-F 7 "Triple inverter" H 4100 2200 60  0001 C CNN "Description"
-	3    4100 2200
+P 4700 6200
+F 0 "U3" H 4825 6325 60  0000 C CNN
+F 1 "SN74LVC3G06" H 4700 6600 60  0000 C CNN
+F 2 "Housings_SSOP:TSSOP-8_3x3mm_Pitch0.65mm" H 4700 6200 60  0001 C CNN
+F 3 "" H 4700 6200 60  0000 C CNN
+F 4 "Texas Instruments" H 4700 6200 60  0001 C CNN "MFN"
+F 5 "SN74LVC3G04DCTR" H 4700 6200 60  0001 C CNN "MFP"
+F 6 "595-SN74LVC3G04DCTR" H 4700 6200 60  0001 C CNN "S1PN"
+F 7 "Triple inverter" H 4700 6200 60  0001 C CNN "Description"
+	3    4700 6200
 	-1   0    0    1   
 $EndComp
-Text HLabel 1900 1700 0    60   UnSpc ~ 0
+Text HLabel 2500 5700 0    60   UnSpc ~ 0
 Input_[0..2]
 Entry Wire Line
-	2300 1900 2400 2000
+	2900 5900 3000 6000
 Entry Wire Line
-	2300 2000 2400 2100
+	2900 6000 3000 6100
 Entry Wire Line
-	2300 2100 2400 2200
+	2900 6100 3000 6200
 Wire Bus Line
-	2300 1700 2300 2100
+	2900 5700 2900 6100
 Wire Bus Line
-	2300 1700 1900 1700
-Text Label 2000 1700 0    60   ~ 0
+	2900 5700 2500 5700
+Text Label 2600 5700 0    60   ~ 0
 i[0..2]
-Text Label 2500 2000 0    60   ~ 0
+Text Label 3100 6000 0    60   ~ 0
 i0
-Text Label 2500 2100 0    60   ~ 0
+Text Label 3100 6100 0    60   ~ 0
 i1
-Text Label 2500 2200 0    60   ~ 0
+Text Label 3100 6200 0    60   ~ 0
 i2
 $Comp
-L +3V3 #PWR31
+L +3V3 #PWR034
 U 1 1 57CE54AA
-P 3500 1600
-F 0 "#PWR31" H 3500 1450 50  0001 C CNN
-F 1 "+3V3" H 3500 1740 50  0000 C CNN
-F 2 "" H 3500 1600 50  0000 C CNN
-F 3 "" H 3500 1600 50  0000 C CNN
-	1    3500 1600
+P 4100 5600
+F 0 "#PWR034" H 4100 5450 50  0001 C CNN
+F 1 "+3V3" H 4100 5740 50  0000 C CNN
+F 2 "" H 4100 5600 50  0000 C CNN
+F 3 "" H 4100 5600 50  0000 C CNN
+	1    4100 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR32
+L GND #PWR035
 U 1 1 57CE54AB
-P 3500 2600
-F 0 "#PWR32" H 3500 2350 50  0001 C CNN
-F 1 "GND" H 3500 2450 50  0000 C CNN
-F 2 "" H 3500 2600 50  0000 C CNN
-F 3 "" H 3500 2600 50  0000 C CNN
-	1    3500 2600
+P 4100 6600
+F 0 "#PWR035" H 4100 6350 50  0001 C CNN
+F 1 "GND" H 4100 6450 50  0000 C CNN
+F 2 "" H 4100 6600 50  0000 C CNN
+F 3 "" H 4100 6600 50  0000 C CNN
+	1    4100 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR33
+L +5V #PWR036
 U 1 1 57CE54AC
-P 4600 1000
-F 0 "#PWR33" H 4600 850 50  0001 C CNN
-F 1 "+5V" H 4600 1140 50  0000 C CNN
-F 2 "" H 4600 1000 50  0000 C CNN
-F 3 "" H 4600 1000 50  0000 C CNN
-	1    4600 1000
+P 5200 5000
+F 0 "#PWR036" H 5200 4850 50  0001 C CNN
+F 1 "+5V" H 5200 5140 50  0000 C CNN
+F 2 "" H 5200 5000 50  0000 C CNN
+F 3 "" H 5200 5000 50  0000 C CNN
+	1    5200 5000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4800 1100 4800 1200
-Connection ~ 4700 1100
+	5400 5100 5400 5200
+Connection ~ 5300 5100
+Wire Notes Line
+	700  4200 11050 4200
+Text Notes 800  3900 0    60   ~ 0
+4x relay control
+Text Notes 800  4500 0    60   ~ 0
+3x push-button input
 $EndSCHEMATC
diff --git a/brain/ethernet.sch b/brain/ethernet.sch
index 3b8165289afdc7bb0f91b8e782a1f3fce3a9655f..f0d18fd97e3417b21ea09afdd35e7c6413fc7c99 100644
--- a/brain/ethernet.sch
+++ b/brain/ethernet.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 4 8
-Title "AAA Controller"
+Title "Ethernet Phy"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -131,10 +131,10 @@ Wire Wire Line
 Wire Wire Line
 	5600 5700 5600 5800
 $Comp
-L GND #PWR40
+L GND #PWR037
 U 1 1 57BDBA82
 P 5600 5800
-F 0 "#PWR40" H 5600 5550 50  0001 C CNN
+F 0 "#PWR037" H 5600 5550 50  0001 C CNN
 F 1 "GND" H 5605 5627 50  0000 C CNN
 F 2 "" H 5600 5800 50  0000 C CNN
 F 3 "" H 5600 5800 50  0000 C CNN
@@ -191,10 +191,10 @@ NoConn ~ 5400 5000
 Wire Wire Line
 	4500 5800 4500 5900
 $Comp
-L GND #PWR38
+L GND #PWR038
 U 1 1 57BDB602
 P 4500 5900
-F 0 "#PWR38" H 4500 5650 50  0001 C CNN
+F 0 "#PWR038" H 4500 5650 50  0001 C CNN
 F 1 "GND" H 4505 5727 50  0000 C CNN
 F 2 "" H 4500 5900 50  0000 C CNN
 F 3 "" H 4500 5900 50  0000 C CNN
@@ -321,10 +321,10 @@ Wire Wire Line
 	3800 2200 3800 2500
 Connection ~ 3800 2300
 $Comp
-L GND #PWR37
+L GND #PWR039
 U 1 1 57BDC305
 P 3800 2500
-F 0 "#PWR37" H 3800 2250 50  0001 C CNN
+F 0 "#PWR039" H 3800 2250 50  0001 C CNN
 F 1 "GND" H 3805 2327 50  0000 C CNN
 F 2 "" H 3800 2500 50  0000 C CNN
 F 3 "" H 3800 2500 50  0000 C CNN
@@ -350,10 +350,10 @@ $EndComp
 Wire Wire Line
 	8600 1600 8400 1600
 $Comp
-L +3V3 #PWR41
+L +3V3 #PWR040
 U 1 1 57BDCB16
 P 8600 1500
-F 0 "#PWR41" H 8600 1350 50  0001 C CNN
+F 0 "#PWR040" H 8600 1350 50  0001 C CNN
 F 1 "+3V3" H 8615 1673 50  0000 C CNN
 F 2 "" H 8600 1500 50  0000 C CNN
 F 3 "" H 8600 1500 50  0000 C CNN
@@ -361,10 +361,10 @@ F 3 "" H 8600 1500 50  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR39
+L GND #PWR041
 U 1 1 57BDCEE2
 P 5000 2500
-F 0 "#PWR39" H 5000 2250 50  0001 C CNN
+F 0 "#PWR041" H 5000 2250 50  0001 C CNN
 F 1 "GND" H 5005 2327 50  0000 C CNN
 F 2 "" H 5000 2500 50  0000 C CNN
 F 3 "" H 5000 2500 50  0000 C CNN
@@ -490,7 +490,7 @@ Connection ~ 6200 1600
 Wire Wire Line
 	6100 1600 6100 2700
 Connection ~ 6100 1600
-Text Notes 9800 2900 1    60   ~ 0
+Text Notes 9950 2350 0    60   ~ 0
 G=Act
 $Comp
 L R R11
@@ -529,10 +529,10 @@ Wire Wire Line
 Wire Wire Line
 	9900 2200 9900 2300
 $Comp
-L GND #PWR42
+L GND #PWR042
 U 1 1 57BDF231
 P 10000 1700
-F 0 "#PWR42" H 10000 1450 50  0001 C CNN
+F 0 "#PWR042" H 10000 1450 50  0001 C CNN
 F 1 "GND" H 10005 1527 50  0000 C CNN
 F 2 "" H 10000 1700 50  0000 C CNN
 F 3 "" H 10000 1700 50  0000 C CNN
@@ -544,19 +544,19 @@ Wire Wire Line
 Wire Wire Line
 	10500 2100 10500 2300
 $Comp
-L +3V3 #PWR43
+L +3V3 #PWR043
 U 1 1 57BDF402
 P 10600 1800
-F 0 "#PWR43" H 10600 1650 50  0001 C CNN
+F 0 "#PWR043" H 10600 1650 50  0001 C CNN
 F 1 "+3V3" H 10615 1973 50  0000 C CNN
 F 2 "" H 10600 1800 50  0000 C CNN
 F 3 "" H 10600 1800 50  0000 C CNN
 	1    10600 1800
 	-1   0    0    -1  
 $EndComp
-Text Notes 9350 3300 2    60   ~ 0
-nINTSEL high at reset -> nINT/TXEN/TXD4 == nINT\nREGOFF low at reset -> Internal regulator ON
-Text Notes 10500 2600 3    60   ~ 0
+Text Notes 7150 3300 0    60   ~ 0
+Sensing at reset:\n\nnINTSEL high at reset\n  -> nINT/TXEN/TXD4 == nINT\nREGOFF low at reset\n  -> Internal regulator ON
+Text Notes 10650 2350 0    60   ~ 0
 Y=100M
 $Comp
 L R_PACK4 R9
diff --git a/brain/i2c.sch b/brain/i2c.sch
index 3dcf823341f922edd31702713c352936b28684c8..c2a294d8fbbaa544aee7a5f2008c1afd6533508c 100644
--- a/brain/i2c.sch
+++ b/brain/i2c.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 8 8
-Title "AAA Controller"
+Title "RTC"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -126,10 +126,10 @@ $EndComp
 Wire Wire Line
 	5750 4900 5750 5000
 $Comp
-L GND #PWR95
+L GND #PWR090
 U 1 1 57B578C5
 P 5750 5000
-F 0 "#PWR95" H 5750 4750 50  0001 C CNN
+F 0 "#PWR090" H 5750 4750 50  0001 C CNN
 F 1 "GND" H 5755 4827 50  0000 C CNN
 F 2 "" H 5750 5000 50  0000 C CNN
 F 3 "" H 5750 5000 50  0000 C CNN
@@ -139,10 +139,10 @@ $EndComp
 Wire Wire Line
 	4700 4700 4700 5000
 $Comp
-L GND #PWR94
+L GND #PWR091
 U 1 1 57B579F8
 P 4700 5000
-F 0 "#PWR94" H 4700 4750 50  0001 C CNN
+F 0 "#PWR091" H 4700 4750 50  0001 C CNN
 F 1 "GND" H 4705 4827 50  0000 C CNN
 F 2 "" H 4700 5000 50  0000 C CNN
 F 3 "" H 4700 5000 50  0000 C CNN
@@ -158,10 +158,10 @@ Wire Wire Line
 Text HLabel 4000 4500 0    60   Output ~ 0
 IRQ
 $Comp
-L +3V3 #PWR97
+L +3V3 #PWR092
 U 1 1 57B57CFE
 P 6900 2500
-F 0 "#PWR97" H 6900 2350 50  0001 C CNN
+F 0 "#PWR092" H 6900 2350 50  0001 C CNN
 F 1 "+3V3" H 6915 2673 50  0000 C CNN
 F 2 "" H 6900 2500 50  0000 C CNN
 F 3 "" H 6900 2500 50  0000 C CNN
@@ -210,10 +210,10 @@ Wire Wire Line
 Wire Wire Line
 	7300 4000 7300 4200
 $Comp
-L GND #PWR96
+L GND #PWR093
 U 1 1 57B585B6
 P 6500 4200
-F 0 "#PWR96" H 6500 3950 50  0001 C CNN
+F 0 "#PWR093" H 6500 3950 50  0001 C CNN
 F 1 "GND" H 6505 4027 50  0000 C CNN
 F 2 "" H 6500 4200 50  0000 C CNN
 F 3 "" H 6500 4200 50  0000 C CNN
@@ -221,10 +221,10 @@ F 3 "" H 6500 4200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR98
+L GND #PWR094
 U 1 1 57B585D9
 P 7300 4200
-F 0 "#PWR98" H 7300 3950 50  0001 C CNN
+F 0 "#PWR094" H 7300 3950 50  0001 C CNN
 F 1 "GND" H 7305 4027 50  0000 C CNN
 F 2 "" H 7300 4200 50  0000 C CNN
 F 3 "" H 7300 4200 50  0000 C CNN
@@ -315,10 +315,10 @@ Connection ~ 3700 4200
 Wire Wire Line
 	3800 3500 3800 3600
 $Comp
-L GND #PWR93
+L GND #PWR095
 U 1 1 57BEF0CB
 P 3800 3600
-F 0 "#PWR93" H 3800 3350 50  0001 C CNN
+F 0 "#PWR095" H 3800 3350 50  0001 C CNN
 F 1 "GND" H 3805 3427 50  0000 C CNN
 F 2 "" H 3800 3600 50  0000 C CNN
 F 3 "" H 3800 3600 50  0000 C CNN
@@ -332,10 +332,10 @@ Wire Wire Line
 Wire Wire Line
 	3300 3600 3300 3500
 $Comp
-L +3V3 #PWR92
+L +3V3 #PWR096
 U 1 1 57BEF123
 P 3300 3500
-F 0 "#PWR92" H 3300 3350 50  0001 C CNN
+F 0 "#PWR096" H 3300 3350 50  0001 C CNN
 F 1 "+3V3" H 3315 3673 50  0000 C CNN
 F 2 "" H 3300 3500 50  0000 C CNN
 F 3 "" H 3300 3500 50  0000 C CNN
@@ -376,10 +376,10 @@ Wire Wire Line
 	2800 3900 2800 4200
 Connection ~ 2800 4200
 $Comp
-L +3V3 #PWR90
+L +3V3 #PWR097
 U 1 1 57CE211C
 P 2500 3300
-F 0 "#PWR90" H 2500 3150 50  0001 C CNN
+F 0 "#PWR097" H 2500 3150 50  0001 C CNN
 F 1 "+3V3" H 2500 3440 50  0000 C CNN
 F 2 "" H 2500 3300 50  0000 C CNN
 F 3 "" H 2500 3300 50  0000 C CNN
@@ -387,10 +387,10 @@ F 3 "" H 2500 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR91
+L +3V3 #PWR098
 U 1 1 57CE2151
 P 2800 3300
-F 0 "#PWR91" H 2800 3150 50  0001 C CNN
+F 0 "#PWR098" H 2800 3150 50  0001 C CNN
 F 1 "+3V3" H 2800 3440 50  0000 C CNN
 F 2 "" H 2800 3300 50  0000 C CNN
 F 3 "" H 2800 3300 50  0000 C CNN
@@ -412,4 +412,6 @@ F 7 "75V, 5%, 0603" H 5550 3850 60  0001 C CNN "Description"
 	1    2800 3750
 	1    0    0    -1  
 $EndComp
+Text Notes 1500 2000 0    60   ~ 0
+Local RTC + Supercap\nTracks time during power outage
 $EndSCHEMATC
diff --git a/brain/mcu.sch b/brain/mcu.sch
index b1de18bfc76d7e914d80dbb662e00c086f1785f3..97c5ce40cbfe1743d7ffb2af4482d2dc2640c5e1 100644
--- a/brain/mcu.sch
+++ b/brain/mcu.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 8
-Title "AAA Controller"
+Title "MCU"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -85,10 +85,10 @@ Wire Wire Line
 	8900 900  8900 800 
 Connection ~ 8900 800 
 $Comp
-L +3V3 #PWR23
+L +3V3 #PWR05
 U 1 1 57BB77EC
 P 9000 700
-F 0 "#PWR23" H 9000 550 50  0001 C CNN
+F 0 "#PWR05" H 9000 550 50  0001 C CNN
 F 1 "+3V3" H 9015 873 50  0000 C CNN
 F 2 "" H 9000 700 50  0000 C CNN
 F 3 "" H 9000 700 50  0000 C CNN
@@ -111,10 +111,10 @@ Wire Wire Line
 	8900 2500 8900 2600
 Connection ~ 8900 2600
 $Comp
-L GND #PWR24
+L GND #PWR06
 U 1 1 57BB788C
 P 9000 2700
-F 0 "#PWR24" H 9000 2450 50  0001 C CNN
+F 0 "#PWR06" H 9000 2450 50  0001 C CNN
 F 1 "GND" H 9005 2527 50  0000 C CNN
 F 2 "" H 9000 2700 50  0000 C CNN
 F 3 "" H 9000 2700 50  0000 C CNN
@@ -192,6 +192,8 @@ $Comp
 L CRYSTAL_SMD X2
 U 1 1 57BCDC66
 P 10700 1900
+AR Path="/57BCDC66" Ref="X2"  Part="1" 
+AR Path="/57A213D7/57BCDC66" Ref="X2"  Part="1" 
 F 0 "X2" H 10700 2120 50  0000 C CNN
 F 1 "25MHz" H 10700 2029 50  0000 C CNN
 F 2 "Abracon:ABM8G" H 10700 1900 50  0001 C CNN
@@ -214,7 +216,7 @@ Wire Wire Line
 	10900 1600 9700 1600
 Connection ~ 10900 1900
 Wire Wire Line
-	10700 2000 10700 2600
+	10700 2100 10700 2600
 $Comp
 L C C9
 U 1 1 57BCDE27
@@ -250,10 +252,10 @@ Wire Wire Line
 Wire Wire Line
 	10900 2450 10900 2600
 $Comp
-L GND #PWR27
+L GND #PWR07
 U 1 1 57BCDFC0
 P 10500 2600
-F 0 "#PWR27" H 10500 2350 50  0001 C CNN
+F 0 "#PWR07" H 10500 2350 50  0001 C CNN
 F 1 "GND" H 10505 2427 50  0000 C CNN
 F 2 "" H 10500 2600 50  0000 C CNN
 F 3 "" H 10500 2600 50  0000 C CNN
@@ -261,10 +263,10 @@ F 3 "" H 10500 2600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR28
+L GND #PWR08
 U 1 1 57BCDFE7
 P 10700 2600
-F 0 "#PWR28" H 10700 2350 50  0001 C CNN
+F 0 "#PWR08" H 10700 2350 50  0001 C CNN
 F 1 "GND" H 10705 2427 50  0000 C CNN
 F 2 "" H 10700 2600 50  0000 C CNN
 F 3 "" H 10700 2600 50  0000 C CNN
@@ -272,10 +274,10 @@ F 3 "" H 10700 2600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR29
+L GND #PWR09
 U 1 1 57BCE007
 P 10900 2600
-F 0 "#PWR29" H 10900 2350 50  0001 C CNN
+F 0 "#PWR09" H 10900 2350 50  0001 C CNN
 F 1 "GND" H 10905 2427 50  0000 C CNN
 F 2 "" H 10900 2600 50  0000 C CNN
 F 3 "" H 10900 2600 50  0000 C CNN
@@ -301,6 +303,8 @@ $Comp
 L USB_A P2
 U 1 1 57BD5361
 P 1300 5600
+AR Path="/57BD5361" Ref="P2"  Part="1" 
+AR Path="/57A213D7/57BD5361" Ref="P2"  Part="1" 
 F 0 "P2" V 875 5524 50  0000 C CNN
 F 1 "USBA" V 966 5524 50  0000 C CNN
 F 2 "Connect:USB_A" V 1250 5500 50  0001 C CNN
@@ -316,10 +320,10 @@ $EndComp
 Wire Wire Line
 	1700 5700 1700 5900
 $Comp
-L GND #PWR7
+L GND #PWR010
 U 1 1 57BD572C
 P 1700 5900
-F 0 "#PWR7" H 1700 5650 50  0001 C CNN
+F 0 "#PWR010" H 1700 5650 50  0001 C CNN
 F 1 "GND" H 1705 5727 50  0000 C CNN
 F 2 "" H 1700 5900 50  0000 C CNN
 F 3 "" H 1700 5900 50  0000 C CNN
@@ -327,10 +331,10 @@ F 3 "" H 1700 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR5
+L GND #PWR011
 U 1 1 57BD57A2
 P 1200 6800
-F 0 "#PWR5" H 1200 6550 50  0001 C CNN
+F 0 "#PWR011" H 1200 6550 50  0001 C CNN
 F 1 "GND" H 1205 6627 50  0000 C CNN
 F 2 "" H 1200 6800 50  0000 C CNN
 F 3 "" H 1200 6800 50  0000 C CNN
@@ -354,14 +358,14 @@ F 8 "NU" H 6400 6250 60  0000 C CNN "Installed"
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
-	7400 6200 6600 6200
+	6600 6200 7400 6200
 Wire Wire Line
 	6600 6200 6600 6650
 Connection ~ 6600 6400
 Wire Wire Line
 	6200 6100 6200 6650
 Wire Wire Line
-	7400 6100 6200 6100
+	6200 6100 7400 6100
 Connection ~ 6200 6400
 $Comp
 L C C4
@@ -400,10 +404,10 @@ Wire Wire Line
 Wire Wire Line
 	6200 6950 6200 7100
 $Comp
-L GND #PWR19
+L GND #PWR012
 U 1 1 57BD5ABF
 P 6600 7100
-F 0 "#PWR19" H 6600 6850 50  0001 C CNN
+F 0 "#PWR012" H 6600 6850 50  0001 C CNN
 F 1 "GND" H 6605 6927 50  0000 C CNN
 F 2 "" H 6600 7100 50  0000 C CNN
 F 3 "" H 6600 7100 50  0000 C CNN
@@ -411,10 +415,10 @@ F 3 "" H 6600 7100 50  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR16
+L GND #PWR013
 U 1 1 57BD5ACB
 P 6200 7100
-F 0 "#PWR16" H 6200 6850 50  0001 C CNN
+F 0 "#PWR013" H 6200 6850 50  0001 C CNN
 F 1 "GND" H 6205 6927 50  0000 C CNN
 F 2 "" H 6200 7100 50  0000 C CNN
 F 3 "" H 6200 7100 50  0000 C CNN
@@ -426,10 +430,10 @@ Wire Wire Line
 Wire Wire Line
 	7700 4200 7700 4550
 $Comp
-L GND #PWR20
+L GND #PWR014
 U 1 1 57BD5F9C
 P 7700 4550
-F 0 "#PWR20" H 7700 4300 50  0001 C CNN
+F 0 "#PWR014" H 7700 4300 50  0001 C CNN
 F 1 "GND" H 7705 4377 50  0000 C CNN
 F 2 "" H 7700 4550 50  0000 C CNN
 F 3 "" H 7700 4550 50  0000 C CNN
@@ -455,10 +459,10 @@ F 7 "20pin 1.27" H 8450 4450 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR21
+L +3V3 #PWR015
 U 1 1 57BD64FB
 P 8100 3900
-F 0 "#PWR21" H 8100 3750 50  0001 C CNN
+F 0 "#PWR015" H 8100 3750 50  0001 C CNN
 F 1 "+3V3" H 8115 4073 50  0000 C CNN
 F 2 "" H 8100 3900 50  0000 C CNN
 F 3 "" H 8100 3900 50  0000 C CNN
@@ -480,10 +484,10 @@ Wire Wire Line
 Connection ~ 8100 4200
 Connection ~ 8100 4400
 $Comp
-L GND #PWR22
+L GND #PWR016
 U 1 1 57BD6509
 P 8100 5000
-F 0 "#PWR22" H 8100 4750 50  0001 C CNN
+F 0 "#PWR016" H 8100 4750 50  0001 C CNN
 F 1 "GND" H 8105 4827 50  0000 C CNN
 F 2 "" H 8100 5000 50  0000 C CNN
 F 3 "" H 8100 5000 50  0000 C CNN
@@ -585,10 +589,10 @@ $EndComp
 Wire Wire Line
 	6400 1000 6400 1200
 $Comp
-L +3V3 #PWR17
+L +3V3 #PWR017
 U 1 1 57BD79D5
 P 6400 1000
-F 0 "#PWR17" H 6400 850 50  0001 C CNN
+F 0 "#PWR017" H 6400 850 50  0001 C CNN
 F 1 "+3V3" H 6415 1173 50  0000 C CNN
 F 2 "" H 6400 1000 50  0000 C CNN
 F 3 "" H 6400 1000 50  0000 C CNN
@@ -598,10 +602,10 @@ $EndComp
 Wire Wire Line
 	6400 1500 6400 1700
 $Comp
-L GND #PWR18
+L GND #PWR018
 U 1 1 57BD7A91
 P 6400 1700
-F 0 "#PWR18" H 6400 1450 50  0001 C CNN
+F 0 "#PWR018" H 6400 1450 50  0001 C CNN
 F 1 "GND" H 6405 1527 50  0000 C CNN
 F 2 "" H 6400 1700 50  0000 C CNN
 F 3 "" H 6400 1700 50  0000 C CNN
@@ -724,10 +728,10 @@ Wire Wire Line
 Wire Wire Line
 	2300 5300 2300 6100
 $Comp
-L +5V #PWR8
+L +5V #PWR019
 U 1 1 57BF1446
 P 2300 5300
-F 0 "#PWR8" H 2300 5150 50  0001 C CNN
+F 0 "#PWR019" H 2300 5150 50  0001 C CNN
 F 1 "+5V" H 2315 5473 50  0000 C CNN
 F 2 "" H 2300 5300 50  0000 C CNN
 F 3 "" H 2300 5300 50  0000 C CNN
@@ -737,10 +741,10 @@ $EndComp
 Wire Wire Line
 	3100 6600 3100 6700
 $Comp
-L GND #PWR10
+L GND #PWR020
 U 1 1 57BF152D
 P 3100 6700
-F 0 "#PWR10" H 3100 6450 50  0001 C CNN
+F 0 "#PWR020" H 3100 6450 50  0001 C CNN
 F 1 "GND" H 3105 6527 50  0000 C CNN
 F 2 "" H 3100 6700 50  0000 C CNN
 F 3 "" H 3100 6700 50  0000 C CNN
@@ -767,10 +771,10 @@ Connection ~ 2300 5700
 Wire Wire Line
 	2300 6400 2300 6500
 $Comp
-L GND #PWR9
+L GND #PWR021
 U 1 1 57BF205C
 P 2300 6500
-F 0 "#PWR9" H 2300 6250 50  0001 C CNN
+F 0 "#PWR021" H 2300 6250 50  0001 C CNN
 F 1 "GND" H 2305 6327 50  0000 C CNN
 F 2 "" H 2300 6500 50  0000 C CNN
 F 3 "" H 2300 6500 50  0000 C CNN
@@ -841,10 +845,10 @@ Wire Wire Line
 Wire Wire Line
 	11000 1000 11000 1250
 $Comp
-L GND #PWR30
+L GND #PWR022
 U 1 1 57BF96CD
 P 11000 1250
-F 0 "#PWR30" H 11000 1000 50  0001 C CNN
+F 0 "#PWR022" H 11000 1000 50  0001 C CNN
 F 1 "GND" H 11005 1077 50  0000 C CNN
 F 2 "" H 11000 1250 50  0000 C CNN
 F 3 "" H 11000 1250 50  0000 C CNN
@@ -956,10 +960,10 @@ Wire Wire Line
 Wire Wire Line
 	3900 6100 3900 6300
 $Comp
-L GND #PWR12
+L GND #PWR023
 U 1 1 57C76C23
 P 3900 6300
-F 0 "#PWR12" H 3900 6050 50  0001 C CNN
+F 0 "#PWR023" H 3900 6050 50  0001 C CNN
 F 1 "GND" H 3900 6150 50  0000 C CNN
 F 2 "" H 3900 6300 50  0000 C CNN
 F 3 "" H 3900 6300 50  0000 C CNN
@@ -983,10 +987,10 @@ Wire Wire Line
 Wire Wire Line
 	9900 4400 9900 4300
 $Comp
-L +3V3 #PWR25
+L +3V3 #PWR024
 U 1 1 57C78A51
 P 9900 4300
-F 0 "#PWR25" H 9900 4150 50  0001 C CNN
+F 0 "#PWR024" H 9900 4150 50  0001 C CNN
 F 1 "+3V3" H 9900 4440 50  0000 C CNN
 F 2 "" H 9900 4300 50  0000 C CNN
 F 3 "" H 9900 4300 50  0000 C CNN
@@ -1006,10 +1010,10 @@ Wire Wire Line
 Wire Wire Line
 	9900 4600 9900 4700
 $Comp
-L GND #PWR26
+L GND #PWR025
 U 1 1 57C791FC
 P 9900 4700
-F 0 "#PWR26" H 9900 4450 50  0001 C CNN
+F 0 "#PWR025" H 9900 4450 50  0001 C CNN
 F 1 "GND" H 9900 4550 50  0000 C CNN
 F 2 "" H 9900 4700 50  0000 C CNN
 F 3 "" H 9900 4700 50  0000 C CNN
@@ -1107,10 +1111,10 @@ Wire Wire Line
 Wire Wire Line
 	4700 900  4300 900 
 $Comp
-L GND #PWR13
+L GND #PWR026
 U 1 1 57C9DACA
 P 4500 1450
-F 0 "#PWR13" H 4500 1200 50  0001 C CNN
+F 0 "#PWR026" H 4500 1200 50  0001 C CNN
 F 1 "GND" H 4500 1300 50  0000 C CNN
 F 2 "" H 4500 1450 50  0000 C CNN
 F 3 "" H 4500 1450 50  0000 C CNN
@@ -1122,10 +1126,10 @@ Wire Wire Line
 Wire Wire Line
 	4850 1000 4850 800 
 $Comp
-L +3V3 #PWR14
+L +3V3 #PWR027
 U 1 1 57C9DC05
 P 4850 800
-F 0 "#PWR14" H 4850 650 50  0001 C CNN
+F 0 "#PWR027" H 4850 650 50  0001 C CNN
 F 1 "+3V3" H 4850 940 50  0000 C CNN
 F 2 "" H 4850 800 50  0000 C CNN
 F 3 "" H 4850 800 50  0000 C CNN
@@ -1135,10 +1139,10 @@ $EndComp
 Wire Wire Line
 	5050 800  5050 1200
 $Comp
-L +5V #PWR15
+L +5V #PWR028
 U 1 1 57C9DD42
 P 5050 800
-F 0 "#PWR15" H 5050 650 50  0001 C CNN
+F 0 "#PWR028" H 5050 650 50  0001 C CNN
 F 1 "+5V" H 5050 940 50  0000 C CNN
 F 2 "" H 5050 800 50  0000 C CNN
 F 3 "" H 5050 800 50  0000 C CNN
@@ -1171,6 +1175,8 @@ $Comp
 L USB_OTG P1
 U 1 1 57CD820F
 P 1000 4600
+AR Path="/57CD820F" Ref="P1"  Part="1" 
+AR Path="/57A213D7/57CD820F" Ref="P1"  Part="1" 
 F 0 "P1" H 1325 4475 50  0000 C CNN
 F 1 "USB_OTG" H 1000 4800 50  0000 C CNN
 F 2 "Molex_USB:47589-0001" V 950 4500 50  0001 C CNN
@@ -1192,10 +1198,10 @@ Wire Wire Line
 Wire Wire Line
 	1400 4800 1400 4900
 $Comp
-L GND #PWR6
+L GND #PWR029
 U 1 1 57CD8F63
 P 1400 4900
-F 0 "#PWR6" H 1400 4650 50  0001 C CNN
+F 0 "#PWR029" H 1400 4650 50  0001 C CNN
 F 1 "GND" H 1400 4750 50  0000 C CNN
 F 2 "" H 1400 4900 50  0000 C CNN
 F 3 "" H 1400 4900 50  0000 C CNN
@@ -1251,10 +1257,10 @@ Wire Wire Line
 Wire Wire Line
 	3900 4400 3900 4500
 $Comp
-L GND #PWR11
+L GND #PWR030
 U 1 1 57CD995C
 P 3900 4500
-F 0 "#PWR11" H 3900 4250 50  0001 C CNN
+F 0 "#PWR030" H 3900 4250 50  0001 C CNN
 F 1 "GND" H 3900 4350 50  0000 C CNN
 F 2 "" H 3900 4500 50  0000 C CNN
 F 3 "" H 3900 4500 50  0000 C CNN
diff --git a/brain/poe.sch b/brain/poe.sch
index eb2034ea4d363641aa19c4650bbaff6e1d0e076e..3cd2ecf5e3105bb7993fffab2e220a492fd47669 100644
--- a/brain/poe.sch
+++ b/brain/poe.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 5 8
-Title "AAA Controller"
+Title "POE"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -217,10 +217,10 @@ F 7 "Diode 200V, Vf=.92V, 1A" H 6050 1600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR58
+L GNDREF #PWR044
 U 1 1 57CAA6A0
 P 6500 1600
-F 0 "#PWR58" H 6500 1350 50  0001 C CNN
+F 0 "#PWR044" H 6500 1350 50  0001 C CNN
 F 1 "GNDREF" H 6500 1450 50  0000 C CNN
 F 2 "" H 6500 1600 50  0000 C CNN
 F 3 "" H 6500 1600 50  0000 C CNN
@@ -303,10 +303,10 @@ F 7 ".25W, 1%, 1206" H 6300 3150 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR57
+L GNDREF #PWR045
 U 1 1 57CAB8DB
 P 6300 3400
-F 0 "#PWR57" H 6300 3150 50  0001 C CNN
+F 0 "#PWR045" H 6300 3150 50  0001 C CNN
 F 1 "GNDREF" H 6300 3250 50  0000 C CNN
 F 2 "" H 6300 3400 50  0000 C CNN
 F 3 "" H 6300 3400 50  0000 C CNN
@@ -341,10 +341,10 @@ F 4 "NU" H 3900 3050 60  0000 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR51
+L GNDREF #PWR046
 U 1 1 57CABC22
 P 4000 3400
-F 0 "#PWR51" H 4000 3150 50  0001 C CNN
+F 0 "#PWR046" H 4000 3150 50  0001 C CNN
 F 1 "GNDREF" H 4000 3250 50  0000 C CNN
 F 2 "" H 4000 3400 50  0000 C CNN
 F 3 "" H 4000 3400 50  0000 C CNN
@@ -367,10 +367,10 @@ F 7 "10%, 25V, X7R, 100nF, 0603" H 8100 1600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR46
+L GNDREF #PWR047
 U 1 1 57CAC289
 P 1700 3400
-F 0 "#PWR46" H 1700 3150 50  0001 C CNN
+F 0 "#PWR047" H 1700 3150 50  0001 C CNN
 F 1 "GNDREF" H 1700 3250 50  0000 C CNN
 F 2 "" H 1700 3400 50  0000 C CNN
 F 3 "" H 1700 3400 50  0000 C CNN
@@ -378,10 +378,10 @@ F 3 "" H 1700 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR49
+L GNDREF #PWR048
 U 1 1 57CACAA9
 P 3300 3400
-F 0 "#PWR49" H 3300 3150 50  0001 C CNN
+F 0 "#PWR048" H 3300 3150 50  0001 C CNN
 F 1 "GNDREF" H 3300 3250 50  0000 C CNN
 F 2 "" H 3300 3400 50  0000 C CNN
 F 3 "" H 3300 3400 50  0000 C CNN
@@ -389,10 +389,10 @@ F 3 "" H 3300 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR45
+L GNDREF #PWR049
 U 1 1 57CACB08
 P 1500 3400
-F 0 "#PWR45" H 1500 3150 50  0001 C CNN
+F 0 "#PWR049" H 1500 3150 50  0001 C CNN
 F 1 "GNDREF" H 1500 3250 50  0000 C CNN
 F 2 "" H 1500 3400 50  0000 C CNN
 F 3 "" H 1500 3400 50  0000 C CNN
@@ -415,10 +415,10 @@ F 7 "10%, 16V, X7R, 68nF, 0603" H 8100 1600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR48
+L GNDREF #PWR050
 U 1 1 57CAD20E
 P 2300 3400
-F 0 "#PWR48" H 2300 3150 50  0001 C CNN
+F 0 "#PWR050" H 2300 3150 50  0001 C CNN
 F 1 "GNDREF" H 2300 3250 50  0000 C CNN
 F 2 "" H 2300 3400 50  0000 C CNN
 F 3 "" H 2300 3400 50  0000 C CNN
@@ -441,10 +441,10 @@ F 7 "1% 75V 0603" H 5950 1900 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR47
+L GNDREF #PWR051
 U 1 1 57CAD59D
 P 2000 3400
-F 0 "#PWR47" H 2000 3150 50  0001 C CNN
+F 0 "#PWR051" H 2000 3150 50  0001 C CNN
 F 1 "GNDREF" H 2000 3250 50  0000 C CNN
 F 2 "" H 2000 3400 50  0000 C CNN
 F 3 "" H 2000 3400 50  0000 C CNN
@@ -528,10 +528,10 @@ F 7 "100V, X7R, 10%, 1uF, 1210" H 4900 1350 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR54
+L GNDREF #PWR052
 U 1 1 57CB9252
 P 4900 1600
-F 0 "#PWR54" H 4900 1350 50  0001 C CNN
+F 0 "#PWR052" H 4900 1350 50  0001 C CNN
 F 1 "GNDREF" H 4900 1450 50  0000 C CNN
 F 2 "" H 4900 1600 50  0000 C CNN
 F 3 "" H 4900 1600 50  0000 C CNN
@@ -539,10 +539,10 @@ F 3 "" H 4900 1600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR52
+L GNDREF #PWR053
 U 1 1 57CB9310
 P 4100 1600
-F 0 "#PWR52" H 4100 1350 50  0001 C CNN
+F 0 "#PWR053" H 4100 1350 50  0001 C CNN
 F 1 "GNDREF" H 4100 1450 50  0000 C CNN
 F 2 "" H 4100 1600 50  0000 C CNN
 F 3 "" H 4100 1600 50  0000 C CNN
@@ -580,10 +580,10 @@ F 7 "N-Channel MOSFET 150V 15A 62W" H 6200 2600 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR53
+L GNDREF #PWR054
 U 1 1 57CBC75B
 P 4400 2400
-F 0 "#PWR53" H 4400 2150 50  0001 C CNN
+F 0 "#PWR054" H 4400 2150 50  0001 C CNN
 F 1 "GNDREF" H 4400 2250 50  0000 C CNN
 F 2 "" H 4400 2400 50  0000 C CNN
 F 3 "" H 4400 2400 50  0000 C CNN
@@ -640,10 +640,10 @@ Feedback
 Text Label 4800 5200 2    60   ~ 0
 VBias
 $Comp
-L GNDREF #PWR55
+L GNDREF #PWR055
 U 1 1 57CBF981
 P 5100 6400
-F 0 "#PWR55" H 5100 6150 50  0001 C CNN
+F 0 "#PWR055" H 5100 6150 50  0001 C CNN
 F 1 "GNDREF" H 5100 6250 50  0000 C CNN
 F 2 "" H 5100 6400 50  0000 C CNN
 F 3 "" H 5100 6400 50  0000 C CNN
@@ -651,10 +651,10 @@ F 3 "" H 5100 6400 50  0000 C CNN
 	-1   0    0    -1  
 $EndComp
 $Comp
-L GND #PWR61
+L GND #PWR056
 U 1 1 57CC1F93
 P 7900 3400
-F 0 "#PWR61" H 7900 3150 50  0001 C CNN
+F 0 "#PWR056" H 7900 3150 50  0001 C CNN
 F 1 "GND" H 7900 3250 50  0000 C CNN
 F 2 "" H 7900 3400 50  0000 C CNN
 F 3 "" H 7900 3400 50  0000 C CNN
@@ -677,10 +677,10 @@ F 7 "100V, X7R, 10%, 1uF, 1210" H 4900 1350 60  0001 C CNN "Description"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR56
+L GNDREF #PWR057
 U 1 1 57CC3FB6
 P 5200 1600
-F 0 "#PWR56" H 5200 1350 50  0001 C CNN
+F 0 "#PWR057" H 5200 1350 50  0001 C CNN
 F 1 "GNDREF" H 5200 1450 50  0000 C CNN
 F 2 "" H 5200 1600 50  0000 C CNN
 F 3 "" H 5200 1600 50  0000 C CNN
@@ -1091,10 +1091,10 @@ $EndComp
 Wire Wire Line
 	1200 7200 2900 7200
 $Comp
-L GND #PWR44
+L GND #PWR058
 U 1 1 57CC93D4
 P 1200 7300
-F 0 "#PWR44" H 1200 7050 50  0001 C CNN
+F 0 "#PWR058" H 1200 7050 50  0001 C CNN
 F 1 "GND" H 1200 7150 50  0000 C CNN
 F 2 "" H 1200 7300 50  0000 C CNN
 F 3 "" H 1200 7300 50  0000 C CNN
@@ -1263,10 +1263,10 @@ Connection ~ 9400 1800
 Wire Wire Line
 	9400 2800 9400 3400
 $Comp
-L GND #PWR64
+L GND #PWR059
 U 1 1 57CD17B2
 P 9400 3400
-F 0 "#PWR64" H 9400 3150 50  0001 C CNN
+F 0 "#PWR059" H 9400 3150 50  0001 C CNN
 F 1 "GND" H 9400 3250 50  0000 C CNN
 F 2 "" H 9400 3400 50  0000 C CNN
 F 3 "" H 9400 3400 50  0000 C CNN
@@ -1274,10 +1274,10 @@ F 3 "" H 9400 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR63
+L GND #PWR060
 U 1 1 57CD1851
 P 9100 3400
-F 0 "#PWR63" H 9100 3150 50  0001 C CNN
+F 0 "#PWR060" H 9100 3150 50  0001 C CNN
 F 1 "GND" H 9100 3250 50  0000 C CNN
 F 2 "" H 9100 3400 50  0000 C CNN
 F 3 "" H 9100 3400 50  0000 C CNN
@@ -1285,10 +1285,10 @@ F 3 "" H 9100 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR62
+L GND #PWR061
 U 1 1 57CD18E9
 P 8800 3400
-F 0 "#PWR62" H 8800 3150 50  0001 C CNN
+F 0 "#PWR061" H 8800 3150 50  0001 C CNN
 F 1 "GND" H 8800 3250 50  0000 C CNN
 F 2 "" H 8800 3400 50  0000 C CNN
 F 3 "" H 8800 3400 50  0000 C CNN
@@ -1324,10 +1324,10 @@ Connection ~ 1600 6300
 Wire Wire Line
 	3300 5800 3300 5900
 $Comp
-L GND #PWR50
+L GND #PWR062
 U 1 1 57CD1424
 P 3300 5900
-F 0 "#PWR50" H 3300 5650 50  0001 C CNN
+F 0 "#PWR062" H 3300 5650 50  0001 C CNN
 F 1 "GND" H 3300 5750 50  0000 C CNN
 F 2 "" H 3300 5900 50  0000 C CNN
 F 3 "" H 3300 5900 50  0000 C CNN
@@ -1358,10 +1358,10 @@ F 4 "OB" H 9850 3400 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR65
+L GND #PWR063
 U 1 1 57D3D575
 P 9850 3400
-F 0 "#PWR65" H 9850 3150 50  0001 C CNN
+F 0 "#PWR063" H 9850 3150 50  0001 C CNN
 F 1 "GND" H 9850 3250 50  0000 C CNN
 F 2 "" H 9850 3400 50  0000 C CNN
 F 3 "" H 9850 3400 50  0000 C CNN
@@ -1381,10 +1381,10 @@ F 4 "OB" H 10100 3400 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR66
+L GND #PWR064
 U 1 1 57D3D62C
 P 10100 3400
-F 0 "#PWR66" H 10100 3150 50  0001 C CNN
+F 0 "#PWR064" H 10100 3150 50  0001 C CNN
 F 1 "GND" H 10100 3250 50  0000 C CNN
 F 2 "" H 10100 3400 50  0000 C CNN
 F 3 "" H 10100 3400 50  0000 C CNN
@@ -1404,10 +1404,10 @@ F 4 "OB" H 10350 3400 60  0001 C CNN "Installed"
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR67
+L GND #PWR065
 U 1 1 57D3E12A
 P 10350 3400
-F 0 "#PWR67" H 10350 3150 50  0001 C CNN
+F 0 "#PWR065" H 10350 3150 50  0001 C CNN
 F 1 "GND" H 10350 3250 50  0000 C CNN
 F 2 "" H 10350 3400 50  0000 C CNN
 F 3 "" H 10350 3400 50  0000 C CNN
@@ -1415,10 +1415,10 @@ F 3 "" H 10350 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GNDREF #PWR59
+L GNDREF #PWR066
 U 1 1 57D3FC8A
 P 6800 3400
-F 0 "#PWR59" H 6800 3150 50  0001 C CNN
+F 0 "#PWR066" H 6800 3150 50  0001 C CNN
 F 1 "GNDREF" H 6800 3250 50  0000 C CNN
 F 2 "" H 6800 3400 50  0000 C CNN
 F 3 "" H 6800 3400 50  0000 C CNN
@@ -1426,10 +1426,10 @@ F 3 "" H 6800 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR60
+L GND #PWR067
 U 1 1 57D3FD98
 P 7300 3400
-F 0 "#PWR60" H 7300 3150 50  0001 C CNN
+F 0 "#PWR067" H 7300 3150 50  0001 C CNN
 F 1 "GND" H 7300 3250 50  0000 C CNN
 F 2 "" H 7300 3400 50  0000 C CNN
 F 3 "" H 7300 3400 50  0000 C CNN
diff --git a/brain/power.sch b/brain/power.sch
index 2b4c91b0b5e4c6b9c6619c3a283a81898ebd0cc3..fbca47cfcb39476185aac6723d92b44167c5f54c 100644
--- a/brain/power.sch
+++ b/brain/power.sch
@@ -60,10 +60,10 @@ EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 6 8
-Title "AAA Controller"
+Title "Power"
 Date "2016-09-09"
 Rev "0.5"
-Comp "BM"
+Comp "BetaMachine"
 Comment1 "Brain"
 Comment2 "AAA Control Backend"
 Comment3 "Nipo"
@@ -109,10 +109,10 @@ Wire Wire Line
 Wire Wire Line
 	2000 3700 2000 3800
 $Comp
-L GND #PWR68
+L GND #PWR068
 U 1 1 57C95C71
 P 2000 3800
-F 0 "#PWR68" H 2000 3550 50  0001 C CNN
+F 0 "#PWR068" H 2000 3550 50  0001 C CNN
 F 1 "GND" H 2000 3650 50  0000 C CNN
 F 2 "" H 2000 3800 50  0000 C CNN
 F 3 "" H 2000 3800 50  0000 C CNN
@@ -177,10 +177,10 @@ Wire Wire Line
 	7250 3650 7350 3650
 Connection ~ 7250 3500
 $Comp
-L GND #PWR75
+L GND #PWR069
 U 1 1 57C963C8
 P 6900 4550
-F 0 "#PWR75" H 6900 4300 50  0001 C CNN
+F 0 "#PWR069" H 6900 4300 50  0001 C CNN
 F 1 "GND" H 6900 4400 50  0000 C CNN
 F 2 "" H 6900 4550 50  0000 C CNN
 F 3 "" H 6900 4550 50  0000 C CNN
@@ -194,10 +194,10 @@ Wire Wire Line
 Wire Wire Line
 	7700 4450 7700 4550
 $Comp
-L GND #PWR77
+L GND #PWR070
 U 1 1 57C963C9
 P 7700 4550
-F 0 "#PWR77" H 7700 4300 50  0001 C CNN
+F 0 "#PWR070" H 7700 4300 50  0001 C CNN
 F 1 "GND" H 7700 4400 50  0000 C CNN
 F 2 "" H 7700 4550 50  0000 C CNN
 F 3 "" H 7700 4550 50  0000 C CNN
@@ -207,10 +207,10 @@ $EndComp
 Wire Wire Line
 	9050 4200 9050 4550
 $Comp
-L GND #PWR81
+L GND #PWR071
 U 1 1 57C963CA
 P 9050 4550
-F 0 "#PWR81" H 9050 4300 50  0001 C CNN
+F 0 "#PWR071" H 9050 4300 50  0001 C CNN
 F 1 "GND" H 9050 4400 50  0000 C CNN
 F 2 "" H 9050 4550 50  0000 C CNN
 F 3 "" H 9050 4550 50  0000 C CNN
@@ -255,10 +255,10 @@ Wire Wire Line
 	8600 3950 8450 3950
 Connection ~ 8600 3950
 $Comp
-L GND #PWR76
+L GND #PWR072
 U 1 1 57C963CC
 P 7250 4550
-F 0 "#PWR76" H 7250 4300 50  0001 C CNN
+F 0 "#PWR072" H 7250 4300 50  0001 C CNN
 F 1 "GND" H 7258 4376 50  0000 C CNN
 F 2 "" H 7250 4550 50  0000 C CNN
 F 3 "" H 7250 4550 50  0000 C CNN
@@ -266,10 +266,10 @@ F 3 "" H 7250 4550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR79
+L GND #PWR073
 U 1 1 57C963CD
 P 8600 4550
-F 0 "#PWR79" H 8600 4300 50  0001 C CNN
+F 0 "#PWR073" H 8600 4300 50  0001 C CNN
 F 1 "GND" H 8608 4376 50  0000 C CNN
 F 2 "" H 8600 4550 50  0000 C CNN
 F 3 "" H 8600 4550 50  0000 C CNN
@@ -277,10 +277,10 @@ F 3 "" H 8600 4550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR78
+L GND #PWR074
 U 1 1 57C963CE
 P 8100 4550
-F 0 "#PWR78" H 8100 4300 50  0001 C CNN
+F 0 "#PWR074" H 8100 4300 50  0001 C CNN
 F 1 "GND" H 8108 4376 50  0000 C CNN
 F 2 "" H 8100 4550 50  0000 C CNN
 F 3 "" H 8100 4550 50  0000 C CNN
@@ -310,10 +310,10 @@ Connection ~ 3800 3500
 Wire Wire Line
 	3800 4200 3800 4550
 $Comp
-L GND #PWR69
+L GND #PWR075
 U 1 1 57C963D0
 P 3800 4550
-F 0 "#PWR69" H 3800 4300 50  0001 C CNN
+F 0 "#PWR075" H 3800 4300 50  0001 C CNN
 F 1 "GND" H 3800 4400 50  0000 C CNN
 F 2 "" H 3800 4550 50  0000 C CNN
 F 3 "" H 3800 4550 50  0000 C CNN
@@ -321,10 +321,10 @@ F 3 "" H 3800 4550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR73
+L +5V #PWR076
 U 1 1 57C963D1
 P 6450 3400
-F 0 "#PWR73" H 6450 3250 50  0001 C CNN
+F 0 "#PWR076" H 6450 3250 50  0001 C CNN
 F 1 "+5V" H 6450 3540 50  0000 C CNN
 F 2 "" H 6450 3400 50  0000 C CNN
 F 3 "" H 6450 3400 50  0000 C CNN
@@ -349,10 +349,10 @@ $EndComp
 Wire Wire Line
 	6450 4200 6450 4550
 $Comp
-L GND #PWR74
+L GND #PWR077
 U 1 1 57C963D3
 P 6450 4550
-F 0 "#PWR74" H 6450 4300 50  0001 C CNN
+F 0 "#PWR077" H 6450 4300 50  0001 C CNN
 F 1 "GND" H 6450 4400 50  0000 C CNN
 F 2 "" H 6450 4550 50  0000 C CNN
 F 3 "" H 6450 4550 50  0000 C CNN
@@ -380,10 +380,10 @@ Connection ~ 6450 3500
 Wire Wire Line
 	5100 4175 5100 4550
 $Comp
-L GND #PWR71
+L GND #PWR078
 U 1 1 57C963D5
 P 5100 4550
-F 0 "#PWR71" H 5100 4300 50  0001 C CNN
+F 0 "#PWR078" H 5100 4300 50  0001 C CNN
 F 1 "GND" H 5108 4376 50  0000 C CNN
 F 2 "" H 5100 4550 50  0000 C CNN
 F 3 "" H 5100 4550 50  0000 C CNN
@@ -401,19 +401,19 @@ F 1 "Schottky" V 5796 4379 50  0000 L CNN
 F 2 "Diodes_SMD:SMA_Standard" V 5842 4379 50  0001 L CNN
 F 3 "" H 5750 4300 50  0000 C CNN
 F 4 "Diodes Inc" H 5750 4300 60  0001 C CNN "MFN"
-F 5 "B260AQ-13-F" H 5750 4300 60  0001 C CNN "MFP"
-F 6 "621-B260AQ-13-F" H 5750 4300 60  0001 C CNN "S1PN"
-F 7 "2A Schottky" H 5750 4300 60  0001 C CNN "Description"
+F 5 "B340A-13-F" H 5750 4300 60  0001 C CNN "MFP"
+F 6 "621-B340A-13-F" H 5750 4300 60  0001 C CNN "S1PN"
+F 7 "3A Schottky, Vf=500mV, SMA" H 5750 4300 60  0001 C CNN "Description"
 	1    5750 4300
 	0    1    1    0   
 $EndComp
 Wire Wire Line
 	5750 4450 5750 4550
 $Comp
-L GND #PWR72
+L GND #PWR079
 U 1 1 57C963D7
 P 5750 4550
-F 0 "#PWR72" H 5750 4300 50  0001 C CNN
+F 0 "#PWR079" H 5750 4300 50  0001 C CNN
 F 1 "GND" H 5758 4376 50  0000 C CNN
 F 2 "" H 5750 4550 50  0000 C CNN
 F 3 "" H 5750 4550 50  0000 C CNN
@@ -448,10 +448,10 @@ Wire Wire Line
 Wire Wire Line
 	4500 3900 4500 4550
 $Comp
-L GND #PWR70
+L GND #PWR080
 U 1 1 57C963D9
 P 4500 4550
-F 0 "#PWR70" H 4500 4300 50  0001 C CNN
+F 0 "#PWR080" H 4500 4300 50  0001 C CNN
 F 1 "GND" H 4508 4376 50  0000 C CNN
 F 2 "" H 4500 4550 50  0000 C CNN
 F 3 "" H 4500 4550 50  0000 C CNN
@@ -470,10 +470,10 @@ Connection ~ 4100 3500
 Text HLabel 4200 3200 2    60   UnSpc ~ 0
 VCan
 $Comp
-L +3V3 #PWR80
+L +3V3 #PWR081
 U 1 1 57CD3AD7
 P 9050 3400
-F 0 "#PWR80" H 9050 3250 50  0001 C CNN
+F 0 "#PWR081" H 9050 3250 50  0001 C CNN
 F 1 "+3V3" H 9050 3540 50  0000 C CNN
 F 2 "" H 9050 3400 50  0000 C CNN
 F 3 "" H 9050 3400 50  0000 C CNN
diff --git a/pinky/can.sch b/pinky/can.sch
index b1211805a28f014ef165cf8ecc83e219d0796ad3..6f470c818beaefa72d735aa4a8b3911e2a14caf3 100644
--- a/pinky/can.sch
+++ b/pinky/can.sch
@@ -63,13 +63,15 @@ Rev ""
 Comp "BetaMachine"
 Comment1 "Pinky"
 Comment2 "AAA User Frontend"
-Comment3 ""
+Comment3 "Nipo"
 Comment4 ""
 $EndDescr
 $Comp
 L CRYSTAL_SMD X2
 U 1 1 57A48096
 P 4700 5350
+AR Path="/57A48096" Ref="X2"  Part="1" 
+AR Path="/57A213A9/57A48096" Ref="X2"  Part="1" 
 F 0 "X2" H 4700 5616 50  0000 C CNN
 F 1 "16MHz" H 4700 5524 50  0000 C CNN
 F 2 "Abracon:ABM8G" H 4700 5350 50  0001 C CNN
@@ -322,7 +324,7 @@ Wire Wire Line
 	5000 5000 5000 5600
 Connection ~ 5000 5350
 Wire Wire Line
-	4700 5450 4700 6000
+	4700 5550 4700 6000
 Wire Wire Line
 	3650 5550 3750 5550
 Wire Wire Line
diff --git a/pinky/lcd.sch b/pinky/lcd.sch
index b92eb8bd23e677cf333b5501994f052f916f061e..32110e41c5c1a34252757c6801f6c173a9a82663 100644
--- a/pinky/lcd.sch
+++ b/pinky/lcd.sch
@@ -63,7 +63,7 @@ Rev ""
 Comp "BetaMachine"
 Comment1 "Pinky"
 Comment2 "AAA User Frontend"
-Comment3 ""
+Comment3 "Nipo"
 Comment4 ""
 $EndDescr
 Wire Wire Line
diff --git a/pinky/mcu.sch b/pinky/mcu.sch
index 417f643295275a7f5d778d42ff269006b83a8a71..7d07612031147863f3f8c88b316081a03a86f33e 100644
--- a/pinky/mcu.sch
+++ b/pinky/mcu.sch
@@ -63,7 +63,7 @@ Rev ""
 Comp "BetaMachine"
 Comment1 "Pinky"
 Comment2 "AAA User Frontend"
-Comment3 ""
+Comment3 "Nipo"
 Comment4 ""
 $EndDescr
 $Comp
@@ -188,7 +188,7 @@ $EndComp
 Wire Wire Line
 	4450 4650 4450 4600
 Wire Wire Line
-	4350 4600 4600 4600
+	3800 4600 4600 4600
 Wire Wire Line
 	4450 4950 4450 5050
 Connection ~ 4450 4600
@@ -314,73 +314,73 @@ Wire Wire Line
 Wire Wire Line
 	5100 5100 4950 5100
 Wire Bus Line
-	3150 2550 5800 2550
+	3250 2500 5800 2500
 Entry Wire Line
-	5800 2550 5900 2650
+	5800 2500 5900 2600
 Entry Wire Line
-	5700 2550 5800 2650
+	5700 2500 5800 2600
 Entry Wire Line
-	5600 2550 5700 2650
+	5600 2500 5700 2600
 Entry Wire Line
-	5500 2550 5600 2650
+	5500 2500 5600 2600
 Entry Wire Line
-	5400 2550 5500 2650
+	5400 2500 5500 2600
 Entry Wire Line
-	5100 2550 5200 2650
+	5100 2500 5200 2600
 Entry Wire Line
-	5000 2550 5100 2650
+	5000 2500 5100 2600
 Wire Wire Line
-	5100 2650 5100 3000
+	5100 2600 5100 3000
 Wire Wire Line
-	5200 2650 5200 3000
+	5200 2600 5200 3000
 Wire Wire Line
-	5500 2650 5500 3000
+	5500 2600 5500 3000
 Wire Wire Line
-	5600 2650 5600 3000
+	5600 2600 5600 3000
 Wire Wire Line
-	5700 2650 5700 3000
+	5700 2600 5700 3000
 Wire Wire Line
-	5800 2650 5800 3000
+	5800 2600 5800 3000
 Wire Wire Line
-	5900 2650 5900 3000
+	5900 2600 5900 3000
 Wire Bus Line
-	3850 2550 3850 5500
+	3900 2500 3900 5500
 Entry Wire Line
-	3850 3600 3950 3700
+	3900 3600 4000 3700
 Entry Wire Line
-	3850 3700 3950 3800
+	3900 3700 4000 3800
 Entry Wire Line
-	3850 3800 3950 3900
+	3900 3800 4000 3900
 Entry Wire Line
-	3850 3900 3950 4000
+	3900 3900 4000 4000
 Entry Wire Line
-	3850 4000 3950 4100
+	3900 4000 4000 4100
 Entry Wire Line
-	3850 4100 3950 4200
+	3900 4100 4000 4200
 Entry Wire Line
-	3850 4200 3950 4300
+	3900 4200 4000 4300
 Entry Wire Line
-	3850 4300 3950 4400
+	3900 4300 4000 4400
 Entry Wire Line
-	3850 4400 3950 4500
+	3900 4400 4000 4500
 Wire Wire Line
-	3950 4500 4600 4500
+	4000 4500 4600 4500
 Wire Wire Line
-	4600 4400 3950 4400
+	4600 4400 4000 4400
 Wire Wire Line
-	3950 4300 4600 4300
+	4000 4300 4600 4300
 Wire Wire Line
-	4600 4200 3950 4200
+	4600 4200 4000 4200
 Wire Wire Line
-	3950 4100 4600 4100
+	4000 4100 4600 4100
 Wire Wire Line
-	4600 4000 3950 4000
+	4600 4000 4000 4000
 Wire Wire Line
-	3950 3900 4600 3900
+	4000 3900 4600 3900
 Wire Wire Line
-	4600 3800 3950 3800
+	4600 3800 4000 3800
 Wire Wire Line
-	3950 3700 4600 3700
+	4000 3700 4600 3700
 Wire Wire Line
 	6200 5050 6200 5300
 Wire Wire Line
@@ -426,7 +426,7 @@ Wire Wire Line
 Wire Bus Line
 	7050 5500 7050 4400
 Wire Bus Line
-	3850 5500 7050 5500
+	3900 5500 7050 5500
 Entry Wire Line
 	6950 4300 7050 4400
 Entry Wire Line
@@ -444,43 +444,43 @@ Wire Wire Line
 Wire Wire Line
 	6700 4300 6950 4300
 Wire Wire Line
-	4500 3050 4500 3500
+	4500 3000 4500 3500
 Wire Wire Line
 	4450 3200 4500 3200
 Connection ~ 4500 3200
-Text Label 4200 2550 0    60   ~ 0
+Text Label 4200 2500 0    60   ~ 0
 P[0..30]
-Text Label 5900 2650 3    60   ~ 0
+Text Label 5900 2600 3    60   ~ 0
 P21
-Text Label 5800 2650 3    60   ~ 0
+Text Label 5800 2600 3    60   ~ 0
 P22
-Text Label 5700 2650 3    60   ~ 0
+Text Label 5700 2600 3    60   ~ 0
 P23
-Text Label 5600 2650 3    60   ~ 0
+Text Label 5600 2600 3    60   ~ 0
 P24
-Text Label 5500 2650 3    60   ~ 0
+Text Label 5500 2600 3    60   ~ 0
 P25
-Text Label 5200 2650 3    60   ~ 0
+Text Label 5200 2600 3    60   ~ 0
 P28
-Text Label 5100 2650 3    60   ~ 0
+Text Label 5100 2600 3    60   ~ 0
 P29
-Text Label 3950 3700 0    60   ~ 0
+Text Label 4000 3700 0    60   ~ 0
 P30
-Text Label 3950 3800 0    60   ~ 0
+Text Label 4000 3800 0    60   ~ 0
 P0
-Text Label 3950 3900 0    60   ~ 0
+Text Label 4000 3900 0    60   ~ 0
 P1
-Text Label 3950 4000 0    60   ~ 0
+Text Label 4000 4000 0    60   ~ 0
 P2
-Text Label 3950 4100 0    60   ~ 0
+Text Label 4000 4100 0    60   ~ 0
 P3
-Text Label 3950 4200 0    60   ~ 0
+Text Label 4000 4200 0    60   ~ 0
 P4
-Text Label 3950 4300 0    60   ~ 0
+Text Label 4000 4300 0    60   ~ 0
 P5
-Text Label 3950 4400 0    60   ~ 0
+Text Label 4000 4400 0    60   ~ 0
 P6
-Text Label 3950 4500 0    60   ~ 0
+Text Label 4000 4500 0    60   ~ 0
 P7
 Text Label 5200 5400 1    60   ~ 0
 P8
@@ -512,11 +512,9 @@ Text HLabel 6450 5300 2    60   Input ~ 0
 SWDCLK
 Text HLabel 6450 5400 2    60   Input ~ 0
 SWDIO
-Text HLabel 3200 2550 0    60   BiDi ~ 0
+Text HLabel 3250 2500 0    60   BiDi ~ 0
 P[0..30]
-Text HLabel 4500 3050 2    60   BiDi ~ 0
-VCC_nRF
-Text HLabel 4350 4600 0    60   BiDi ~ 0
+Text HLabel 3250 2600 0    60   BiDi ~ 0
 VCC_nRF
 Wire Wire Line
 	6000 1950 6850 1950
@@ -537,7 +535,7 @@ Wire Wire Line
 Wire Wire Line
 	7150 3250 7300 3250
 Wire Wire Line
-	6700 3000 6850 3000
+	3800 3000 6850 3000
 Connection ~ 6800 3000
 Connection ~ 7300 3250
 Wire Wire Line
@@ -578,19 +576,19 @@ $Comp
 L CRYSTAL_SMD Y1
 U 1 1 56C251A9
 P 6450 2500
+AR Path="/56C251A9" Ref="Y1"  Part="1" 
+AR Path="/57A213A4/56C251A9" Ref="Y1"  Part="1" 
 F 0 "Y1" H 6450 2700 50  0000 C CNN
 F 1 "32MHz" H 6450 2600 50  0000 C CNN
 F 2 "Abracon:ABM8G" H 6450 2500 50  0001 C CNN
 F 3 "" H 6450 2500 50  0000 C CNN
 F 4 "Abracon" H 5450 1800 60  0001 C CNN "MFN"
-F 5 "ABM8G-32.000MHZ-B4Y-T" H 5450 1800 60  0001 C CNN "MFP"
-F 6 "815-ABM8G-32-B4Y-T" H 5450 1800 60  0001 C CNN "S1PN"
-F 7 "10pF 30ppm -20C +70C" H 6450 2500 60  0001 C CNN "Description"
+F 5 "ABM8G-20.000MHZ-18-D2Y-T" H 5450 1800 60  0001 C CNN "MFP"
+F 6 "815-ABM8G-20-18D2Y" H 5450 1800 60  0001 C CNN "S1PN"
+F 7 "18pF 30ppm -40C +85C" H 6450 2500 60  0001 C CNN "Description"
 	1    6450 2500
 	0    -1   1    0   
 $EndComp
-Text Label 6700 3000 2    60   ~ 0
-VCC_nRF
 $Comp
 L GND #PWR042
 U 1 1 56C4274B
@@ -603,7 +601,7 @@ F 3 "" H 6750 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6550 2500 6750 2500
+	6650 2500 6750 2500
 Wire Wire Line
 	6750 2500 6750 2550
 Wire Wire Line
@@ -663,18 +661,22 @@ Wire Wire Line
 	8650 4200 8850 4200
 Connection ~ 8850 4200
 NoConn ~ 4600 3600
-Text Label 4500 3125 1    60   ~ 0
-VCC_nRF
 Entry Wire Line
-	5200 2550 5300 2650
+	5200 2500 5300 2600
 Entry Wire Line
-	5300 2550 5400 2650
+	5300 2500 5400 2600
 Wire Wire Line
-	5300 2650 5300 3000
+	5300 2600 5300 3000
 Wire Wire Line
-	5400 3000 5400 2650
-Text Label 5300 2650 3    60   ~ 0
+	5400 3000 5400 2600
+Text Label 5300 2600 3    60   ~ 0
 P27
-Text Label 5400 2650 3    60   ~ 0
+Text Label 5400 2600 3    60   ~ 0
 P26
+Wire Wire Line
+	3800 4600 3800 2600
+Wire Wire Line
+	3800 2600 3250 2600
+Connection ~ 3800 3000
+Connection ~ 4500 3000
 $EndSCHEMATC
diff --git a/pinky/nfc.sch b/pinky/nfc.sch
index 8fdfe73ec7c039f0dd98e639fbace769d23d4c80..038cd84330dbcb88d15ac32c29fafbffc04ab253 100644
--- a/pinky/nfc.sch
+++ b/pinky/nfc.sch
@@ -63,13 +63,15 @@ Rev ""
 Comp "BetaMachine"
 Comment1 "Pinky"
 Comment2 "AAA User Frontend"
-Comment3 ""
+Comment3 "Nipo"
 Comment4 ""
 $EndDescr
 $Comp
 L CRYSTAL_SMD X1
 U 1 1 57A4A651
 P 5225 4850
+AR Path="/57A4A651" Ref="X1"  Part="1" 
+AR Path="/57A213A5/57A4A651" Ref="X1"  Part="1" 
 F 0 "X1" H 5225 5116 50  0000 C CNN
 F 1 "27.12MHz" H 5225 5024 50  0000 C CNN
 F 2 "Abracon:ABM11" H 5225 4850 50  0001 C CNN
diff --git a/pinky/pinky.kicad_pcb b/pinky/pinky.kicad_pcb
index 0407c13ca910f85a7e9ac1b4c1fa95cf2f229e1c..888054c866114f82f5f18b08488a761e86439054 100644
--- a/pinky/pinky.kicad_pcb
+++ b/pinky/pinky.kicad_pcb
@@ -1,15 +1,15 @@
-(kicad_pcb (version 4) (host pcbnew "(2016-08-05 BZR 7009)-product")
+(kicad_pcb (version 4) (host pcbnew 4.1.0-alpha+201605061002+6775~44~ubuntu14.04.1-product)
 
   (general
-    (links 265)
-    (no_connects 26)
+    (links 259)
+    (no_connects 27)
     (area 59.949999 79.949999 140.050001 130.050001)
     (thickness 1.6)
     (drawings 25)
     (tracks 1104)
     (zones 0)
     (modules 84)
-    (nets 85)
+    (nets 86)
   )
 
   (page A4)
@@ -30,7 +30,7 @@
     (45 Margin user)
     (46 B.CrtYd user)
     (47 F.CrtYd user)
-    (48 B.Fab user hide)
+    (48 B.Fab user)
     (49 F.Fab user)
   )
 
@@ -178,6 +178,7 @@
   (net 82 "Net-(LCD1-Pad3)")
   (net 83 "Net-(Q1-Pad1)")
   (net 84 "Net-(LCD1-Pad16)")
+  (net 85 "Net-(X1-Pad3)")
 
   (net_class Default "This is the default net class."
     (clearance 0.1524)
@@ -268,6 +269,7 @@
     (add_net "Net-(U3-Pad2)")
     (add_net "Net-(U3-Pad31)")
     (add_net "Net-(U3-Pad32)")
+    (add_net "Net-(X1-Pad3)")
   )
 
   (net_class Power ""
@@ -534,7 +536,7 @@
     (fp_text reference R4 (at -0.1 14.2 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 3R (at 0 0.11777 270) (layer B.Fab)
+    (fp_text value 0R (at 0 0.11777 270) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -563,7 +565,7 @@
     (fp_text reference R3 (at -0.1 -14.2 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 3R (at 0 0.01777 90) (layer B.Fab)
+    (fp_text value 0R (at 0 0.01777 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -650,7 +652,7 @@
     (fp_text reference C1 (at 0.4 1.5) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 100nF (at 0.35 0.1) (layer B.Fab)
+    (fp_text value 100nF (at 0.582 -0.602) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -824,7 +826,7 @@
     (fp_text reference C14 (at -14.771 0.03377) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value "TDB Matching" (at -5.5 -0.03223) (layer B.Fab)
+    (fp_text value 33pF (at -2.96 -0.03223) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -853,7 +855,7 @@
     (fp_text reference C15 (at -14.8 0.26777) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value "TDB Matching" (at -5.5 0.40777) (layer B.Fab)
+    (fp_text value 33pF (at -2.198 0.91577) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -882,7 +884,7 @@
     (fp_text reference C16 (at 0.06577 14.533 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value "TDB Matching" (at -0.44223 8.31 360) (layer B.Fab)
+    (fp_text value 56pF (at 0.57377 -0.072 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -911,7 +913,7 @@
     (fp_text reference C17 (at -0.00523 14.533 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value "TDB Matching" (at 1.13777 8.31 360) (layer B.Fab)
+    (fp_text value 56pF (at 0.37577 -0.072 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -1073,7 +1075,7 @@
     (fp_text reference C3 (at -0.097 1.588) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 100nF (at 1.3 0.05) (layer B.Fab)
+    (fp_text value 100nF (at 1.554 0.05) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -1830,7 +1832,7 @@
     (pad 16 thru_hole oval (at 38.1 0 180) (size 1.8 2.6) (drill 1.2) (layers *.Cu *.Mask F.SilkS)
       (net 84 "Net-(LCD1-Pad16)"))
     (pad 0 thru_hole circle (at -5.4991 0 180) (size 3 3) (drill 2.5) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND) (zone_connect 2))
+      (zone_connect 2))
     (pad 0 thru_hole circle (at -5.4991 31.0007 180) (size 3 3) (drill 2.5) (layers *.Cu *.Mask F.SilkS))
     (pad 0 thru_hole circle (at 69.49948 31.0007 180) (size 3 3) (drill 2.5) (layers *.Cu *.Mask F.SilkS))
     (pad 0 thru_hole circle (at 69.49948 0 180) (size 3 3) (drill 2.5) (layers *.Cu *.Mask F.SilkS))
@@ -1935,7 +1937,7 @@
     (fp_text reference R8 (at 0 -1.524) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10K (at -0.05 0) (layer B.Fab)
+    (fp_text value 10k (at -0.05 0) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.3 0.8) (end 1.3 0.8) (layer B.CrtYd) (width 0.05))
@@ -1991,11 +1993,11 @@
     (pad 5 smd circle (at 1.27 0.635 90) (size 0.762 0.762) (layers F.Cu F.Mask)
       (net 1 GND) (solder_mask_margin 0.1) (zone_connect 2))
     (pad "" thru_hole circle (at -2.54 0 90) (size 0.9 0.9) (drill 0.9) (layers *.Cu *.Mask)
-      (net 1 GND) (zone_connect 2))
+      (zone_connect 2))
     (pad "" thru_hole circle (at 2.54 1.016 90) (size 0.9 0.9) (drill 0.9) (layers *.Cu *.Mask)
-      (net 1 GND) (zone_connect 2))
+      (zone_connect 2))
     (pad "" thru_hole circle (at 2.54 -1.016 90) (size 0.9 0.9) (drill 0.9) (layers *.Cu *.Mask)
-      (net 1 GND) (zone_connect 2))
+      (zone_connect 2))
     (pad 6 smd circle (at 1.27 -0.635 90) (size 0.762 0.762) (layers F.Cu F.Mask)
       (net 15 /P19) (solder_mask_margin 0.1))
   )
@@ -2817,7 +2819,7 @@
     )
     (fp_circle (center 0 0) (end 3 0) (layer F.SilkS) (width 0.05))
     (pad "" thru_hole circle (at 0 0) (size 3 3) (drill 3) (layers *.Cu *.Mask)
-      (net 1 GND) (clearance 0.5) (zone_connect 2))
+      (clearance 0.5) (zone_connect 2))
   )
 
   (module Solder_Bridge:3Way_Open (layer F.Cu) (tedit 57AB4226) (tstamp 57AB5B65)
@@ -3450,7 +3452,7 @@
     (fp_text reference X1 (at 0 -1.8) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 27.12MHz (at 1.85 -0.22) (layer B.Fab)
+    (fp_text value 27.12MHz (at 2.866 -0.22) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.2 -1.1) (end -1.2 1.1) (layer B.CrtYd) (width 0.05))
@@ -3458,11 +3460,11 @@
     (fp_line (start 1.2 1.1) (end 1.2 -1.1) (layer B.CrtYd) (width 0.05))
     (fp_line (start -1.2 1.1) (end 1.2 1.1) (layer B.CrtYd) (width 0.05))
     (pad 3 smd rect (at -0.65 0.55) (size 0.75 0.65) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+      (net 85 "Net-(X1-Pad3)"))
     (pad 2 smd rect (at 0.65 0.55) (size 0.75 0.65) (layers B.Cu B.Paste B.Mask)
       (net 47 "Net-(C8-Pad1)"))
     (pad 3 smd rect (at 0.65 -0.55) (size 0.75 0.65) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
+      (net 85 "Net-(X1-Pad3)"))
     (pad 1 smd rect (at -0.65 -0.55) (size 0.75 0.65) (layers B.Cu B.Paste B.Mask)
       (net 59 "Net-(C6-Pad1)"))
     (model /Users/nipo/projects/hardware/kicad-library/Abracon.3dshapes/ABM8G.wrl
@@ -3954,16 +3956,6 @@
   (segment (start 99.73223 100) (end 99.75 99.98223) (width 0.4) (layer B.Cu) (net 1))
   (via (at 99.75 99.98223) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 1))
   (segment (start 96.45 100) (end 97 100) (width 0.4) (layer B.Cu) (net 1))
-  (segment (start 114.05 94) (end 116.9 94) (width 0.1524) (layer F.Cu) (net 1))
-  (segment (start 116.9 94) (end 118.5 92.4) (width 0.1524) (layer F.Cu) (net 1))
-  (via (at 118.5 92.4) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 1))
-  (segment (start 113.1 93.65) (end 113.7 93.65) (width 0.1524) (layer B.Cu) (net 1))
-  (segment (start 113.7 93.65) (end 114.05 94) (width 0.1524) (layer B.Cu) (net 1))
-  (via (at 114.05 94) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 1))
-  (segment (start 111.8 94.75) (end 111.8 95.3) (width 0.1524) (layer B.Cu) (net 1))
-  (segment (start 111.8 95.3) (end 111.55 95.55) (width 0.1524) (layer B.Cu) (net 1))
-  (segment (start 111.55 95.55) (end 111.1 95.55) (width 0.1524) (layer B.Cu) (net 1))
-  (via (at 111.1 95.55) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 1))
   (segment (start 94.4 87.2) (end 92.5 85.3) (width 0.1524) (layer B.Cu) (net 1))
   (segment (start 92.5 85.3) (end 92.5 81.25) (width 0.1524) (layer B.Cu) (net 1))
   (segment (start 92.5 81.25) (end 92.65 81.1) (width 0.1524) (layer B.Cu) (net 1))
@@ -4992,6 +4984,16 @@
   (segment (start 94 82.6) (end 94 85.518) (width 0.4) (layer B.Cu) (net 84))
   (segment (start 94 85.518) (end 95.734 87.252) (width 0.4) (layer B.Cu) (net 84))
   (segment (start 95.734 87.252) (end 96.384 87.252) (width 0.4) (layer B.Cu) (net 84))
+  (segment (start 114.05 94) (end 116.9 94) (width 0.1524) (layer F.Cu) (net 85))
+  (segment (start 116.9 94) (end 118.5 92.4) (width 0.1524) (layer F.Cu) (net 85))
+  (via (at 118.5 92.4) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 85))
+  (segment (start 113.1 93.65) (end 113.7 93.65) (width 0.1524) (layer B.Cu) (net 85))
+  (segment (start 113.7 93.65) (end 114.05 94) (width 0.1524) (layer B.Cu) (net 85))
+  (via (at 114.05 94) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 85))
+  (segment (start 111.8 94.75) (end 111.8 95.3) (width 0.1524) (layer B.Cu) (net 85))
+  (segment (start 111.8 95.3) (end 111.55 95.55) (width 0.1524) (layer B.Cu) (net 85))
+  (segment (start 111.55 95.55) (end 111.1 95.55) (width 0.1524) (layer B.Cu) (net 85))
+  (via (at 111.1 95.55) (size 0.61) (drill 0.3) (layers F.Cu B.Cu) (net 85))
 
   (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 57AAA014) (hatch edge 0.508)
     (connect_pads (clearance 0.2))
diff --git a/pinky/pinky.sch b/pinky/pinky.sch
index 80d8d67979544cb00b451c474a68d6e2f2f4bc67..1abd87db42e2415dd689596100a15f16514aba59 100644
--- a/pinky/pinky.sch
+++ b/pinky/pinky.sch
@@ -63,7 +63,7 @@ Rev ""
 Comp "BetaMachine"
 Comment1 "Pinky"
 Comment2 "AAA User Frontend"
-Comment3 ""
+Comment3 "Nipo"
 Comment4 ""
 $EndDescr
 $Sheet
diff --git a/pinky/power.sch b/pinky/power.sch
index 30bd1a7e96554b7725d70443fe32d340809f5d99..4a8803a0436abdb4e0c43468faf6dc9f772d7b3f 100644
--- a/pinky/power.sch
+++ b/pinky/power.sch
@@ -63,7 +63,7 @@ Rev ""
 Comp "BetaMachine"
 Comment1 "Pinky"
 Comment2 "AAA User Frontend"
-Comment3 ""
+Comment3 "Nipo"
 Comment4 ""
 $EndDescr
 Wire Wire Line
@@ -361,9 +361,9 @@ F 1 "Schottky" V 6046 2979 50  0000 L CNN
 F 2 "Diodes_SMD:SMA_Standard" V 6092 2979 50  0001 L CNN
 F 3 "" H 6000 2900 50  0000 C CNN
 F 4 "Diodes Inc" H 6000 2900 60  0001 C CNN "MFN"
-F 5 "B260AQ-13-F" H 6000 2900 60  0001 C CNN "MFP"
-F 6 "621-B260AQ-13-F" H 6000 2900 60  0001 C CNN "S1PN"
-F 7 "2A Schottky" H 6000 2900 60  0001 C CNN "Description"
+F 5 "B340A-13-F" H 6000 2900 60  0001 C CNN "MFP"
+F 6 "621-B340A-13-F" H 6000 2900 60  0001 C CNN "S1PN"
+F 7 "3A Schottky, Vf=500mV, SMA" H 6000 2900 60  0001 C CNN "Description"
 	1    6000 2900
 	0    1    1    0   
 $EndComp