diff --git a/blinkey.bak b/blinkey.bak
index 2600e22..2f61645 100644
--- a/blinkey.bak
+++ b/blinkey.bak
@@ -106,7 +106,7 @@ L CONN_02X01 BTN1
 U 1 1 58D66056
 P 3100 2950
 F 0 "BTN1" H 3100 3050 50  0000 C CNN
-F 1 "FIRE1" H 2600 2950 50  0000 C CNN
+F 1 "PTS645" H 2550 2950 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1750 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1750 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 2950 60  0001 C CNN "MFG_URL"
@@ -727,7 +727,7 @@ L CONN_02X01 BTN2
 U 1 1 5A556C72
 P 3100 3150
 F 0 "BTN2" H 3100 3250 50  0000 C CNN
-F 1 "FIRE2" H 2600 3150 50  0000 C CNN
+F 1 "PTS645" H 2550 3150 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1950 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1950 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3150 60  0001 C CNN "MFG_URL"
@@ -741,7 +741,7 @@ L CONN_02X01 BTN3
 U 1 1 5A556E0A
 P 3100 3350
 F 0 "BTN3" H 3100 3450 50  0000 C CNN
-F 1 "UP" H 2600 3350 50  0000 C CNN
+F 1 "PTS645" H 2550 3350 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2150 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2150 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3350 60  0001 C CNN "MFG_URL"
@@ -755,7 +755,7 @@ L CONN_02X01 BTN4
 U 1 1 5A556FAC
 P 3100 3550
 F 0 "BTN4" H 3100 3650 50  0000 C CNN
-F 1 "DOWN" H 2600 3550 50  0000 C CNN
+F 1 "PTS645" H 2550 3550 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2350 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2350 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3550 60  0001 C CNN "MFG_URL"
@@ -769,7 +769,7 @@ L CONN_02X01 BTN5
 U 1 1 5A557167
 P 3100 3750
 F 0 "BTN5" H 3100 3850 50  0000 C CNN
-F 1 "LEFT" H 2600 3750 50  0000 C CNN
+F 1 "PTS645" H 2550 3750 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2550 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2550 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3750 60  0001 C CNN "MFG_URL"
@@ -783,7 +783,7 @@ L CONN_02X01 BTN6
 U 1 1 5A557341
 P 3100 3950
 F 0 "BTN6" H 3100 4050 50  0000 C CNN
-F 1 "RIGHT" H 2600 3950 50  0000 C CNN
+F 1 "PTS645" H 2550 3950 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2750 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2750 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3950 60  0001 C CNN "MFG_URL"
@@ -794,4 +794,16 @@ F 6 "www.mouser.com" H 3100 3950 60  0001 C CNN "Distributor1_URL"
 $EndComp
 Text Notes 6400 5900 0    60   ~ 0
 GPIO2 on PCB v1.7
+Text Notes 2100 3000 0    60   ~ 0
+FIRE1
+Text Notes 2100 3200 0    60   ~ 0
+FIRE2
+Text Notes 2100 3400 0    60   ~ 0
+UP
+Text Notes 2100 3600 0    60   ~ 0
+DOWN
+Text Notes 2100 3800 0    60   ~ 0
+LEFT
+Text Notes 2100 4000 0    60   ~ 0
+RIGHT
 $EndSCHEMATC
diff --git a/blinkey.sch b/blinkey.sch
index 2600e22..2f61645 100644
--- a/blinkey.sch
+++ b/blinkey.sch
@@ -106,7 +106,7 @@ L CONN_02X01 BTN1
 U 1 1 58D66056
 P 3100 2950
 F 0 "BTN1" H 3100 3050 50  0000 C CNN
-F 1 "FIRE1" H 2600 2950 50  0000 C CNN
+F 1 "PTS645" H 2550 2950 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1750 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1750 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 2950 60  0001 C CNN "MFG_URL"
@@ -727,7 +727,7 @@ L CONN_02X01 BTN2
 U 1 1 5A556C72
 P 3100 3150
 F 0 "BTN2" H 3100 3250 50  0000 C CNN
-F 1 "FIRE2" H 2600 3150 50  0000 C CNN
+F 1 "PTS645" H 2550 3150 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 1950 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 1950 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3150 60  0001 C CNN "MFG_URL"
@@ -741,7 +741,7 @@ L CONN_02X01 BTN3
 U 1 1 5A556E0A
 P 3100 3350
 F 0 "BTN3" H 3100 3450 50  0000 C CNN
-F 1 "UP" H 2600 3350 50  0000 C CNN
+F 1 "PTS645" H 2550 3350 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2150 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2150 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3350 60  0001 C CNN "MFG_URL"
@@ -755,7 +755,7 @@ L CONN_02X01 BTN4
 U 1 1 5A556FAC
 P 3100 3550
 F 0 "BTN4" H 3100 3650 50  0000 C CNN
-F 1 "DOWN" H 2600 3550 50  0000 C CNN
+F 1 "PTS645" H 2550 3550 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2350 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2350 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3550 60  0001 C CNN "MFG_URL"
@@ -769,7 +769,7 @@ L CONN_02X01 BTN5
 U 1 1 5A557167
 P 3100 3750
 F 0 "BTN5" H 3100 3850 50  0000 C CNN
-F 1 "LEFT" H 2600 3750 50  0000 C CNN
+F 1 "PTS645" H 2550 3750 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2550 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2550 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3750 60  0001 C CNN "MFG_URL"
@@ -783,7 +783,7 @@ L CONN_02X01 BTN6
 U 1 1 5A557341
 P 3100 3950
 F 0 "BTN6" H 3100 4050 50  0000 C CNN
-F 1 "RIGHT" H 2600 3950 50  0000 C CNN
+F 1 "PTS645" H 2550 3950 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 3100 2750 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 3100 2750 50  0001 C CNN
 F 4 "www.ckswitches.com" H 3100 3950 60  0001 C CNN "MFG_URL"
@@ -794,4 +794,16 @@ F 6 "www.mouser.com" H 3100 3950 60  0001 C CNN "Distributor1_URL"
 $EndComp
 Text Notes 6400 5900 0    60   ~ 0
 GPIO2 on PCB v1.7
+Text Notes 2100 3000 0    60   ~ 0
+FIRE1
+Text Notes 2100 3200 0    60   ~ 0
+FIRE2
+Text Notes 2100 3400 0    60   ~ 0
+UP
+Text Notes 2100 3600 0    60   ~ 0
+DOWN
+Text Notes 2100 3800 0    60   ~ 0
+LEFT
+Text Notes 2100 4000 0    60   ~ 0
+RIGHT
 $EndSCHEMATC
diff --git a/flash.bak b/flash.bak
index 2348a7a..4cce651 100644
--- a/flash.bak
+++ b/flash.bak
@@ -483,7 +483,8 @@ F 0 "U1" H 6400 3800 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 6400 3700 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 5350 3800 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/ApplicationNotes/EH/TN1260.pdf" H 5350 3800 60  0001 C CNN
-F 4 "www.mouser.com" H 6400 2850 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 6400 2850 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 6400 2850 60  0001 C CNN "Distributor1_URL"
 	7    6400 2850
 	1    0    0    -1  
 $EndComp
diff --git a/flash.sch b/flash.sch
index 2348a7a..4cce651 100644
--- a/flash.sch
+++ b/flash.sch
@@ -483,7 +483,8 @@ F 0 "U1" H 6400 3800 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 6400 3700 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 5350 3800 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/ApplicationNotes/EH/TN1260.pdf" H 5350 3800 60  0001 C CNN
-F 4 "www.mouser.com" H 6400 2850 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 6400 2850 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 6400 2850 60  0001 C CNN "Distributor1_URL"
 	7    6400 2850
 	1    0    0    -1  
 $EndComp
diff --git a/gpdi.bak b/gpdi.bak
index 75a3a82..f072d7c 100644
--- a/gpdi.bak
+++ b/gpdi.bak
@@ -469,7 +469,8 @@ F 0 "U1" H 6250 3750 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 6250 3650 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 5200 3750 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 5200 3750 60  0001 C CNN
-F 4 "www.mouser.com" H 6250 2800 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 6250 2800 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 6250 2800 60  0001 C CNN "Distributor1_URL"
 	2    6250 2800
 	1    0    0    -1  
 $EndComp
diff --git a/gpdi.sch b/gpdi.sch
index 75a3a82..f072d7c 100644
--- a/gpdi.sch
+++ b/gpdi.sch
@@ -469,7 +469,8 @@ F 0 "U1" H 6250 3750 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 6250 3650 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 5200 3750 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 5200 3750 60  0001 C CNN
-F 4 "www.mouser.com" H 6250 2800 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 6250 2800 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 6250 2800 60  0001 C CNN "Distributor1_URL"
 	2    6250 2800
 	1    0    0    -1  
 $EndComp
diff --git a/gpio.bak b/gpio.bak
index ad95048..8c5b1c5 100644
--- a/gpio.bak
+++ b/gpio.bak
@@ -651,7 +651,8 @@ F 0 "U1" H 4900 5700 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 4900 5600 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 3850 5700 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 3850 5700 60  0001 C CNN
-F 4 "www.mouser.com" H 4900 4750 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 4900 4750 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 4900 4750 60  0001 C CNN "Distributor1_URL"
 	6    4900 4750
 	1    0    0    -1  
 $EndComp
@@ -665,7 +666,8 @@ F 0 "U1" H 4950 3450 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 4950 3350 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 3900 3450 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 3900 3450 60  0001 C CNN
-F 4 "www.mouser.com" H 4950 2500 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 4950 2500 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 4950 2500 60  0001 C CNN "Distributor1_URL"
 	1    4950 2500
 	1    0    0    -1  
 $EndComp
diff --git a/gpio.sch b/gpio.sch
index ad95048..8c5b1c5 100644
--- a/gpio.sch
+++ b/gpio.sch
@@ -651,7 +651,8 @@ F 0 "U1" H 4900 5700 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 4900 5600 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 3850 5700 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 3850 5700 60  0001 C CNN
-F 4 "www.mouser.com" H 4900 4750 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 4900 4750 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 4900 4750 60  0001 C CNN "Distributor1_URL"
 	6    4900 4750
 	1    0    0    -1  
 $EndComp
@@ -665,7 +666,8 @@ F 0 "U1" H 4950 3450 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 4950 3350 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 3900 3450 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 3900 3450 60  0001 C CNN
-F 4 "www.mouser.com" H 4950 2500 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 4950 2500 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 4950 2500 60  0001 C CNN "Distributor1_URL"
 	1    4950 2500
 	1    0    0    -1  
 $EndComp
diff --git a/power.bak b/power.bak
index 5cad54f..9610731 100644
--- a/power.bak
+++ b/power.bak
@@ -948,7 +948,7 @@ L CONN_02X01 BTN0
 U 1 1 58E83FE0
 P 2200 4300
 F 0 "BTN0" H 2200 4400 50  0000 C CNN
-F 1 "POWER" H 2200 4200 50  0000 C CNN
+F 1 "PTS645" H 2200 4200 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 2200 3100 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 2200 3100 50  0001 C CNN
 F 4 "www.ckswitches.com" H 2200 4300 60  0001 C CNN "MFG_URL"
@@ -1898,7 +1898,8 @@ F 0 "U1" H 5750 7350 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 5750 7250 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 4700 7350 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/ApplicationNotes/EH/TN1261.pdf?document_id=50463" H 4700 7350 60  0001 C CNN
-F 4 "www.mouser.com" H 5750 6400 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 5750 6400 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 5750 6400 60  0001 C CNN "Distributor1_URL"
 	8    5750 6400
 	1    0    0    -1  
 $EndComp
diff --git a/power.sch b/power.sch
index 5cad54f..8c9282b 100644
--- a/power.sch
+++ b/power.sch
@@ -67,21 +67,6 @@ F 3 "" H 5000 2400 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L AP3429A U3
-U 1 1 58D58840
-P 8100 3100
-F 0 "U3" H 8100 3250 60  0000 C CNN
-F 1 "DIO6015" H 8100 3150 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8100 3100 60  0001 C CNN
-F 3 "http://www.dioo.com/attachments/files/20161031180022_361.pdf" H 8100 3100 60  0001 C CNN
-F 4 "www.dioo.com" H 8100 3100 60  0001 C CNN "MFG_URL"
-F 5 "DIO6015CST5" H 8100 3100 60  0001 C CNN "MFG_PN"
-F 6 "www.mouser.com" H 8100 3100 60  0001 C CNN "Distributor1_URL"
-F 7 "453-DIO6015CST5" H 8100 3100 60  0001 C CNN "Distributor1_PN"
-	1    8100 3100
-	1    0    0    -1  
-$EndComp
-$Comp
 L GND #PWR030
 U 1 1 58D58A0B
 P 8100 3600
@@ -218,21 +203,6 @@ F 3 "" H 4750 650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L AP3429A U4
-U 1 1 58D62946
-P 8100 4300
-F 0 "U4" H 8100 4450 60  0000 C CNN
-F 1 "LX7172" H 8100 4350 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8100 4300 60  0001 C CNN
-F 3 "https://www.microsemi.com/document-portal/doc_view/132307-lx7172-lx7172a-datasheet" H 8100 4300 60  0001 C CNN
-F 4 "www.microsemi.com" H 8100 4300 60  0001 C CNN "MFG_URL"
-F 5 "LX7172ISE" H 8100 4300 60  0001 C CNN "MFG_PN"
-F 6 "www.mouser.com" H 8100 4300 60  0001 C CNN "Distributor1_URL"
-F 7 "494-LX7172ISE" H 8100 4300 60  0001 C CNN "Distributor1_PN"
-	1    8100 4300
-	1    0    0    -1  
-$EndComp
-$Comp
 L GND #PWR035
 U 1 1 58D6294C
 P 8100 6000
@@ -948,7 +918,7 @@ L CONN_02X01 BTN0
 U 1 1 58E83FE0
 P 2200 4300
 F 0 "BTN0" H 2200 4400 50  0000 C CNN
-F 1 "POWER" H 2200 4200 50  0000 C CNN
+F 1 "PTS645" H 2200 4200 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 2200 3100 50  0001 C CNN
 F 3 "http://www.ckswitches.com/media/1471/pts645.pdf" H 2200 3100 50  0001 C CNN
 F 4 "www.ckswitches.com" H 2200 4300 60  0001 C CNN "MFG_URL"
@@ -1898,7 +1868,8 @@ F 0 "U1" H 5750 7350 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 5750 7250 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 4700 7350 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/ApplicationNotes/EH/TN1261.pdf?document_id=50463" H 4700 7350 60  0001 C CNN
-F 4 "www.mouser.com" H 5750 6400 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 5750 6400 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 5750 6400 60  0001 C CNN "Distributor1_URL"
 	8    5750 6400
 	1    0    0    -1  
 $EndComp
@@ -1958,4 +1929,34 @@ F 3 "" H 4900 3750 50  0000 C CNN
 	1    4900 3750
 	1    0    0    -1  
 $EndComp
+$Comp
+L AP3429A U4
+U 1 1 5A57BC36
+P 8100 4300
+F 0 "U4" H 8100 4450 60  0000 C CNN
+F 1 "TLV62569DBV" H 8100 4350 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 8100 4300 60  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/tlv62569.pdf" H 8100 4300 60  0001 C CNN
+F 4 "www.ti.com" H 8100 4300 60  0001 C CNN "MFG_URL"
+F 5 "TLV62569DBV" H 8100 4300 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 8100 4300 60  0001 C CNN "Distributor1_URL"
+F 7 "595-TLV62569DBVR" H 8100 4300 60  0001 C CNN "Distributor1_PN"
+	1    8100 4300
+	1    0    0    -1  
+$EndComp
+$Comp
+L AP3429A U3
+U 1 1 5A57BFD7
+P 8100 3100
+F 0 "U3" H 8100 3250 60  0000 C CNN
+F 1 "TLV62569DBV" H 8100 3150 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 8100 3100 60  0001 C CNN
+F 3 "http://www.ti.com/lit/ds/symlink/tlv62569.pdf" H 8100 3100 60  0001 C CNN
+F 4 "www.ti.com" H 8100 3100 60  0001 C CNN "MFG_URL"
+F 5 "TLV62569DBV" H 8100 3100 60  0001 C CNN "MFG_PN"
+F 6 "www.mouser.com" H 8100 3100 60  0001 C CNN "Distributor1_URL"
+F 7 "595-TLV62569DBVR" H 8100 3100 60  0001 C CNN "Distributor1_PN"
+	1    8100 3100
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC
diff --git a/ram.bak b/ram.bak
index d13b1eb..26a6105 100644
--- a/ram.bak
+++ b/ram.bak
@@ -401,7 +401,8 @@ F 0 "U1" H 9300 4100 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 9300 4000 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8250 4100 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 8250 4100 60  0001 C CNN
-F 4 "www.mouser.com" H 9300 3150 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 9300 3150 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 9300 3150 60  0001 C CNN "Distributor1_URL"
 	3    9300 3150
 	1    0    0    -1  
 $EndComp
@@ -415,7 +416,8 @@ F 0 "U1" H 9300 6200 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 9300 6100 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8250 6200 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 8250 6200 60  0001 C CNN
-F 4 "www.mouser.com" H 9300 5250 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 9300 5250 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 9300 5250 60  0001 C CNN "Distributor1_URL"
 	4    9300 5250
 	1    0    0    -1  
 $EndComp
diff --git a/ram.sch b/ram.sch
index d13b1eb..26a6105 100644
--- a/ram.sch
+++ b/ram.sch
@@ -401,7 +401,8 @@ F 0 "U1" H 9300 4100 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 9300 4000 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8250 4100 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 8250 4100 60  0001 C CNN
-F 4 "www.mouser.com" H 9300 3150 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 9300 3150 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 9300 3150 60  0001 C CNN "Distributor1_URL"
 	3    9300 3150
 	1    0    0    -1  
 $EndComp
@@ -415,7 +416,8 @@ F 0 "U1" H 9300 6200 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 9300 6100 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8250 6200 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 8250 6200 60  0001 C CNN
-F 4 "www.mouser.com" H 9300 5250 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 9300 5250 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 9300 5250 60  0001 C CNN "Distributor1_URL"
 	4    9300 5250
 	1    0    0    -1  
 $EndComp
diff --git a/sdcard.bak b/sdcard.bak
index 661ad5c..5037101 100644
--- a/sdcard.bak
+++ b/sdcard.bak
@@ -130,7 +130,7 @@ Connection ~ 3150 3300
 Text Label 3250 3300 0    60   ~ 0
 SD3V3
 $Comp
-L CP C15
+L C C15
 U 1 1 590C7447
 P 3150 3500
 F 0 "C15" H 3175 3600 50  0000 L CNN
diff --git a/sdcard.sch b/sdcard.sch
index 661ad5c..5037101 100644
--- a/sdcard.sch
+++ b/sdcard.sch
@@ -130,7 +130,7 @@ Connection ~ 3150 3300
 Text Label 3250 3300 0    60   ~ 0
 SD3V3
 $Comp
-L CP C15
+L C C15
 U 1 1 590C7447
 P 3150 3500
 F 0 "C15" H 3175 3600 50  0000 L CNN
diff --git a/ulx3s-cache.lib b/ulx3s-cache.lib
index 35f9725..0b07d52 100644
--- a/ulx3s-cache.lib
+++ b/ulx3s-cache.lib
@@ -303,29 +303,6 @@ X P39 39 -250 -950 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CP
-#
-DEF CP C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "CP" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- CP_*
-$ENDFPLIST
-DRAW
-S -90 20 -90 40 0 1 0 N
-S -90 20 90 20 0 1 0 N
-S 90 -20 -90 -40 0 1 0 F
-S 90 40 -90 40 0 1 0 N
-S 90 40 90 20 0 1 0 N
-P 2 0 1 0 -70 90 -30 90 N
-P 2 0 1 0 -50 110 -50 70 N
-X ~ 1 0 150 110 D 50 50 1 1 P
-X ~ 2 0 -150 110 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Crystal_GND23
 #
 DEF Crystal_GND23 Y 0 40 Y N 1 F N
diff --git a/usb.bak b/usb.bak
index 0af2046..7f6a391 100644
--- a/usb.bak
+++ b/usb.bak
@@ -657,7 +657,8 @@ F 0 "U1" H 9400 3000 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 9400 2900 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8350 3000 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 8350 3000 60  0001 C CNN
-F 4 "www.mouser.com" H 9400 2050 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 9400 2050 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 9400 2050 60  0001 C CNN "Distributor1_URL"
 	5    9400 2050
 	1    0    0    -1  
 $EndComp
@@ -671,7 +672,8 @@ F 0 "U1" H 8550 4350 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 8550 4250 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 7550 4900 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 7550 4900 60  0001 C CNN
-F 4 "www.mouser.com" H 8600 3950 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 8600 3950 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 8600 3950 60  0001 C CNN "Distributor1_URL"
 	10   8600 3950
 	-1   0    0    -1  
 $EndComp
diff --git a/usb.sch b/usb.sch
index 0af2046..7f6a391 100644
--- a/usb.sch
+++ b/usb.sch
@@ -657,7 +657,8 @@ F 0 "U1" H 9400 3000 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 9400 2900 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8350 3000 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 8350 3000 60  0001 C CNN
-F 4 "www.mouser.com" H 9400 2050 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 9400 2050 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 9400 2050 60  0001 C CNN "Distributor1_URL"
 	5    9400 2050
 	1    0    0    -1  
 $EndComp
@@ -671,7 +672,8 @@ F 0 "U1" H 8550 4350 60  0000 C CNN
 F 1 "LFE5U-45F-6BG381C" H 8550 4250 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 7550 4900 60  0001 C CNN
 F 3 "http://www.latticesemi.com/~/media/LatticeSemi/Documents/DataSheets/ECP5/FPGA-DS-02012.pdf" H 7550 4900 60  0001 C CNN
-F 4 "www.mouser.com" H 8600 3950 60  0001 C CNN "Distributor1_URL"
+F 4 "LFE5U-45F-6BG381C" H 8600 3950 60  0001 C CNN "MFG_PN"
+F 5 "www.mouser.com" H 8600 3950 60  0001 C CNN "Distributor1_URL"
 	10   8600 3950
 	-1   0    0    -1  
 $EndComp
diff --git a/wifi.bak b/wifi.bak
index d0a346a..8f95fae 100644
--- a/wifi.bak
+++ b/wifi.bak
@@ -222,7 +222,7 @@ F 3 "" H 3650 3250 50  0000 C CNN
 $EndComp
 Text Notes 7350 4650 0    60   ~ 0
 WiFi and SDcard connected to\nBANK6 on "usb" sheet
-Text Notes 8500 4200 0    60   ~ 0
+Text Notes 8750 4200 0    60   ~ 0
 Strapping pins\n(avoid using to avoid\nboot problems)\nGPIO0,2,4,5,12,15
 Text Notes 2750 5350 0    60   ~ 0
 ESP32 ADC capable pins\nGPIO36,39,34,35,32,33,25,26,27,\nGPIO14,12,13,15 - shared with HSPI/JTAG\nConnected to BANK7 on "gpio" sheet
@@ -322,4 +322,6 @@ Text Notes 8150 3750 0    60   ~ 0
 WIFI_GPIO15 v1.7
 Text Notes 8150 3850 0    60   ~ 0
 NC v1.7
+Text Notes 8150 4050 0    60   ~ 0
+NC v1.7
 $EndSCHEMATC