diff --git a/hardware/solar-breakout/Parts.md b/hardware/solar-breakout/Parts.md
index 7cfc5cb..207ac6d 100644
--- a/hardware/solar-breakout/Parts.md
+++ b/hardware/solar-breakout/Parts.md
@@ -7,7 +7,7 @@
 | Part | Description | Supplier | Quantity Required | Notes
 | ---  | ---         | ---       | ---               | ---
 |SPV1040T|Voltage Regulators - Switching Regulators Hi efficiency solar battery charger|[511-SPV1040T](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=511-SPV1040T)|1|U1 MPPT SPV1040T
-|LTC4070EMS8E#PBF|LINEAR TECHNOLOGY - BATTERY CHARGER, LIION/POLY, 8MSOP|[1839141](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1839141)|1|U2 Li-ion battery charger LTC4070 - replaces LTC4071, leave pin 7 floating
+|LTC4070EMS8E#PBF|LINEAR TECHNOLOGY - BATTERY CHARGER, LIION/POLY, 8MSOP|[1839141](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1839141)|1|U2 Li-ion battery charger LTC4070
 |TPS62243DRVT|TEXAS INSTRUMENTS - DC-DC CONV, BUCK, 0.3A, 2.25MHZ, SON-6|[2400648](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2400648) [595-TPS62243DRVT](http://uk.mouser.com/Search/Refine.aspx?N=1323043&Keyword=595-TPS62243DRVT)|1|U3 Buck Converter DRVT = SON-6 TPS62243
 |PTVS5V0S1UR|NXP - Transient Voltage Suppressor, TVS, AEC-Q101 PTVS Series, Unidirectional, 5 V, SOD-123, 2, 6.4 V|[1829262](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1829262)|1|TVS diode for MPPT D1
 |RB161M-20TR|ROHM - Small Signal Schottky Diode, Single, 25 V, 1 A, 350 mV, 30 A, 125 °C|[1525484](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1525484)|1|Small signal schottky RB161M D2
@@ -19,7 +19,8 @@
 |LPS3015-103MRB|COILCRAFT - Surface Mount Power Inductor, AEC-Q200 LPS3015 Series, 10 µH, ± 20%, Shielded, 0.44 ohm, 550 mA|[2408024](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2408024)|1|L1 Lx for MPPT LPS3015
 |SRN2512-2R2M|BOURNS - Surface Mount Power Inductor, SRN2512 Series, 2.2 µH, ± 20%, Semishielded, 0.102 ohm, 2.3 A|[2428203](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2428203)|1|Inductor for Buck L2
 |MC0402B102J500CT|MULTICOMP - SMD Multilayer Ceramic Capacitor, MC Series, 1000 pF, ± 5%, X7R, 50 V, 0402 [1005 Metric]|[2320765](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2320765)|2|C1, C2 1nF Mpp-set, vctrl
-|C1005X5R0J475M050BC|TDK - SMD Multilayer Ceramic Capacitor, C Series, 4.7 µF, ± 20%, X5R, 6.3 V, 0402 [1005 Metric]|[2309027](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2309027)|2|C3, C4 4.7uF
+|GRM155R61E105KA12D|MURATA - SMD Multilayer Ceramic Capacitor, GRM Series, 1 µF, ± 10%, X5R, 25 V, 0402 [1005 Metric]|[2218855](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2218855)|1|C3 1uF
+|C1005X5R0J475M050BC|TDK - SMD Multilayer Ceramic Capacitor, C Series, 4.7 µF, ± 20%, X5R, 6.3 V, 0402 [1005 Metric]|[2309027](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2309027)|1|C4 4.7uF
 |06036D106MAT2A|AVX - SMD Multilayer Ceramic Capacitor, 10 µF, ± 20%, X5R, 6.3 V, 0603 [1608 Metric]|[1833804](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1833804)|4|C5, C6, C7, C8 10µF 0603
 |GRM31CR60J107ME39L.|MURATA - SMD Multilayer Ceramic Capacitor, GRM Series, 100 µF, ± 20%, X5R, 6.3 V, 1206 [3216 Metric]|[1735535](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=1735535)|1|C9 100µF 1206 optional
 |CRG0402F1K0|TE CONNECTIVITY - Surface Mount Chip Resistor, Thick Film, CRG Series, 1 kohm, 63 mW, ± 1%, 50 V, 0402 [1005 Metric]|[2331474](http://uk.farnell.com/webapp/wcs/stores/servlet/Search?st=2331474)|1|R1 1k Mpp-set
diff --git a/hardware/solar-breakout/bristol_longshot.brd b/hardware/solar-breakout/bristol_longshot.brd
index 6bb5314..33a86ac 100644
--- a/hardware/solar-breakout/bristol_longshot.brd
+++ b/hardware/solar-breakout/bristol_longshot.brd
@@ -6,7 +6,7 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="10" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
+<grid distance="0.25" unitdist="mm" unit="mm" style="lines" multiple="1" display="yes" altdistance="0.025" altunitdist="inch" altunit="inch"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
@@ -34,8 +34,8 @@
 <layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="yes" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="yes" active="yes"/>
@@ -159,7 +159,7 @@
 <text x="41" y="53" size="0.55" layer="21" font="vector" ratio="14">BATTERY_MOSFET_CTRL</text>
 <text x="27.5" y="56.5" size="0.55" layer="21" font="vector" ratio="14">Connect solar
 to output</text>
-<text x="49.25" y="39.25" size="0.55" layer="21" font="vector" ratio="14">LTC4071</text>
+<text x="49.25" y="39.5" size="0.55" layer="21" font="vector" ratio="14">LTC4070</text>
 <text x="34.75" y="42.25" size="0.55" layer="21" font="vector" ratio="14">BSS84</text>
 <text x="38.75" y="42.25" size="0.55" layer="21" font="vector" ratio="14">BSS84</text>
 <text x="26.75" y="62.75" size="0.55" layer="21" font="vector" ratio="14">SPV1040</text>
@@ -1597,7 +1597,7 @@ by exp-lbrs.ulp</description>
 </package>
 </packages>
 </library>
-<library name="LTC4071_EMS8">
+<library name="LTC4070_EMS8">
 <packages>
 <package name="SOP65P490X110-9N">
 <smd name="1" x="-2.1844" y="0.9652" dx="1.397" dy="0.4318" layer="1"/>
@@ -1608,7 +1608,7 @@ by exp-lbrs.ulp</description>
 <smd name="6" x="2.1844" y="-0.3302" dx="1.397" dy="0.4318" layer="1"/>
 <smd name="7" x="2.1844" y="0.3302" dx="1.397" dy="0.4318" layer="1"/>
 <smd name="8" x="2.1844" y="0.9652" dx="1.397" dy="0.4318" layer="1"/>
-<smd name="9" x="0.0254" y="-0.0254" dx="1.6764" dy="1.8796" layer="1"/>
+<smd name="9" x="-0.1016" y="-0.0508" dx="1.8288" dy="2.0574" layer="1"/>
 <wire x1="-1.4986" y1="0.7874" x2="-1.4986" y2="1.1684" width="0" layer="51"/>
 <wire x1="-1.4986" y1="1.1684" x2="-2.5146" y2="1.1684" width="0" layer="51"/>
 <wire x1="-2.5146" y1="1.1684" x2="-2.5146" y2="0.7874" width="0" layer="51"/>
@@ -1650,11 +1650,7 @@ by exp-lbrs.ulp</description>
 <wire x1="0.3048" y1="1.4986" x2="-0.3048" y2="1.4986" width="0" layer="51" curve="-180"/>
 <text x="-3.0226" y="1.27" size="1.27" layer="51" ratio="6" rot="SR0">*</text>
 <wire x1="-1.3716" y1="-1.4986" x2="1.3716" y2="-1.4986" width="0.1524" layer="21"/>
-<wire x1="1.3716" y1="1.4986" x2="0.3048" y2="1.4986" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="1.4986" x2="-0.3048" y2="1.4986" width="0.1524" layer="21"/>
-<wire x1="-0.3048" y1="1.4986" x2="-1.3716" y2="1.4986" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="1.4986" x2="0.2032" y2="1.27" width="0.1524" layer="21" curve="-48"/>
-<wire x1="-0.2032" y1="1.27" x2="-0.3048" y2="1.4986" width="0.1524" layer="21" curve="-48"/>
+<wire x1="1.3716" y1="1.4986" x2="-1.3716" y2="1.4986" width="0.1524" layer="21"/>
 <text x="-3.0226" y="1.27" size="1.27" layer="21" ratio="6" rot="SR0">*</text>
 <text x="-3.4544" y="3.175" size="2.0828" layer="25" ratio="10" rot="SR0">&gt;NAME</text>
 <text x="-3.4544" y="-4.445" size="2.0828" layer="27" ratio="10" rot="SR0">&gt;VALUE</text>
@@ -1846,51 +1842,51 @@ Please make sure your boards conform to these design rules.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="U4" library="TPS62243" package="S-PWSON-N6" value="TPS62243" x="59.25" y="10" rot="R90"/>
+<element name="U3" library="TPS62243" package="S-PWSON-N6" value="TPS62243" x="59.25" y="10" rot="R90"/>
 <element name="U1" library="spv1040" package="TSSOP8" value="SPV1040" x="25.5" y="65.5"/>
-<element name="R7" library="microbuilder_v3" package="_0402" value="82kΩ" x="34.25" y="64.75" rot="R270"/>
-<element name="R5" library="microbuilder_v3" package="_0402" value="220kΩ" x="33.25" y="64.75" rot="R90"/>
-<element name="C7" library="microbuilder_v3" package="_0402@1" value="1nF" x="33.25" y="62.25" rot="R270"/>
-<element name="L3" library="SparkFun" package="1007" value="2.2µH" x="62.5" y="10" rot="R180"/>
-<element name="C5" library="microbuilder_v3" package="_0402@1" value="1nF" x="26.25" y="67" rot="R180"/>
+<element name="R3" library="microbuilder_v3" package="_0402" value="82kΩ" x="34.25" y="64.75" rot="R270"/>
+<element name="R2" library="microbuilder_v3" package="_0402" value="220kΩ" x="33.25" y="64.75" rot="R90"/>
+<element name="C2" library="microbuilder_v3" package="_0402@1" value="1nF" x="33.25" y="62.25" rot="R270"/>
+<element name="L2" library="SparkFun" package="1007" value="2.2µH" x="62.5" y="10" rot="R180"/>
+<element name="C1" library="microbuilder_v3" package="_0402@1" value="1nF" x="26.25" y="67" rot="R180"/>
 <element name="R1" library="microbuilder_v3" package="_0402" value="1kΩ" x="24.5" y="67.25" rot="R270"/>
 <element name="JP2" library="SparkFun" package="1X02_LOCK" value="" x="25.5" y="58.5" rot="R270"/>
 <element name="JP3" library="SparkFun" package="SCREWTERMINAL-3.5MM-2_LOCK" value="PV1" x="9.75" y="66.5" rot="R270"/>
 <element name="JP5" library="SparkFun" package="SCREWTERMINAL-3.5MM-2_LOCK" value="" x="65.75" y="37" rot="R90"/>
-<element name="C11" library="microbuilder_v3" package="_0402@1" value="4.7µF" x="55.5" y="39.5"/>
-<element name="C15" library="microbuilder_v3" package="_0402@1" value="4.7µF" x="56.5" y="10" rot="R270"/>
+<element name="C3" library="microbuilder_v3" package="_0402@1" value="1µF" x="55.5" y="39.5"/>
+<element name="C4" library="microbuilder_v3" package="_0402@1" value="4.7µF" x="56.5" y="10" rot="R270"/>
 <element name="JTAG1" library="microbuilder_v3" package="2X05_1.27MM_SMT" value="" x="65.25" y="19.5"/>
-<element name="D2" library="led" package="CHIPLED_0603" value="GREEN" x="53.125" y="34.75" rot="R270"/>
-<element name="R10" library="microbuilder_v3" package="_0402" value="330Ω" x="50.375" y="34.75" rot="R180"/>
-<element name="D5" library="nxp" package="SOD123W" value="DIODE[TVS]" x="23.75" y="62.25"/>
+<element name="D3" library="led" package="CHIPLED_0603" value="GREEN" x="53.125" y="34.75" rot="R270"/>
+<element name="R5" library="microbuilder_v3" package="_0402" value="330Ω" x="50.375" y="34.75" rot="R180"/>
+<element name="D1" library="nxp" package="SOD123W" value="DIODE[TVS]" x="23.75" y="62.25"/>
 <element name="L1" library="PecanFemto4" package="LPS3015" value="10uH LPS3015" x="15.75" y="65.75" rot="R270"/>
-<element name="C30" library="resistor" package="C0603K" value="10µF" x="56.5" y="36" rot="R270"/>
-<element name="C1" library="resistor" package="C0603K" value="10µF" x="27.25" y="70.5" rot="R90"/>
-<element name="C2" library="resistor" package="C0603K" value="10µF" x="38.75" y="68.25"/>
-<element name="C3" library="resistor" package="C0603K" value="10µF" x="64.75" y="10" rot="R270"/>
-<element name="D3" library="RB161M" package="RB161M" value="RB161M" x="48.25" y="24" rot="R180"/>
+<element name="C7" library="resistor" package="C0603K" value="10µF" x="56.5" y="36" rot="R270"/>
+<element name="C5" library="resistor" package="C0603K" value="10µF" x="27.25" y="70.5" rot="R90"/>
+<element name="C6" library="resistor" package="C0603K" value="10µF" x="38.75" y="68.25"/>
+<element name="C8" library="resistor" package="C0603K" value="10µF" x="64.75" y="10" rot="R270"/>
+<element name="D2" library="RB161M" package="RB161M" value="RB161M" x="48.25" y="24" rot="R180"/>
 <element name="JP1" library="SparkFun" package="1X02_LOCK" value="" x="10" y="71" rot="R90"/>
 <element name="JP4" library="SparkFun" package="1X02_LOCK" value="" x="23" y="71" rot="R90"/>
 <element name="JP7" library="SparkFun" package="1X02_LOCK" value="" x="33" y="71" rot="R90"/>
 <element name="JP8" library="SparkFun" package="1X02_LOCK" value="" x="17" y="58.5" rot="R270"/>
-<element name="C32" library="resistor" package="C1206K" value="100µF" x="39.5" y="70.5"/>
+<element name="C9" library="resistor" package="C1206K" value="100µF" x="39.5" y="70.5"/>
 <element name="JP9" library="SparkFun" package="1X02_LOCK" value="" x="40" y="64"/>
 <element name="JP10" library="SparkFun" package="1X02_LOCK" value="" x="68" y="10.5" rot="R270"/>
-<element name="U2" library="LTC4071_EMS8" package="SOP65P490X110-9N" value="LTC4071EMS8EPBF" x="51.5" y="37.5">
-<attribute name="MPN" value="LTC4071EMS8E#PBF" x="51.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="PACKAGE" value="MSOP-8" x="51.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="OC_FARNELL" value="1947919" x="51.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="OC_NEWARK" value="13T8411" x="51.5" y="37.5" size="1.778" layer="27" display="off"/>
-<attribute name="SUPPLIER" value="LINEAR TECHNOLOGY" x="51.5" y="37.5" size="1.778" layer="27" display="off"/>
-</element>
-<element name="R15" library="microbuilder_v3" package="_0402" value="1MΩ" x="33.5" y="45" rot="R90"/>
+<element name="R4" library="microbuilder_v3" package="_0402" value="1MΩ" x="33.5" y="45" rot="R90"/>
 <element name="JP6" library="SparkFun" package="1X02_LOCK" value="" x="39" y="51" rot="R90"/>
 <element name="JP12" library="SparkFun" package="1X02_LOCK" value="" x="53.5" y="41.5" rot="R90"/>
 <element name="JP13" library="SparkFun" package="1X02_LOCK" value="" x="66" y="33" rot="R270"/>
 <element name="JP14" library="SparkFun" package="1X02_LOCK" value="" x="52.5" y="10.5" rot="R270"/>
-<element name="Q2" library="nxp" package="SOT23" value="BSS84" x="36" y="45" rot="R270"/>
-<element name="Q3" library="nxp" package="SOT23" value="BSS84" x="40" y="45" rot="R270"/>
+<element name="Q1" library="nxp" package="SOT23" value="BSS84" x="36" y="45" rot="R270"/>
+<element name="Q2" library="nxp" package="SOT23" value="BSS84" x="40" y="45" rot="R270"/>
 <element name="JP11" library="SparkFun" package="SCREWTERMINAL-3.5MM-2_LOCK" value="" x="73.5" y="11" rot="R90"/>
+<element name="U2" library="LTC4070_EMS8" package="SOP65P490X110-9N" value="LTC4070EMS8EPBF" x="51.5" y="37.75">
+<attribute name="OC_FARNELL" value="1839141" x="51.5" y="37.75" size="1.778" layer="27" display="off"/>
+<attribute name="PACKAGE" value="MSOP-8" x="51.5" y="37.75" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="LTC4070EMS8E#PBF" x="51.5" y="37.75" size="1.778" layer="27" display="off"/>
+<attribute name="OC_NEWARK" value="67R4287" x="51.5" y="37.75" size="1.778" layer="27" display="off"/>
+<attribute name="SUPPLIER" value="Linear Technology" x="51.5" y="37.75" size="1.778" layer="27" display="off"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
@@ -1907,21 +1903,21 @@ Please make sure your boards conform to these design rules.</description>
 <vertex x="0" y="0"/>
 </polygon>
 <contactref element="U1" pad="2"/>
-<contactref element="R7" pad="1"/>
-<contactref element="C7" pad="2"/>
+<contactref element="R3" pad="1"/>
+<contactref element="C2" pad="2"/>
 <contactref element="U1" pad="2"/>
-<contactref element="U4" pad="6"/>
-<contactref element="U4" pad="PAD"/>
-<contactref element="U4" pad="2"/>
+<contactref element="U3" pad="6"/>
+<contactref element="U3" pad="PAD"/>
+<contactref element="U3" pad="2"/>
 <via x="59.25" y="9.5" extent="1-16" drill="0.3302"/>
 <via x="59.25" y="10.5" extent="1-16" drill="0.3302"/>
 <wire x1="58.2" y1="9.35" x2="59.25" y2="9.35" width="0.2" layer="1"/>
 <wire x1="59.25" y1="9.35" x2="59.25" y2="9.5" width="0.2" layer="1"/>
-<contactref element="C5" pad="1"/>
+<contactref element="C1" pad="1"/>
 <contactref element="JP3" pad="2"/>
 <contactref element="JP5" pad="2"/>
-<contactref element="C11" pad="2"/>
-<contactref element="C15" pad="2"/>
+<contactref element="C3" pad="2"/>
+<contactref element="C4" pad="2"/>
 <contactref element="JTAG1" pad="3"/>
 <contactref element="JTAG1" pad="5"/>
 <via x="26" y="65.5" extent="1-16" drill="0.3302"/>
@@ -1929,23 +1925,19 @@ Please make sure your boards conform to these design rules.</description>
 <via x="56.5" y="8.5" extent="1-16" drill="0.3302"/>
 <via x="64" y="19.5" extent="1-16" drill="0.3302"/>
 <via x="65.25" y="19.5" extent="1-16" drill="0.3302"/>
-<contactref element="D5" pad="P$1"/>
-<contactref element="C3" pad="2"/>
-<contactref element="C30" pad="2"/>
+<contactref element="D1" pad="P$1"/>
+<contactref element="C8" pad="2"/>
+<contactref element="C7" pad="2"/>
 <contactref element="JP1" pad="2"/>
 <contactref element="JP4" pad="2"/>
 <contactref element="JP7" pad="2"/>
-<contactref element="C1" pad="2"/>
-<contactref element="C2" pad="2"/>
+<contactref element="C5" pad="2"/>
+<contactref element="C6" pad="2"/>
 <contactref element="JP8" pad="2"/>
-<contactref element="C32" pad="2"/>
+<contactref element="C9" pad="2"/>
 <contactref element="JP9" pad="2"/>
 <contactref element="JP10" pad="2"/>
-<contactref element="U2" pad="6"/>
-<contactref element="U2" pad="9"/>
-<contactref element="U2" pad="3"/>
-<contactref element="U2" pad="5"/>
-<contactref element="D2" pad="C"/>
+<contactref element="D3" pad="C"/>
 <contactref element="JP6" pad="2"/>
 <contactref element="JP12" pad="2"/>
 <contactref element="JP13" pad="2"/>
@@ -2090,7 +2082,7 @@ Please make sure your boards conform to these design rules.</description>
 <via x="57" y="39.5" extent="1-16" drill="0.3302"/>
 <via x="50.5" y="35.75" extent="1-16" drill="0.3302"/>
 <via x="52.75" y="35.75" extent="1-16" drill="0.3302"/>
-<via x="55" y="37" extent="1-16" drill="0.3302"/>
+<via x="55" y="36.75" extent="1-16" drill="0.3302"/>
 <via x="55" y="35.75" extent="1-16" drill="0.3302"/>
 <via x="55" y="33.75" extent="1-16" drill="0.3302"/>
 <via x="50.5" y="33.75" extent="1-16" drill="0.3302"/>
@@ -2145,17 +2137,20 @@ Please make sure your boards conform to these design rules.</description>
 <via x="71.75" y="9.75" extent="1-16" drill="0.3302"/>
 <via x="75.25" y="12" extent="1-16" drill="0.3302"/>
 <via x="75.25" y="9.75" extent="1-16" drill="0.3302"/>
-<wire x1="49.3156" y1="37.1698" x2="51.2206" y2="37.1698" width="0.4" layer="1"/>
-<wire x1="51.2206" y1="37.1698" x2="51.5254" y2="37.4746" width="0.4" layer="1"/>
+<contactref element="U2" pad="3"/>
+<contactref element="U2" pad="9"/>
+<contactref element="U2" pad="5"/>
+<wire x1="49.3156" y1="37.4198" x2="51.119" y2="37.4198" width="0.4" layer="1"/>
+<wire x1="51.119" y1="37.4198" x2="51.3984" y2="37.6992" width="0.4" layer="1"/>
 </signal>
 <signal name="KEY">
 </signal>
 <signal name="1.8V">
 <contactref element="JTAG1" pad="1"/>
 <wire x1="62.71" y1="17.75" x2="62.71" y2="17.65" width="0.4" layer="1"/>
-<contactref element="C3" pad="1"/>
-<contactref element="L3" pad="2"/>
-<contactref element="U4" pad="3"/>
+<contactref element="C8" pad="1"/>
+<contactref element="L2" pad="2"/>
+<contactref element="U3" pad="3"/>
 <contactref element="JP10" pad="1"/>
 <wire x1="60.3" y1="10.65" x2="62.15" y2="10.65" width="0.4" layer="1"/>
 <wire x1="62.15" y1="10.65" x2="62.5" y2="11" width="0.4" layer="1"/>
@@ -2171,15 +2166,32 @@ Please make sure your boards conform to these design rules.</description>
 </signal>
 <signal name="BATTERY">
 <contactref element="JP5" pad="1"/>
-<contactref element="C30" pad="1"/>
+<contactref element="C7" pad="1"/>
 <contactref element="JP13" pad="1"/>
-<contactref element="U2" pad="7"/>
-<wire x1="53.6844" y1="37.8302" x2="55.5448" y2="37.8302" width="0.4" layer="1"/>
-<wire x1="55.5448" y1="37.8302" x2="56.5" y2="36.875" width="0.4" layer="1"/>
+<wire x1="54.992" y1="38.383" x2="56.5" y2="36.875" width="0.4" layer="1"/>
 <wire x1="65.75" y1="36.8222" x2="56.5528" y2="36.8222" width="0.4" layer="1"/>
 <wire x1="56.5528" y1="36.8222" x2="56.5" y2="36.875" width="0.4" layer="1"/>
 <wire x1="65.75" y1="36.8222" x2="65.75" y2="33.4278" width="0.4" layer="1"/>
 <wire x1="65.75" y1="33.4278" x2="66" y2="33.1778" width="0.4" layer="1"/>
+<contactref element="D2" pad="ANODE"/>
+<contactref element="C3" pad="1"/>
+<contactref element="JP12" pad="1"/>
+<contactref element="Q2" pad="3"/>
+<wire x1="41" y1="45" x2="42.5" y2="45" width="0.4" layer="1"/>
+<wire x1="42.5" y1="45" x2="48" y2="39.5" width="0.4" layer="1"/>
+<wire x1="53.5" y1="39.5" x2="54.992" y2="39.5" width="0.4" layer="1"/>
+<wire x1="53.5" y1="41.3222" x2="53.5" y2="39.5" width="0.4" layer="1"/>
+<wire x1="48.25" y1="25.525" x2="48" y2="25.525" width="0.4" layer="1"/>
+<wire x1="48" y1="25.525" x2="48" y2="38" width="0.4" layer="1"/>
+<contactref element="U2" pad="8"/>
+<contactref element="U2" pad="2"/>
+<wire x1="48" y1="38" x2="48" y2="39.5" width="0.4" layer="1"/>
+<wire x1="53.5" y1="39.5" x2="48" y2="39.5" width="0.4" layer="1"/>
+<wire x1="49.3156" y1="38.0802" x2="48.0802" y2="38.0802" width="0.4" layer="1"/>
+<wire x1="48.0802" y1="38.0802" x2="48" y2="38" width="0.4" layer="1"/>
+<wire x1="53.5" y1="39.5" x2="53.5" y2="38.8996" width="0.4" layer="1"/>
+<wire x1="53.5" y1="38.8996" x2="53.6844" y2="38.7152" width="0.4" layer="1"/>
+<wire x1="54.992" y1="38.383" x2="54.992" y2="39.5" width="0.4" layer="1"/>
 </signal>
 <signal name="LX">
 <contactref element="U1" pad="3"/>
@@ -2251,7 +2263,7 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="17.147" y1="66.7025" x2="17.147" y2="67.021525" width="0.2" layer="1"/>
 <wire x1="17.147" y1="67.021525" x2="17.0207625" y2="67.1477625" width="0.2" layer="1"/>
 <contactref element="JP1" pad="1"/>
-<contactref element="C1" pad="1"/>
+<contactref element="C5" pad="1"/>
 <wire x1="20" y1="66.75" x2="16.683959375" y2="66.75" width="0.4" layer="1"/>
 <wire x1="16.683959375" y1="66.75" x2="16.572959375" y2="66.639" width="0.4" layer="1"/>
 <wire x1="14.353" y1="66.7025" x2="9.7747" y2="66.7025" width="0.4" layer="1"/>
@@ -2265,17 +2277,17 @@ Please make sure your boards conform to these design rules.</description>
 <contactref element="U1" pad="4"/>
 <contactref element="U1" pad="7"/>
 <contactref element="U1" pad="6"/>
-<contactref element="R5" pad="2"/>
+<contactref element="R2" pad="2"/>
 <wire x1="30.9" y1="65.325" x2="33.183" y2="65.325" width="0.4" layer="1"/>
 <wire x1="33.183" y1="65.325" x2="33.25" y2="65.258" width="0.4" layer="1"/>
 <wire x1="30.9" y1="64.675" x2="30.9" y2="65.325" width="0.4" layer="1"/>
 <wire x1="24.7" y1="64.025" x2="25.775" y2="64.025" width="0.4" layer="1"/>
 <wire x1="25.775" y1="64.025" x2="26.425" y2="64.675" width="0.4" layer="1"/>
 <wire x1="26.425" y1="64.675" x2="30.9" y2="64.675" width="0.4" layer="1"/>
-<contactref element="D5" pad="P$2"/>
+<contactref element="D1" pad="P$2"/>
 <contactref element="JP2" pad="1"/>
-<contactref element="C2" pad="1"/>
-<contactref element="C32" pad="1"/>
+<contactref element="C6" pad="1"/>
+<contactref element="C9" pad="1"/>
 <contactref element="JP7" pad="1"/>
 <wire x1="25.775" y1="64.025" x2="25.775" y2="62.325" width="0.4" layer="1"/>
 <wire x1="25.775" y1="62.325" x2="25.7" y2="62.25" width="0.4" layer="1"/>
@@ -2291,7 +2303,7 @@ Please make sure your boards conform to these design rules.</description>
 <signal name="MPP_SET">
 <contactref element="R1" pad="2"/>
 <contactref element="U1" pad="1"/>
-<contactref element="C5" pad="2"/>
+<contactref element="C1" pad="2"/>
 <wire x1="24.5" y1="66.742" x2="24.5" y2="65.975" width="0.2" layer="1"/>
 <wire x1="24.5" y1="65.975" x2="24.7" y2="65.975" width="0.2" layer="1"/>
 <contactref element="JP4" pad="1"/>
@@ -2304,9 +2316,9 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="23.5" y1="70.3222" x2="23" y2="70.8222" width="0.4" layer="16"/>
 </signal>
 <signal name="SPV_VCTRL">
-<contactref element="C7" pad="1"/>
-<contactref element="R7" pad="2"/>
-<contactref element="R5" pad="1"/>
+<contactref element="C2" pad="1"/>
+<contactref element="R3" pad="2"/>
+<contactref element="R2" pad="1"/>
 <contactref element="U1" pad="5"/>
 <wire x1="33.25" y1="64.242" x2="34.25" y2="64.242" width="0.4" layer="1"/>
 <wire x1="33.25" y1="62.758" x2="33.242" y2="64.234" width="0.4" layer="1"/>
@@ -2318,20 +2330,20 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="33.25" y1="64" x2="39.8222" y2="64" width="0.4" layer="1"/>
 </signal>
 <signal name="CHG_LED">
-<contactref element="D2" pad="A"/>
-<contactref element="R10" pad="1"/>
+<contactref element="D3" pad="A"/>
+<contactref element="R5" pad="1"/>
 <wire x1="50.883" y1="34.75" x2="52.375" y2="34.75" width="0.4" layer="1"/>
 </signal>
 <signal name="SOLAR">
 <contactref element="JP2" pad="2"/>
-<contactref element="Q2" pad="2"/>
-<contactref element="R15" pad="1"/>
+<contactref element="Q1" pad="2"/>
+<contactref element="R4" pad="1"/>
 <wire x1="33.5" y1="44.492" x2="33.942" y2="44.05" width="0.4" layer="1"/>
 <wire x1="33.942" y1="44.05" x2="35" y2="44.05" width="0.4" layer="1"/>
-<contactref element="U4" pad="4"/>
-<contactref element="U4" pad="5"/>
-<contactref element="D3" pad="CATHODE"/>
-<contactref element="C15" pad="1"/>
+<contactref element="U3" pad="4"/>
+<contactref element="U3" pad="5"/>
+<contactref element="D2" pad="CATHODE"/>
+<contactref element="C4" pad="1"/>
 <contactref element="JP14" pad="1"/>
 <wire x1="58.2" y1="10.65" x2="52.5278" y2="10.65" width="0.4" layer="1"/>
 <wire x1="52.5278" y1="10.65" x2="52.5" y2="10.6778" width="0.4" layer="1"/>
@@ -2349,41 +2361,21 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="48.25" y1="10.6778" x2="48.5" y2="10.6778" width="0.8" layer="1"/>
 </signal>
 <signal name="N$7">
-<contactref element="U4" pad="1"/>
-<contactref element="L3" pad="1"/>
+<contactref element="U3" pad="1"/>
+<contactref element="L2" pad="1"/>
 <wire x1="60.3" y1="9.35" x2="62.15" y2="9.35" width="0.4" layer="1"/>
 <wire x1="62.15" y1="9.35" x2="62.5" y2="9" width="0.4" layer="1"/>
 </signal>
-<signal name="BATTERY_VCC">
-<contactref element="U2" pad="8"/>
-<contactref element="U2" pad="2"/>
-<contactref element="D3" pad="ANODE"/>
-<contactref element="C11" pad="1"/>
-<contactref element="JP12" pad="1"/>
-<wire x1="49.3156" y1="37.8302" x2="48" y2="37.8302" width="0.4" layer="1"/>
-<wire x1="48" y1="39.5" x2="53.5" y2="39.5" width="0.4" layer="1"/>
-<wire x1="53.5" y1="39.5" x2="53.5" y2="38.4652" width="0.4" layer="1"/>
-<wire x1="53.5" y1="38.4652" x2="53.6844" y2="38.4652" width="0.4" layer="1"/>
-<contactref element="Q3" pad="3"/>
-<wire x1="41" y1="45" x2="42.5" y2="45" width="0.4" layer="1"/>
-<wire x1="42.5" y1="45" x2="48" y2="39.5" width="0.4" layer="1"/>
-<wire x1="53.5" y1="39.5" x2="54.992" y2="39.5" width="0.4" layer="1"/>
-<wire x1="53.5" y1="41.3222" x2="53.5" y2="39.5" width="0.4" layer="1"/>
-<wire x1="48.25" y1="25.525" x2="48" y2="25.525" width="0.4" layer="1"/>
-<wire x1="48" y1="25.525" x2="48" y2="37.8302" width="0.4" layer="1"/>
-<wire x1="48" y1="38" x2="48" y2="39.5" width="0.4" layer="1"/>
-<wire x1="48" y1="37.8302" x2="48" y2="38" width="0.4" layer="1"/>
-</signal>
 <signal name="HBO">
-<contactref element="U2" pad="4"/>
-<contactref element="R10" pad="2"/>
-<wire x1="49.3156" y1="36.5348" x2="49.3156" y2="35.3014" width="0.4" layer="1"/>
+<contactref element="R5" pad="2"/>
 <wire x1="49.3156" y1="35.3014" x2="49.867" y2="34.75" width="0.4" layer="1"/>
+<contactref element="U2" pad="4"/>
+<wire x1="49.3156" y1="36.7848" x2="49.3156" y2="35.3014" width="0.4" layer="1"/>
 </signal>
 <signal name="BATT_MOSFET_CTRL">
-<contactref element="Q3" pad="1"/>
-<contactref element="R15" pad="2"/>
 <contactref element="Q2" pad="1"/>
+<contactref element="R4" pad="2"/>
+<contactref element="Q1" pad="1"/>
 <contactref element="JP6" pad="1"/>
 <wire x1="33.5" y1="45.508" x2="33.942" y2="45.95" width="0.4" layer="1"/>
 <wire x1="33.942" y1="45.95" x2="35" y2="45.95" width="0.4" layer="1"/>
@@ -2391,11 +2383,14 @@ Please make sure your boards conform to these design rules.</description>
 <wire x1="39" y1="50.8222" x2="39" y2="45.95" width="0.4" layer="1"/>
 </signal>
 <signal name="BATTERY_MOSFET_1">
-<contactref element="Q2" pad="3"/>
-<contactref element="Q3" pad="2"/>
+<contactref element="Q1" pad="3"/>
+<contactref element="Q2" pad="2"/>
 <wire x1="37" y1="45" x2="37.95" y2="44.05" width="0.4" layer="1"/>
 <wire x1="37.95" y1="44.05" x2="39" y2="44.05" width="0.4" layer="1"/>
 </signal>
+<signal name="NTCBIAS">
+<contactref element="U2" pad="1"/>
+</signal>
 </signals>
 <errors>
 <approved hash="19,1,dd3ff474e12f989e"/>
diff --git a/hardware/solar-breakout/bristol_longshot.brd.pdf b/hardware/solar-breakout/bristol_longshot.brd.pdf
index 99023eb..5e1cceb 100644
Binary files a/hardware/solar-breakout/bristol_longshot.brd.pdf and b/hardware/solar-breakout/bristol_longshot.brd.pdf differ
diff --git a/hardware/solar-breakout/bristol_longshot.brd.png b/hardware/solar-breakout/bristol_longshot.brd.png
index 443524f..e67280d 100644
Binary files a/hardware/solar-breakout/bristol_longshot.brd.png and b/hardware/solar-breakout/bristol_longshot.brd.png differ
diff --git a/hardware/solar-breakout/bristol_longshot.sch b/hardware/solar-breakout/bristol_longshot.sch
index 575c8b9..364390c 100644
--- a/hardware/solar-breakout/bristol_longshot.sch
+++ b/hardware/solar-breakout/bristol_longshot.sch
@@ -7424,7 +7424,7 @@ by exp-lbrs.ulp</description>
 </deviceset>
 </devicesets>
 </library>
-<library name="LTC4071_EMS8">
+<library name="LTC4070_EMS8">
 <packages>
 <package name="SOP65P490X110-9N">
 <smd name="1" x="-2.1844" y="0.9652" dx="1.397" dy="0.4318" layer="1"/>
@@ -7435,7 +7435,7 @@ by exp-lbrs.ulp</description>
 <smd name="6" x="2.1844" y="-0.3302" dx="1.397" dy="0.4318" layer="1"/>
 <smd name="7" x="2.1844" y="0.3302" dx="1.397" dy="0.4318" layer="1"/>
 <smd name="8" x="2.1844" y="0.9652" dx="1.397" dy="0.4318" layer="1"/>
-<smd name="9" x="0.0254" y="-0.0254" dx="1.6764" dy="1.8796" layer="1"/>
+<smd name="9" x="-0.1016" y="-0.0508" dx="1.8288" dy="2.0574" layer="1"/>
 <wire x1="-1.4986" y1="0.7874" x2="-1.4986" y2="1.1684" width="0" layer="51"/>
 <wire x1="-1.4986" y1="1.1684" x2="-2.5146" y2="1.1684" width="0" layer="51"/>
 <wire x1="-2.5146" y1="1.1684" x2="-2.5146" y2="0.7874" width="0" layer="51"/>
@@ -7477,61 +7477,57 @@ by exp-lbrs.ulp</description>
 <wire x1="0.3048" y1="1.4986" x2="-0.3048" y2="1.4986" width="0" layer="51" curve="-180"/>
 <text x="-3.0226" y="1.27" size="1.27" layer="51" ratio="6" rot="SR0">*</text>
 <wire x1="-1.3716" y1="-1.4986" x2="1.3716" y2="-1.4986" width="0.1524" layer="21"/>
-<wire x1="1.3716" y1="1.4986" x2="0.3048" y2="1.4986" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="1.4986" x2="-0.3048" y2="1.4986" width="0.1524" layer="21"/>
-<wire x1="-0.3048" y1="1.4986" x2="-1.3716" y2="1.4986" width="0.1524" layer="21"/>
-<wire x1="0.3048" y1="1.4986" x2="0.2032" y2="1.27" width="0.1524" layer="21" curve="-48"/>
-<wire x1="-0.2032" y1="1.27" x2="-0.3048" y2="1.4986" width="0.1524" layer="21" curve="-48"/>
+<wire x1="1.3716" y1="1.4986" x2="-1.3716" y2="1.4986" width="0.1524" layer="21"/>
 <text x="-3.0226" y="1.27" size="1.27" layer="21" ratio="6" rot="SR0">*</text>
 <text x="-3.4544" y="3.175" size="2.0828" layer="25" ratio="10" rot="SR0">&gt;NAME</text>
 <text x="-3.4544" y="-4.445" size="2.0828" layer="27" ratio="10" rot="SR0">&gt;VALUE</text>
 </package>
 </packages>
 <symbols>
-<symbol name="LTC4071EMS8EPBF">
-<pin name="VCC" x="-17.78" y="10.16" length="middle" direction="pwr"/>
-<pin name="BAT" x="17.78" y="5.08" length="middle" direction="in" rot="R180"/>
-<pin name="NTCBIAS" x="-17.78" y="5.08" length="middle" direction="in"/>
-<pin name="NTC" x="-17.78" y="2.54" length="middle" direction="in"/>
-<pin name="ADJ" x="-17.78" y="0" length="middle" direction="in"/>
-<pin name="LBSEL" x="-17.78" y="-2.54" length="middle" direction="in"/>
-<pin name="GND" x="-17.78" y="-7.62" length="middle" direction="pas"/>
-<pin name="EP" x="-17.78" y="-10.16" length="middle" direction="pas"/>
-<pin name="HBO" x="17.78" y="10.16" length="middle" direction="out" rot="R180"/>
-<wire x1="-12.7" y1="15.24" x2="-12.7" y2="-15.24" width="0.4064" layer="94"/>
-<wire x1="-12.7" y1="-15.24" x2="12.7" y2="-15.24" width="0.4064" layer="94"/>
-<wire x1="12.7" y1="-15.24" x2="12.7" y2="15.24" width="0.4064" layer="94"/>
-<wire x1="12.7" y1="15.24" x2="-12.7" y2="15.24" width="0.4064" layer="94"/>
-<text x="-4.826" y="17.78" size="2.0828" layer="95" ratio="10" rot="SR0">&gt;NAME</text>
-<text x="-6.604" y="-20.0152" size="2.0828" layer="96" ratio="10" rot="SR0">&gt;VALUE</text>
+<symbol name="LTC4070EMS8EPBF">
+<pin name="VCC" x="-17.78" y="5.08" length="middle" direction="pwr"/>
+<pin name="NTCBIAS" x="-17.78" y="0" length="middle" direction="pwr"/>
+<pin name="NTC" x="-17.78" y="-2.54" length="middle" direction="in"/>
+<pin name="ADJ" x="-17.78" y="-5.08" length="middle" direction="in"/>
+<pin name="GND" x="-17.78" y="-10.16" length="middle" direction="pas"/>
+<pin name="EP" x="-17.78" y="-12.7" length="middle" direction="pas"/>
+<pin name="HBO" x="17.78" y="5.08" length="middle" direction="out" rot="R180"/>
+<pin name="LBO" x="17.78" y="2.54" length="middle" direction="out" rot="R180"/>
+<pin name="DRV" x="17.78" y="0" length="middle" direction="out" rot="R180"/>
+<wire x1="-12.7" y1="10.16" x2="-12.7" y2="-17.78" width="0.4064" layer="94"/>
+<wire x1="-12.7" y1="-17.78" x2="12.7" y2="-17.78" width="0.4064" layer="94"/>
+<wire x1="12.7" y1="-17.78" x2="12.7" y2="10.16" width="0.4064" layer="94"/>
+<wire x1="12.7" y1="10.16" x2="-12.7" y2="10.16" width="0.4064" layer="94"/>
+<text x="-5.334" y="12.065" size="2.0828" layer="95" ratio="10" rot="SR0">&gt;NAME</text>
+<text x="-4.7244" y="-20.8534" size="2.0828" layer="96" ratio="10" rot="SR0">&gt;VALUE</text>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="LTC4071EMS8EPBF" prefix="U">
-<description>Li-Ion/Polymer Shunt Battery Charger System with Low Battery Disconnect</description>
+<deviceset name="LTC4070EMS8EPBF" prefix="U">
+<description>Li-Ion/Polymer Shunt Battery Charger System</description>
 <gates>
-<gate name="A" symbol="LTC4071EMS8EPBF" x="0" y="0"/>
+<gate name="A" symbol="LTC4070EMS8EPBF" x="0" y="0"/>
 </gates>
 <devices>
 <device name="" package="SOP65P490X110-9N">
 <connects>
 <connect gate="A" pin="ADJ" pad="3"/>
-<connect gate="A" pin="BAT" pad="7"/>
+<connect gate="A" pin="DRV" pad="7"/>
 <connect gate="A" pin="EP" pad="9"/>
-<connect gate="A" pin="GND" pad="6"/>
+<connect gate="A" pin="GND" pad="5"/>
 <connect gate="A" pin="HBO" pad="4"/>
-<connect gate="A" pin="LBSEL" pad="5"/>
+<connect gate="A" pin="LBO" pad="6"/>
 <connect gate="A" pin="NTC" pad="2"/>
 <connect gate="A" pin="NTCBIAS" pad="1"/>
 <connect gate="A" pin="VCC" pad="8"/>
 </connects>
 <technologies>
 <technology name="">
-<attribute name="MPN" value="LTC4071EMS8E#PBF" constant="no"/>
-<attribute name="OC_FARNELL" value="1947919" constant="no"/>
-<attribute name="OC_NEWARK" value="13T8411" constant="no"/>
+<attribute name="MPN" value="LTC4070EMS8E#PBF" constant="no"/>
+<attribute name="OC_FARNELL" value="1839141" constant="no"/>
+<attribute name="OC_NEWARK" value="67R4287" constant="no"/>
 <attribute name="PACKAGE" value="MSOP-8" constant="no"/>
-<attribute name="SUPPLIER" value="LINEAR TECHNOLOGY" constant="no"/>
+<attribute name="SUPPLIER" value="Linear Technology" constant="no"/>
 </technology>
 </technologies>
 </device>
@@ -7550,21 +7546,21 @@ by exp-lbrs.ulp</description>
 </classes>
 <parts>
 <part name="FRAME3" library="SparkFun" deviceset="FRAME-LETTER" device=""/>
-<part name="U4" library="TPS62243" deviceset="TPS62243" device=""/>
+<part name="U3" library="TPS62243" deviceset="TPS62243" device=""/>
 <part name="U$66" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U1" library="spv1040" deviceset="SPV1040" device=""/>
-<part name="R7" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="82kΩ"/>
-<part name="R5" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="220kΩ"/>
+<part name="R3" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="82kΩ"/>
+<part name="R2" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="220kΩ"/>
 <part name="U$2" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$3" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C7" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="C2" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="U$4" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun" deviceset="FRAME-LETTER" device=""/>
 <part name="U$10" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$12" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="L3" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
+<part name="L2" library="SparkFun" deviceset="INDUCTOR" device="1007" value="2.2µH"/>
 <part name="U$14" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C5" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
+<part name="C1" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1nF"/>
 <part name="R1" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1kΩ"/>
 <part name="JP2" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="JP3" library="SparkFun" deviceset="M02" device="3.5MM_LOCK" value="PV1"/>
@@ -7574,24 +7570,24 @@ by exp-lbrs.ulp</description>
 <part name="U$18" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$21" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$22" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C11" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C3" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="1µF"/>
 <part name="U$40" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C15" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
+<part name="C4" library="microbuilder_v3" deviceset="CAP_CERAMIC" device="_0402" value="4.7µF"/>
 <part name="U$49" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JTAG1" library="microbuilder_v3" deviceset="JTAG-CORTEXM3" device="SMT"/>
 <part name="U$32" library="microbuilder_v3" deviceset="1.8V" device=""/>
 <part name="U$35" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="D2" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
-<part name="R10" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="330Ω"/>
+<part name="D3" library="led" deviceset="LED" device="CHIPLED_0603" value="GREEN"/>
+<part name="R5" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="330Ω"/>
 <part name="U$24" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="D5" library="nxp" deviceset="DIODE[TVS]" device=""/>
+<part name="D1" library="nxp" deviceset="DIODE[TVS]" device=""/>
 <part name="U$28" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="L1" library="PecanFemto4" deviceset="IND-LPS3015" device="" value="10uH LPS3015"/>
-<part name="C30" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
-<part name="C1" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
-<part name="C2" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
-<part name="C3" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
-<part name="D3" library="RB161M" deviceset="RB161M" device=""/>
+<part name="C7" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="C5" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="C6" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="C8" library="resistor" deviceset="C-EU" device="C0603K" value="10µF"/>
+<part name="D2" library="RB161M" deviceset="RB161M" device=""/>
 <part name="JP1" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="U$6" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP4" library="SparkFun" deviceset="M02" device="LOCK"/>
@@ -7600,16 +7596,15 @@ by exp-lbrs.ulp</description>
 <part name="U$11" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP8" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="U$5" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="C32" library="resistor" deviceset="C-EU" device="C1206K" value="100µF"/>
+<part name="C9" library="resistor" deviceset="C-EU" device="C1206K" value="100µF"/>
 <part name="U$13" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP9" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="U$16" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP10" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="U$17" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="U2" library="LTC4071_EMS8" deviceset="LTC4071EMS8EPBF" device=""/>
 <part name="U$19" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="U$1" library="microbuilder_v3" deviceset="GND" device=""/>
-<part name="R15" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1MΩ"/>
+<part name="R4" library="microbuilder_v3" deviceset="RESISTOR" device="_0402" value="1MΩ"/>
 <part name="JP6" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="U$7" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP12" library="SparkFun" deviceset="M02" device="LOCK"/>
@@ -7618,10 +7613,11 @@ by exp-lbrs.ulp</description>
 <part name="U$23" library="microbuilder_v3" deviceset="GND" device=""/>
 <part name="JP14" library="SparkFun" deviceset="M02" device="LOCK"/>
 <part name="U$25" library="microbuilder_v3" deviceset="GND" device=""/>
+<part name="Q1" library="nxp" deviceset="NX2301P" device="" value="BSS84"/>
 <part name="Q2" library="nxp" deviceset="NX2301P" device="" value="BSS84"/>
-<part name="Q3" library="nxp" deviceset="NX2301P" device="" value="BSS84"/>
 <part name="JP11" library="SparkFun" deviceset="M02" device="3.5MM_LOCK"/>
 <part name="U$8" library="microbuilder_v3" deviceset="GND" device=""/>
+<part name="U2" library="LTC4070_EMS8" deviceset="LTC4070EMS8EPBF" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -7638,18 +7634,16 @@ by exp-lbrs.ulp</description>
 <text x="20.32" y="106.68" size="1.778" layer="97">Input voltage 2v - 2.4v
 from 4x solar panel</text>
 <text x="558.8" y="139.7" size="1.778" layer="97">We draw power from both Solar and Battery</text>
-<text x="157.48" y="63.5" size="1.778" layer="97">R5 = 220kΩ, R7 = 82kΩ
+<text x="157.48" y="63.5" size="1.778" layer="97">R2 = 220kΩ, R3 = 82kΩ
 Vout set = 4.6V
 
-R5 = 180kΩ, R7 = 71.5kΩ
+R2 = 180kΩ, R3 = 71.5kΩ
 Vout set = 4.4V</text>
 <text x="20.32" y="71.12" size="1.778" layer="97">&gt;2V is enough
 to self-start conversion</text>
 <text x="375.92" y="73.66" size="1.778" layer="97">NTC not used
-Float Voltage = 4.0V
-Low Batt. Cutoff = 3.2V</text>
-<text x="403.86" y="76.2" size="1.778" layer="97">Battery is cutoff when &lt; 3.2V.
-LTC4071 shunts current when battery &gt; 4.0V.</text>
+ADJ = GND -&gt; Float Voltage = 4.0V</text>
+<text x="403.86" y="78.74" size="1.778" layer="97">LTC4071 shunts current when battery &gt; 4.0V.</text>
 <text x="332.74" y="91.44" size="1.778" layer="97">Start of cycle:
 Vd = 4.6-3.2V = 1.4V
 I = 70mA
@@ -7666,7 +7660,7 @@ during normal operation. If solar voltage drops
 the MOSFETs cutoff battery charging first. </text>
 <text x="347.98" y="81.28" size="1.778" layer="97"></text>
 <text x="297.18" y="78.74" size="1.778" layer="97">Connect to enable battery charging</text>
-<text x="558.8" y="129.54" size="1.778" layer="97">Could use the body diode of the MOSFETs
+<text x="558.8" y="127" size="1.778" layer="97">Could use the body diode of the MOSFETs
 but Vf is lower this way</text>
 <text x="261.62" y="195.58" size="2.54" layer="97">EDIT: Not sure if standard cutoffs are useful. The internal resistance is too large.
 
@@ -7693,22 +7687,22 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <instances>
 <instance part="FRAME3" gate="G$1" x="0" y="0"/>
 <instance part="FRAME3" gate="G$2" x="144.78" y="0"/>
-<instance part="U4" gate="G$1" x="668.02" y="127"/>
+<instance part="U3" gate="G$1" x="668.02" y="127"/>
 <instance part="U$66" gate="G$1" x="716.28" y="144.78" rot="MR0"/>
 <instance part="U1" gate="G$1" x="124.46" y="101.6"/>
-<instance part="R7" gate="G$1" x="172.72" y="88.9" rot="R90"/>
-<instance part="R5" gate="G$1" x="172.72" y="99.06" rot="R90"/>
+<instance part="R3" gate="G$1" x="172.72" y="88.9" rot="R90"/>
+<instance part="R2" gate="G$1" x="172.72" y="99.06" rot="R90"/>
 <instance part="U$2" gate="G$1" x="93.98" y="104.14" rot="R270"/>
 <instance part="U$3" gate="G$1" x="172.72" y="81.28"/>
-<instance part="C7" gate="G$1" x="162.56" y="86.36"/>
+<instance part="C2" gate="G$1" x="162.56" y="86.36"/>
 <instance part="U$4" gate="G$1" x="162.56" y="81.28"/>
 <instance part="FRAME1" gate="G$1" x="505.46" y="0"/>
 <instance part="FRAME1" gate="G$2" x="650.24" y="0"/>
 <instance part="U$10" gate="G$1" x="652.78" y="111.76"/>
 <instance part="U$12" gate="G$1" x="716.28" y="111.76"/>
-<instance part="L3" gate="G$1" x="690.88" y="134.62" rot="R90"/>
+<instance part="L2" gate="G$1" x="690.88" y="134.62" rot="R90"/>
 <instance part="U$14" gate="G$1" x="99.06" y="119.38" rot="R90"/>
-<instance part="C5" gate="G$1" x="88.9" y="119.38" rot="R270"/>
+<instance part="C1" gate="G$1" x="88.9" y="119.38" rot="R270"/>
 <instance part="R1" gate="G$1" x="76.2" y="109.22"/>
 <instance part="JP2" gate="G$1" x="226.06" y="93.98" rot="MR90"/>
 <instance part="JP3" gate="G$1" x="22.86" y="99.06" rot="MR180"/>
@@ -7719,24 +7713,24 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <instance part="U$18" gate="G$1" x="50.8" y="81.28"/>
 <instance part="U$21" gate="G$1" x="457.2" y="86.36"/>
 <instance part="U$22" gate="G$1" x="447.04" y="86.36"/>
-<instance part="C11" gate="G$1" x="363.22" y="101.6"/>
+<instance part="C3" gate="G$1" x="363.22" y="101.6"/>
 <instance part="U$40" gate="G$1" x="363.22" y="86.36"/>
-<instance part="C15" gate="G$1" x="642.62" y="119.38"/>
+<instance part="C4" gate="G$1" x="642.62" y="119.38"/>
 <instance part="U$49" gate="G$1" x="642.62" y="111.76"/>
 <instance part="JTAG1" gate="G$1" x="703.58" y="50.8" rot="MR0"/>
 <instance part="U$32" gate="G$1" x="716.28" y="68.58" rot="MR0"/>
 <instance part="U$35" gate="G$1" x="716.28" y="40.64"/>
-<instance part="D2" gate="G$1" x="431.8" y="96.52"/>
-<instance part="R10" gate="G$1" x="431.8" y="104.14" rot="R90"/>
+<instance part="D3" gate="G$1" x="431.8" y="96.52"/>
+<instance part="R5" gate="G$1" x="431.8" y="104.14" rot="R90"/>
 <instance part="U$24" gate="G$1" x="182.88" y="81.28"/>
-<instance part="D5" gate="G$1" x="215.9" y="93.98" rot="R90"/>
+<instance part="D1" gate="G$1" x="215.9" y="93.98" rot="R90"/>
 <instance part="U$28" gate="G$1" x="215.9" y="81.28"/>
 <instance part="L1" gate="G$1" x="81.28" y="99.06"/>
-<instance part="C30" gate="G$1" x="447.04" y="101.6"/>
-<instance part="C1" gate="G$1" x="50.8" y="91.44"/>
-<instance part="C2" gate="G$1" x="182.88" y="93.98"/>
-<instance part="C3" gate="G$1" x="716.28" y="124.46"/>
-<instance part="D3" gate="A" x="586.74" y="134.62"/>
+<instance part="C7" gate="G$1" x="447.04" y="101.6"/>
+<instance part="C5" gate="G$1" x="50.8" y="91.44"/>
+<instance part="C6" gate="G$1" x="182.88" y="93.98"/>
+<instance part="C8" gate="G$1" x="716.28" y="124.46"/>
+<instance part="D2" gate="A" x="586.74" y="134.62"/>
 <instance part="JP1" gate="G$1" x="22.86" y="160.02" rot="MR180"/>
 <instance part="U$6" gate="G$1" x="33.02" y="157.48" rot="R90"/>
 <instance part="JP4" gate="G$1" x="22.86" y="147.32" rot="MR180"/>
@@ -7745,16 +7739,15 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <instance part="U$11" gate="G$1" x="177.8" y="144.78" rot="R90"/>
 <instance part="JP8" gate="G$1" x="22.86" y="134.62" rot="MR180"/>
 <instance part="U$5" gate="G$1" x="33.02" y="132.08" rot="R90"/>
-<instance part="C32" gate="G$1" x="195.58" y="93.98"/>
+<instance part="C9" gate="G$1" x="195.58" y="93.98"/>
 <instance part="U$13" gate="G$1" x="195.58" y="81.28"/>
 <instance part="JP9" gate="G$1" x="167.64" y="134.62" rot="MR180"/>
 <instance part="U$16" gate="G$1" x="177.8" y="132.08" rot="R90"/>
 <instance part="JP10" gate="G$1" x="690.88" y="165.1" rot="MR180"/>
 <instance part="U$17" gate="G$1" x="701.04" y="162.56" rot="R90"/>
-<instance part="U2" gate="A" x="398.78" y="109.22"/>
 <instance part="U$19" gate="G$1" x="378.46" y="86.36"/>
 <instance part="U$1" gate="G$1" x="431.8" y="86.36"/>
-<instance part="R15" gate="G$1" x="314.96" y="111.76"/>
+<instance part="R4" gate="G$1" x="314.96" y="111.76"/>
 <instance part="JP6" gate="G$1" x="314.96" y="93.98" rot="MR180"/>
 <instance part="U$7" gate="G$1" x="325.12" y="86.36"/>
 <instance part="JP12" gate="G$1" x="365.76" y="139.7" rot="MR180"/>
@@ -7763,21 +7756,22 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <instance part="U$23" gate="G$1" x="434.34" y="137.16" rot="R90"/>
 <instance part="JP14" gate="G$1" x="609.6" y="165.1" rot="MR180"/>
 <instance part="U$25" gate="G$1" x="619.76" y="162.56" rot="R90"/>
-<instance part="Q2" gate="A" x="327.66" y="119.38" rot="R90"/>
-<instance part="Q3" gate="A" x="347.98" y="119.38" rot="R90"/>
+<instance part="Q1" gate="A" x="327.66" y="119.38" rot="R90"/>
+<instance part="Q2" gate="A" x="347.98" y="119.38" rot="R90"/>
 <instance part="JP11" gate="G$1" x="739.14" y="134.62" rot="R180"/>
 <instance part="U$8" gate="G$1" x="728.98" y="111.76"/>
+<instance part="U2" gate="A" x="398.78" y="114.3"/>
 </instances>
 <busses>
 </busses>
 <nets>
 <net name="GND" class="0">
 <segment>
-<pinref part="R7" gate="G$1" pin="1"/>
+<pinref part="R3" gate="G$1" pin="1"/>
 <pinref part="U$3" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C7" gate="G$1" pin="P$2"/>
+<pinref part="C2" gate="G$1" pin="P$2"/>
 <pinref part="U$4" gate="G$1" pin="GND"/>
 </segment>
 <segment>
@@ -7786,21 +7780,21 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <wire x1="96.52" y1="104.14" x2="99.06" y2="104.14" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U4" gate="G$1" pin="GND"/>
+<pinref part="U3" gate="G$1" pin="GND"/>
 <pinref part="U$10" gate="G$1" pin="GND"/>
 <wire x1="655.32" y1="121.92" x2="652.78" y2="121.92" width="0.1524" layer="91"/>
 <wire x1="652.78" y1="121.92" x2="652.78" y2="119.38" width="0.1524" layer="91"/>
-<pinref part="U4" gate="G$1" pin="GND2"/>
+<pinref part="U3" gate="G$1" pin="GND2"/>
 <wire x1="652.78" y1="119.38" x2="652.78" y2="114.3" width="0.1524" layer="91"/>
 <wire x1="655.32" y1="119.38" x2="652.78" y2="119.38" width="0.1524" layer="91"/>
 <junction x="652.78" y="119.38"/>
-<pinref part="U4" gate="G$1" pin="MODE"/>
+<pinref part="U3" gate="G$1" pin="MODE"/>
 <wire x1="655.32" y1="127" x2="652.78" y2="127" width="0.1524" layer="91"/>
 <wire x1="652.78" y1="127" x2="652.78" y2="121.92" width="0.1524" layer="91"/>
 <junction x="652.78" y="121.92"/>
 </segment>
 <segment>
-<pinref part="C5" gate="G$1" pin="P$1"/>
+<pinref part="C1" gate="G$1" pin="P$1"/>
 <pinref part="U$14" gate="G$1" pin="GND"/>
 <wire x1="93.98" y1="119.38" x2="96.52" y2="119.38" width="0.1524" layer="91"/>
 </segment>
@@ -7813,7 +7807,7 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <segment>
 <pinref part="U$18" gate="G$1" pin="GND"/>
 <wire x1="50.8" y1="83.82" x2="50.8" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="C1" gate="G$1" pin="2"/>
+<pinref part="C5" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="JP5" gate="G$1" pin="2"/>
@@ -7824,15 +7818,15 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <segment>
 <pinref part="U$22" gate="G$1" pin="GND"/>
 <wire x1="447.04" y1="88.9" x2="447.04" y2="96.52" width="0.1524" layer="91"/>
-<pinref part="C30" gate="G$1" pin="2"/>
+<pinref part="C7" gate="G$1" pin="2"/>
 </segment>
 <segment>
 <pinref part="U$40" gate="G$1" pin="GND"/>
-<pinref part="C11" gate="G$1" pin="P$2"/>
+<pinref part="C3" gate="G$1" pin="P$2"/>
 <wire x1="363.22" y1="88.9" x2="363.22" y2="99.06" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C15" gate="G$1" pin="P$2"/>
+<pinref part="C4" gate="G$1" pin="P$2"/>
 <pinref part="U$49" gate="G$1" pin="GND"/>
 <wire x1="642.62" y1="116.84" x2="642.62" y2="114.3" width="0.1524" layer="91"/>
 </segment>
@@ -7849,15 +7843,15 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <segment>
 <pinref part="U$24" gate="G$1" pin="GND"/>
 <wire x1="182.88" y1="88.9" x2="182.88" y2="83.82" width="0.1524" layer="91"/>
-<pinref part="C2" gate="G$1" pin="2"/>
+<pinref part="C6" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="D5" gate="G$1" pin="1"/>
+<pinref part="D1" gate="G$1" pin="1"/>
 <pinref part="U$28" gate="G$1" pin="GND"/>
 <wire x1="215.9" y1="91.44" x2="215.9" y2="83.82" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C3" gate="G$1" pin="2"/>
+<pinref part="C8" gate="G$1" pin="2"/>
 <pinref part="U$12" gate="G$1" pin="GND"/>
 <wire x1="716.28" y1="119.38" x2="716.28" y2="114.3" width="0.1524" layer="91"/>
 </segment>
@@ -7878,7 +7872,7 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <pinref part="U$5" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C32" gate="G$1" pin="2"/>
+<pinref part="C9" gate="G$1" pin="2"/>
 <pinref part="U$13" gate="G$1" pin="GND"/>
 <wire x1="195.58" y1="88.9" x2="195.58" y2="83.82" width="0.1524" layer="91"/>
 </segment>
@@ -7891,25 +7885,21 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <pinref part="U$17" gate="G$1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="U2" gate="A" pin="GND"/>
 <pinref part="U$19" gate="G$1" pin="GND"/>
 <wire x1="381" y1="101.6" x2="378.46" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="378.46" y1="101.6" x2="378.46" y2="99.06" width="0.1524" layer="91"/>
-<pinref part="U2" gate="A" pin="EP"/>
-<wire x1="378.46" y1="99.06" x2="378.46" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="381" y1="99.06" x2="378.46" y2="99.06" width="0.1524" layer="91"/>
-<junction x="378.46" y="99.06"/>
-<pinref part="U2" gate="A" pin="ADJ"/>
+<wire x1="378.46" y1="101.6" x2="378.46" y2="88.9" width="0.1524" layer="91"/>
 <wire x1="381" y1="109.22" x2="378.46" y2="109.22" width="0.1524" layer="91"/>
-<wire x1="378.46" y1="109.22" x2="378.46" y2="106.68" width="0.1524" layer="91"/>
 <junction x="378.46" y="101.6"/>
-<pinref part="U2" gate="A" pin="LBSEL"/>
-<wire x1="378.46" y1="106.68" x2="378.46" y2="101.6" width="0.1524" layer="91"/>
-<wire x1="381" y1="106.68" x2="378.46" y2="106.68" width="0.1524" layer="91"/>
-<junction x="378.46" y="106.68"/>
+<wire x1="378.46" y1="109.22" x2="378.46" y2="104.14" width="0.1524" layer="91"/>
+<pinref part="U2" gate="A" pin="ADJ"/>
+<pinref part="U2" gate="A" pin="EP"/>
+<pinref part="U2" gate="A" pin="GND"/>
+<wire x1="378.46" y1="104.14" x2="378.46" y2="101.6" width="0.1524" layer="91"/>
+<wire x1="381" y1="104.14" x2="378.46" y2="104.14" width="0.1524" layer="91"/>
+<junction x="378.46" y="104.14"/>
 </segment>
 <segment>
-<pinref part="D2" gate="G$1" pin="C"/>
+<pinref part="D3" gate="G$1" pin="C"/>
 <wire x1="431.8" y1="88.9" x2="431.8" y2="91.44" width="0.1524" layer="91"/>
 <pinref part="U$1" gate="G$1" pin="GND"/>
 </segment>
@@ -7947,12 +7937,12 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 </segment>
 <segment>
 <pinref part="U$66" gate="G$1" pin="1.8V"/>
-<pinref part="C3" gate="G$1" pin="1"/>
+<pinref part="C8" gate="G$1" pin="1"/>
 <wire x1="716.28" y1="142.24" x2="716.28" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="L3" gate="G$1" pin="2"/>
+<pinref part="L2" gate="G$1" pin="2"/>
 <wire x1="716.28" y1="134.62" x2="716.28" y2="127" width="0.1524" layer="91"/>
 <wire x1="698.5" y1="134.62" x2="703.58" y2="134.62" width="0.1524" layer="91"/>
-<pinref part="U4" gate="G$1" pin="FB"/>
+<pinref part="U3" gate="G$1" pin="FB"/>
 <wire x1="703.58" y1="127" x2="680.72" y2="127" width="0.1524" layer="91"/>
 <wire x1="703.58" y1="127" x2="703.58" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="703.58" y1="134.62" x2="716.28" y2="134.62" width="0.1524" layer="91"/>
@@ -7974,16 +7964,38 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <pinref part="JP5" gate="G$1" pin="1"/>
 <wire x1="447.04" y1="114.3" x2="462.28" y2="114.3" width="0.1524" layer="91"/>
 <wire x1="447.04" y1="104.14" x2="447.04" y2="114.3" width="0.1524" layer="91"/>
-<pinref part="C30" gate="G$1" pin="1"/>
-<pinref part="U2" gate="A" pin="BAT"/>
-<wire x1="416.56" y1="114.3" x2="447.04" y2="114.3" width="0.1524" layer="91"/>
-<junction x="447.04" y="114.3"/>
+<pinref part="C7" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="JP13" gate="G$1" pin="1"/>
 <wire x1="431.8" y1="139.7" x2="454.66" y2="139.7" width="0.1524" layer="91"/>
 <label x="439.42" y="139.7" size="1.778" layer="95"/>
 </segment>
+<segment>
+<wire x1="381" y1="119.38" x2="378.46" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="378.46" y1="119.38" x2="363.22" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="381" y1="111.76" x2="378.46" y2="111.76" width="0.1524" layer="91"/>
+<wire x1="378.46" y1="111.76" x2="378.46" y2="119.38" width="0.1524" layer="91"/>
+<junction x="378.46" y="119.38"/>
+<label x="360.68" y="119.38" size="1.778" layer="95"/>
+<pinref part="C3" gate="G$1" pin="P$1"/>
+<wire x1="353.06" y1="119.38" x2="363.22" y2="119.38" width="0.1524" layer="91"/>
+<wire x1="363.22" y1="119.38" x2="363.22" y2="106.68" width="0.1524" layer="91"/>
+<junction x="363.22" y="119.38"/>
+<pinref part="Q2" gate="A" pin="D"/>
+<pinref part="U2" gate="A" pin="VCC"/>
+<pinref part="U2" gate="A" pin="NTC"/>
+</segment>
+<segment>
+<pinref part="D2" gate="A" pin="A"/>
+<wire x1="584.2" y1="134.62" x2="561.34" y2="134.62" width="0.1524" layer="91"/>
+<label x="563.88" y="134.62" size="1.778" layer="95"/>
+</segment>
+<segment>
+<pinref part="JP12" gate="G$1" pin="1"/>
+<wire x1="373.38" y1="139.7" x2="396.24" y2="139.7" width="0.1524" layer="91"/>
+<label x="378.46" y="139.7" size="1.778" layer="95"/>
+</segment>
 </net>
 <net name="LX" class="0">
 <segment>
@@ -8018,7 +8030,7 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <wire x1="50.8" y1="93.98" x2="50.8" y2="99.06" width="0.1524" layer="91"/>
 <junction x="50.8" y="99.06"/>
 <pinref part="L1" gate="G$1" pin="1"/>
-<pinref part="C1" gate="G$1" pin="1"/>
+<pinref part="C5" gate="G$1" pin="1"/>
 </segment>
 <segment>
 <pinref part="JP1" gate="G$1" pin="1"/>
@@ -8038,13 +8050,13 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <wire x1="152.4" y1="99.06" x2="152.4" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="152.4" y1="104.14" x2="172.72" y2="104.14" width="0.1524" layer="91"/>
 <junction x="152.4" y="104.14"/>
-<pinref part="R5" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 <junction x="172.72" y="104.14"/>
 <wire x1="172.72" y1="104.14" x2="182.88" y2="104.14" width="0.1524" layer="91"/>
 <label x="157.48" y="104.14" size="1.778" layer="95"/>
 <wire x1="182.88" y1="96.52" x2="182.88" y2="104.14" width="0.1524" layer="91"/>
 <junction x="182.88" y="104.14"/>
-<pinref part="D5" gate="G$1" pin="2"/>
+<pinref part="D1" gate="G$1" pin="2"/>
 <wire x1="182.88" y1="104.14" x2="195.58" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="195.58" y1="104.14" x2="215.9" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="215.9" y1="104.14" x2="215.9" y2="93.98" width="0.1524" layer="91"/>
@@ -8055,8 +8067,8 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <wire x1="215.9" y1="104.14" x2="226.06" y2="104.14" width="0.1524" layer="91"/>
 <wire x1="226.06" y1="104.14" x2="226.06" y2="101.6" width="0.1524" layer="91"/>
 <junction x="215.9" y="104.14"/>
-<pinref part="C2" gate="G$1" pin="1"/>
-<pinref part="C32" gate="G$1" pin="1"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<pinref part="C9" gate="G$1" pin="1"/>
 <wire x1="195.58" y1="104.14" x2="195.58" y2="96.52" width="0.1524" layer="91"/>
 <junction x="195.58" y="104.14"/>
 </segment>
@@ -8070,7 +8082,7 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <segment>
 <pinref part="U1" gate="G$1" pin="MPP-SET"/>
 <wire x1="83.82" y1="109.22" x2="99.06" y2="109.22" width="0.1524" layer="91"/>
-<pinref part="C5" gate="G$1" pin="P$2"/>
+<pinref part="C1" gate="G$1" pin="P$2"/>
 <wire x1="86.36" y1="119.38" x2="83.82" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="83.82" y1="119.38" x2="83.82" y2="109.22" width="0.1524" layer="91"/>
 <junction x="83.82" y="109.22"/>
@@ -8086,10 +8098,10 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 </net>
 <net name="SPV_VCTRL" class="0">
 <segment>
-<pinref part="C7" gate="G$1" pin="P$1"/>
+<pinref part="C2" gate="G$1" pin="P$1"/>
 <wire x1="162.56" y1="93.98" x2="162.56" y2="91.44" width="0.1524" layer="91"/>
-<pinref part="R7" gate="G$1" pin="2"/>
-<pinref part="R5" gate="G$1" pin="1"/>
+<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 <wire x1="162.56" y1="93.98" x2="172.72" y2="93.98" width="0.1524" layer="91"/>
 <pinref part="U1" gate="G$1" pin="VCTRL"/>
 <wire x1="149.86" y1="93.98" x2="162.56" y2="93.98" width="0.1524" layer="91"/>
@@ -8105,8 +8117,8 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 </net>
 <net name="CHG_LED" class="0">
 <segment>
-<pinref part="D2" gate="G$1" pin="A"/>
-<pinref part="R10" gate="G$1" pin="1"/>
+<pinref part="D3" gate="G$1" pin="A"/>
+<pinref part="R5" gate="G$1" pin="1"/>
 </segment>
 </net>
 <net name="SOLAR" class="0">
@@ -8117,27 +8129,27 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 <label x="233.68" y="104.14" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="Q2" gate="A" pin="S"/>
+<pinref part="Q1" gate="A" pin="S"/>
 <wire x1="322.58" y1="119.38" x2="304.8" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="304.8" y1="119.38" x2="304.8" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="304.8" y1="124.46" x2="289.56" y2="124.46" width="0.1524" layer="91"/>
-<pinref part="R15" gate="G$1" pin="1"/>
+<pinref part="R4" gate="G$1" pin="1"/>
 <wire x1="309.88" y1="111.76" x2="304.8" y2="111.76" width="0.1524" layer="91"/>
 <wire x1="304.8" y1="111.76" x2="304.8" y2="119.38" width="0.1524" layer="91"/>
 <junction x="304.8" y="119.38"/>
 <label x="292.1" y="124.46" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="U4" gate="G$1" pin="EN"/>
+<pinref part="U3" gate="G$1" pin="EN"/>
 <wire x1="655.32" y1="132.08" x2="652.78" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="U4" gate="G$1" pin="VIN"/>
+<pinref part="U3" gate="G$1" pin="VIN"/>
 <wire x1="655.32" y1="134.62" x2="652.78" y2="134.62" width="0.1524" layer="91"/>
 <label x="637.54" y="134.62" size="1.778" layer="95"/>
-<pinref part="C15" gate="G$1" pin="P$1"/>
+<pinref part="C4" gate="G$1" pin="P$1"/>
 <wire x1="652.78" y1="134.62" x2="642.62" y2="134.62" width="0.1524" layer="91"/>
 <wire x1="642.62" y1="134.62" x2="642.62" y2="124.46" width="0.1524" layer="91"/>
 <junction x="642.62" y="134.62"/>
-<pinref part="D3" gate="A" pin="C"/>
+<pinref part="D2" gate="A" pin="C"/>
 <wire x1="589.28" y1="134.62" x2="642.62" y2="134.62" width="0.1524" layer="91"/>
 <label x="607.06" y="134.62" size="1.778" layer="95"/>
 <wire x1="652.78" y1="132.08" x2="652.78" y2="134.62" width="0.1524" layer="91"/>
@@ -8151,54 +8163,27 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 </net>
 <net name="N$7" class="0">
 <segment>
-<pinref part="U4" gate="G$1" pin="SW"/>
-<pinref part="L3" gate="G$1" pin="1"/>
+<pinref part="U3" gate="G$1" pin="SW"/>
+<pinref part="L2" gate="G$1" pin="1"/>
 <wire x1="680.72" y1="134.62" x2="683.26" y2="134.62" width="0.1524" layer="91"/>
 </segment>
 </net>
-<net name="BATTERY_VCC" class="0">
-<segment>
-<pinref part="U2" gate="A" pin="VCC"/>
-<wire x1="381" y1="119.38" x2="378.46" y2="119.38" width="0.1524" layer="91"/>
-<pinref part="U2" gate="A" pin="NTC"/>
-<wire x1="378.46" y1="119.38" x2="363.22" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="381" y1="111.76" x2="378.46" y2="111.76" width="0.1524" layer="91"/>
-<wire x1="378.46" y1="111.76" x2="378.46" y2="119.38" width="0.1524" layer="91"/>
-<junction x="378.46" y="119.38"/>
-<label x="360.68" y="119.38" size="1.778" layer="95"/>
-<pinref part="C11" gate="G$1" pin="P$1"/>
-<wire x1="353.06" y1="119.38" x2="363.22" y2="119.38" width="0.1524" layer="91"/>
-<wire x1="363.22" y1="119.38" x2="363.22" y2="106.68" width="0.1524" layer="91"/>
-<junction x="363.22" y="119.38"/>
-<pinref part="Q3" gate="A" pin="D"/>
-</segment>
-<segment>
-<pinref part="D3" gate="A" pin="A"/>
-<wire x1="584.2" y1="134.62" x2="561.34" y2="134.62" width="0.1524" layer="91"/>
-<label x="563.88" y="134.62" size="1.778" layer="95"/>
-</segment>
-<segment>
-<pinref part="JP12" gate="G$1" pin="1"/>
-<wire x1="373.38" y1="139.7" x2="396.24" y2="139.7" width="0.1524" layer="91"/>
-<label x="378.46" y="139.7" size="1.778" layer="95"/>
-</segment>
-</net>
 <net name="HBO" class="0">
 <segment>
-<pinref part="R10" gate="G$1" pin="2"/>
-<pinref part="U2" gate="A" pin="HBO"/>
+<pinref part="R5" gate="G$1" pin="2"/>
 <wire x1="416.56" y1="119.38" x2="431.8" y2="119.38" width="0.1524" layer="91"/>
 <wire x1="431.8" y1="119.38" x2="431.8" y2="109.22" width="0.1524" layer="91"/>
 <label x="419.1" y="119.38" size="1.778" layer="95"/>
+<pinref part="U2" gate="A" pin="HBO"/>
 </segment>
 </net>
 <net name="BATT_MOSFET_CTRL" class="0">
 <segment>
-<pinref part="Q3" gate="A" pin="G"/>
-<wire x1="345.44" y1="114.3" x2="345.44" y2="111.76" width="0.1524" layer="91"/>
 <pinref part="Q2" gate="A" pin="G"/>
+<wire x1="345.44" y1="114.3" x2="345.44" y2="111.76" width="0.1524" layer="91"/>
+<pinref part="Q1" gate="A" pin="G"/>
 <wire x1="325.12" y1="114.3" x2="325.12" y2="111.76" width="0.1524" layer="91"/>
-<pinref part="R15" gate="G$1" pin="2"/>
+<pinref part="R4" gate="G$1" pin="2"/>
 <wire x1="320.04" y1="111.76" x2="325.12" y2="111.76" width="0.1524" layer="91"/>
 <wire x1="345.44" y1="111.76" x2="325.12" y2="111.76" width="0.1524" layer="91"/>
 <junction x="325.12" y="111.76"/>
@@ -8209,8 +8194,8 @@ Bump up SPV output voltage to 4.7V nom (4.8V max) for 20mA termination current.<
 </net>
 <net name="BATTERY_MOSFET_1" class="0">
 <segment>
-<pinref part="Q2" gate="A" pin="D"/>
-<pinref part="Q3" gate="A" pin="S"/>
+<pinref part="Q1" gate="A" pin="D"/>
+<pinref part="Q2" gate="A" pin="S"/>
 <wire x1="332.74" y1="119.38" x2="342.9" y2="119.38" width="0.1524" layer="91"/>
 </segment>
 </net>
diff --git a/hardware/solar-breakout/bristol_longshot.sch.pdf b/hardware/solar-breakout/bristol_longshot.sch.pdf
index fb9e314..ece7936 100644
Binary files a/hardware/solar-breakout/bristol_longshot.sch.pdf and b/hardware/solar-breakout/bristol_longshot.sch.pdf differ
diff --git a/hardware/solar-breakout/bristol_longshot.sch.png b/hardware/solar-breakout/bristol_longshot.sch.png
index f3404f6..521df81 100644
Binary files a/hardware/solar-breakout/bristol_longshot.sch.png and b/hardware/solar-breakout/bristol_longshot.sch.png differ
diff --git a/hardware/solar-breakout/parts b/hardware/solar-breakout/parts
index e1a0d56..0785291 100644
--- a/hardware/solar-breakout/parts
+++ b/hardware/solar-breakout/parts
@@ -7,7 +7,7 @@
 | Part | Description | Supplier | Quantity Required | Notes
 | ---  | ---         | ---       | ---               | ---
 511-SPV1040T 1 U1 MPPT SPV1040T
-1839141 1 U2 Li-ion battery charger LTC4070 - replaces LTC4071, leave pin 7 floating
+1839141 1 U2 Li-ion battery charger LTC4070
 2400648 595-TPS62243DRVT 1 U3 Buck Converter DRVT = SON-6 TPS62243
 1829262 1 TVS diode for MPPT D1
 1525484 1 Small signal schottky RB161M D2
@@ -19,7 +19,8 @@
 2408024 1 L1 Lx for MPPT LPS3015
 2428203 1 Inductor for Buck L2
 2320765 2 C1, C2 1nF Mpp-set, vctrl
-2309027 2 C3, C4 4.7uF
+2218855 1 C3 1uF
+2309027 1 C4 4.7uF
 1833804 4 C5, C6, C7, C8 10µF 0603
 1735535 1 C9 100µF 1206 optional
 2331474 1 R1 1k Mpp-set