diff --git a/canable.sch b/canable.sch
--- a/canable.sch
+++ b/canable.sch
@@ -2146,7 +2146,7 @@ 5V - VREG-00823</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="STM32F042C6T6">
+<deviceset name="STM32F042C6T6" prefix="U">
 <description>STM32F0 Family Microcontroller</description>
 <gates>
 <gate name="G$1" symbol="STM32F042C6T6" x="-5.08" y="20.32"/>
@@ -3480,7 +3480,7 @@ http://dangerousprototypes.com</descript
 </libraries>
 <attributes>
 <attribute name="CNAME" value="CANable USB&lt;=&gt;CAN"/>
-<attribute name="CREVISION" value="0.1"/>
+<attribute name="CREVISION" value="0.4"/>
 <attribute name="DESIGNER" value="Ethan Zonca"/>
 </attributes>
 <variantdefs>
@@ -3491,49 +3491,49 @@ http://dangerousprototypes.com</descript
 </classes>
 <parts>
 <part name="U2" library="SparkFun-PowerIC" deviceset="MIC5205" device="3.3V" value="MF-REG-SOT235-3.3V-300mA"/>
-<part name="LED1" library="SparkFun-LED" deviceset="LED" device="0603" value="LB Q39G-L2OO-35-1"/>
-<part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="D2" library="SparkFun-LED" deviceset="LED" device="0603" value="MF-LED-0603-RED"/>
+<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
+<part name="GND6" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="SUPPLY5" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="C5" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="1uF"/>
-<part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="1uF"/>
-<part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="390"/>
-<part name="GND4" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="C6" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="1uF"/>
+<part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="390"/>
+<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND5" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="GND7" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="FRAME1" library="SparkFun-Aesthetics" deviceset="FRAME-A4L" device=""/>
-<part name="C2" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
-<part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
-<part name="U$18" library="microbuilder" deviceset="GND" device=""/>
+<part name="C3" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
+<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
+<part name="SUP1" library="microbuilder" deviceset="GND" device=""/>
 <part name="U3" library="SparkFun-DigitalIC" deviceset="MCP2551" device="" value="MCP2551T-E/SN"/>
 <part name="U1" library="Protofusion" deviceset="STM32F042C6T6" device=""/>
-<part name="J1" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
-<part name="LED2" library="SparkFun-LED" deviceset="LED" device="0603" value="MF-LED-0603-GREEN"/>
-<part name="R2" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="560"/>
+<part name="J2" library="Protofusion" deviceset="POGOPIN-CONN-4" device=""/>
+<part name="D1" library="SparkFun-LED" deviceset="LED" device="0603" value="MF-LED-0603-GREEN"/>
+<part name="R1" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="560"/>
 <part name="GND1" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY1" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="GND3" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="C3" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
-<part name="GND5" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="120"/>
-<part name="SUPPLY6" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
-<part name="GND6" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="GND8" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="C7" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
+<part name="GND11" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="R4" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="120"/>
+<part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="GND9" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
-<part name="C6" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
+<part name="SUPPLY8" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
 <part name="GND10" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="GND11" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
-<part name="R4" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="10k"/>
-<part name="J4" library="SparkFun-Connectors" deviceset="M03" device="LOCK" value="M20-9990346"/>
-<part name="SUPPLY8" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="J5" library="SparkFun-Connectors" deviceset="M03" device="LOCK" value="M20-9990346"/>
+<part name="C2" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
+<part name="C1" library="SparkFun-Passives" deviceset="CAP" device="0603-CAP" value="0.1uF"/>
+<part name="GND4" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
+<part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0603-RES" value="10k"/>
+<part name="JP3" library="SparkFun-Connectors" deviceset="M03" device="LOCK" value="M20-9990346"/>
+<part name="SUPPLY6" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="JP2" library="SparkFun-Connectors" deviceset="M03" device="LOCK" value="M20-9990346"/>
 <part name="J3" library="SparkFun-Connectors" deviceset="M04" device="SCREW_LOCK" value="0393570004"/>
 <part name="SUPPLY7" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="F1" library="dp_devices" deviceset="FUSE_PTC" device="-0805" value="0ZCK0035FF2G"/>
-<part name="J2" library="MF_Connectors" deviceset="USB" device="_MICRO_RIGHT"/>
-<part name="U$4" library="microbuilder" deviceset="GND" device=""/>
+<part name="J1" library="MF_Connectors" deviceset="USB" device="_MICRO_RIGHT" value="MF-CON-MICROUSB-RIGHT"/>
+<part name="SUP2" library="microbuilder" deviceset="GND" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -3543,64 +3543,86 @@ http://dangerousprototypes.com</descript
 <wire x1="78.74" y1="5.08" x2="78.74" y2="12.7" width="0.0254" layer="94"/>
 <wire x1="78.74" y1="12.7" x2="184.15" y2="12.7" width="0.0254" layer="94"/>
 <wire x1="184.15" y1="12.7" x2="184.15" y2="11.938" width="0.1524" layer="94"/>
-<text x="233.934" y="171.704" size="5.08" layer="113">Jumpers</text>
-<text x="224.028" y="105.664" size="5.08" layer="113">Connectors</text>
+<text x="226.314" y="171.704" size="5.08" layer="113">Jumpers</text>
+<text x="221.488" y="108.204" size="5.08" layer="113">Connectors</text>
 <text x="17.78" y="123.444" size="2.1844" layer="94">PC13 connected for
 ease of routing</text>
 <text x="25.654" y="61.468" size="5.08" layer="113">Indication</text>
 <text x="262.382" y="151.13" size="2.1844" layer="94" rot="R180">2-3 terminates CAN bus</text>
 <text x="261.366" y="124.968" size="2.1844" layer="94" rot="R180">1-2 enters bootloader</text>
+<text x="165.608" y="171.704" size="5.08" layer="113">USB</text>
 </plain>
 <instances>
-<instance part="U2" gate="G$1" x="121.92" y="38.1"/>
-<instance part="LED1" gate="G$1" x="50.8" y="27.94"/>
-<instance part="SUPPLY3" gate="G$1" x="106.68" y="45.72"/>
-<instance part="GND2" gate="1" x="106.68" y="27.94"/>
-<instance part="SUPPLY4" gate="G$1" x="149.86" y="45.72"/>
-<instance part="SUPPLY5" gate="G$1" x="190.5" y="170.18"/>
-<instance part="C5" gate="G$1" x="93.98" y="40.64" rot="R180"/>
-<instance part="C7" gate="G$1" x="154.94" y="35.56"/>
-<instance part="R1" gate="G$1" x="50.8" y="38.1" rot="R270"/>
-<instance part="GND4" gate="1" x="50.8" y="17.78"/>
-<instance part="GND7" gate="1" x="93.98" y="30.48"/>
-<instance part="GND8" gate="1" x="154.94" y="27.94"/>
+<instance part="U2" gate="G$1" x="121.92" y="38.1" smashed="yes">
+<attribute name="NAME" x="114.3" y="47.244" size="1.778" layer="95"/>
+<attribute name="VALUE" x="114.3" y="21.59" size="1.778" layer="96"/>
+</instance>
+<instance part="D2" gate="G$1" x="50.8" y="27.94" smashed="yes">
+<attribute name="NAME" x="47.371" y="23.368" size="1.778" layer="95" font="vector" rot="R90"/>
+<attribute name="VALUE" x="55.245" y="20.066" size="1.778" layer="96" font="vector" rot="R90" align="top-left"/>
+</instance>
+<instance part="SUPPLY2" gate="G$1" x="99.06" y="45.72"/>
+<instance part="GND6" gate="1" x="106.68" y="27.94"/>
+<instance part="SUPPLY3" gate="G$1" x="139.7" y="45.72"/>
+<instance part="SUPPLY5" gate="G$1" x="193.04" y="160.02"/>
+<instance part="C5" gate="G$1" x="99.06" y="38.1" rot="R180"/>
+<instance part="C6" gate="G$1" x="139.7" y="35.56"/>
+<instance part="R2" gate="G$1" x="50.8" y="38.1" rot="R270"/>
+<instance part="GND3" gate="1" x="50.8" y="17.78"/>
+<instance part="GND5" gate="1" x="99.06" y="27.94"/>
+<instance part="GND7" gate="1" x="139.7" y="27.94"/>
 <instance part="FRAME1" gate="G$1" x="5.08" y="5.08"/>
-<instance part="C2" gate="G$1" x="48.26" y="154.94"/>
-<instance part="C1" gate="G$1" x="58.42" y="157.48"/>
-<instance part="U$18" gate="G$1" x="68.58" y="101.6"/>
-<instance part="U3" gate="MCP2551" x="215.9" y="88.9"/>
+<instance part="C3" gate="G$1" x="48.26" y="154.94"/>
+<instance part="C4" gate="G$1" x="58.42" y="157.48"/>
+<instance part="SUP1" gate="G$1" x="68.58" y="101.6"/>
+<instance part="U3" gate="MCP2551" x="218.44" y="71.12"/>
 <instance part="U1" gate="G$1" x="86.36" y="139.7"/>
-<instance part="J1" gate="G$1" x="259.08" y="63.5" smashed="yes">
-<attribute name="NAME" x="259.08" y="71.12" size="1.778" layer="95"/>
+<instance part="J2" gate="G$1" x="261.62" y="45.72" smashed="yes">
+<attribute name="NAME" x="261.62" y="53.34" size="1.778" layer="95"/>
 </instance>
-<instance part="LED2" gate="G$1" x="38.1" y="27.94"/>
-<instance part="R2" gate="G$1" x="38.1" y="38.1" rot="R270"/>
+<instance part="D1" gate="G$1" x="38.1" y="27.94" smashed="yes">
+<attribute name="NAME" x="34.671" y="23.368" size="1.778" layer="95" font="vector" rot="R90"/>
+<attribute name="VALUE" x="42.037" y="19.05" size="1.778" layer="96" font="vector" rot="R90" align="top-left"/>
+</instance>
+<instance part="R1" gate="G$1" x="38.1" y="38.1" rot="R270"/>
 <instance part="GND1" gate="1" x="38.1" y="17.78"/>
 <instance part="SUPPLY1" gate="G$1" x="68.58" y="170.18"/>
-<instance part="GND3" gate="1" x="190.5" y="78.74"/>
-<instance part="C3" gate="G$1" x="180.34" y="88.9"/>
-<instance part="GND5" gate="1" x="248.92" y="83.82"/>
-<instance part="R3" gate="G$1" x="241.3" y="160.02"/>
-<instance part="SUPPLY6" gate="G$1" x="187.96" y="99.06"/>
-<instance part="GND6" gate="1" x="241.3" y="83.82"/>
-<instance part="SUPPLY2" gate="G$1" x="254" y="71.12"/>
-<instance part="GND9" gate="1" x="241.3" y="55.88"/>
-<instance part="C4" gate="G$1" x="38.1" y="152.4"/>
-<instance part="C6" gate="G$1" x="30.48" y="147.32"/>
-<instance part="GND10" gate="1" x="58.42" y="137.16"/>
-<instance part="GND11" gate="1" x="50.8" y="121.92"/>
-<instance part="R4" gate="G$1" x="58.42" y="124.46"/>
-<instance part="J4" gate="G$1" x="259.08" y="134.62" rot="R180"/>
-<instance part="SUPPLY8" gate="G$1" x="243.84" y="139.7"/>
-<instance part="J5" gate="G$1" x="259.08" y="160.02" rot="R180"/>
-<instance part="J3" gate="G$1" x="256.54" y="93.98" rot="R180"/>
-<instance part="SUPPLY7" gate="G$1" x="248.92" y="99.06"/>
-<instance part="F1" gate="G$1" x="180.34" y="167.64" smashed="yes" rot="R180">
-<attribute name="NAME" x="176.53" y="169.7386" size="1.778" layer="95"/>
-<attribute name="VALUE" x="176.53" y="163.638" size="1.778" layer="96"/>
+<instance part="GND8" gate="1" x="193.04" y="60.96"/>
+<instance part="C7" gate="G$1" x="182.88" y="71.12"/>
+<instance part="GND11" gate="1" x="251.46" y="66.04"/>
+<instance part="R4" gate="G$1" x="241.3" y="160.02"/>
+<instance part="SUPPLY4" gate="G$1" x="190.5" y="81.28"/>
+<instance part="GND9" gate="1" x="243.84" y="66.04"/>
+<instance part="SUPPLY8" gate="G$1" x="256.54" y="53.34"/>
+<instance part="GND10" gate="1" x="243.84" y="38.1"/>
+<instance part="C2" gate="G$1" x="38.1" y="152.4"/>
+<instance part="C1" gate="G$1" x="30.48" y="147.32"/>
+<instance part="GND4" gate="1" x="58.42" y="137.16"/>
+<instance part="GND2" gate="1" x="50.8" y="121.92"/>
+<instance part="R3" gate="G$1" x="58.42" y="124.46"/>
+<instance part="JP3" gate="G$1" x="259.08" y="134.62" smashed="yes" rot="R180">
+<attribute name="VALUE" x="262.128" y="128.778" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="261.366" y="142.24" size="1.778" layer="95" rot="R180"/>
 </instance>
-<instance part="J2" gate="G$1" x="160.02" y="162.56"/>
-<instance part="U$4" gate="G$1" x="170.18" y="149.86"/>
+<instance part="SUPPLY6" gate="G$1" x="243.84" y="139.7"/>
+<instance part="JP2" gate="G$1" x="259.08" y="160.02" smashed="yes" rot="R180">
+<attribute name="VALUE" x="261.874" y="153.67" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="261.62" y="167.64" size="1.778" layer="95" rot="R180"/>
+</instance>
+<instance part="J3" gate="G$1" x="259.08" y="76.2" smashed="yes" rot="R180">
+<attribute name="VALUE" x="272.796" y="67.564" size="1.778" layer="96" rot="R180"/>
+<attribute name="NAME" x="263.906" y="83.566" size="1.778" layer="95" rot="R180"/>
+</instance>
+<instance part="SUPPLY7" gate="G$1" x="251.46" y="81.28"/>
+<instance part="F1" gate="G$1" x="182.88" y="157.48" smashed="yes" rot="R180">
+<attribute name="NAME" x="179.07" y="159.5786" size="1.778" layer="95"/>
+<attribute name="VALUE" x="179.07" y="153.478" size="1.778" layer="96"/>
+</instance>
+<instance part="J1" gate="G$1" x="162.56" y="152.4" smashed="yes">
+<attribute name="NAME" x="157.226" y="161.544" size="1.016" layer="95" font="vector" align="top-left"/>
+<attribute name="VALUE" x="152.908" y="140.716" size="1.016" layer="96" font="vector"/>
+</instance>
+<instance part="SUP2" gate="G$1" x="172.72" y="139.7"/>
 </instances>
 <busses>
 </busses>
@@ -3610,25 +3632,25 @@ ease of routing</text>
 <pinref part="U2" gate="G$1" pin="GND"/>
 <wire x1="111.76" y1="38.1" x2="106.68" y2="38.1" width="0.1524" layer="91"/>
 <wire x1="106.68" y1="38.1" x2="106.68" y2="30.48" width="0.1524" layer="91"/>
-<pinref part="GND2" gate="1" pin="GND"/>
+<pinref part="GND6" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="LED1" gate="G$1" pin="C"/>
-<pinref part="GND4" gate="1" pin="GND"/>
+<pinref part="D2" gate="G$1" pin="C"/>
+<pinref part="GND3" gate="1" pin="GND"/>
 <wire x1="50.8" y1="22.86" x2="50.8" y2="20.32" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="1"/>
-<pinref part="GND7" gate="1" pin="GND"/>
-<wire x1="93.98" y1="33.02" x2="93.98" y2="35.56" width="0.1524" layer="91"/>
+<pinref part="GND5" gate="1" pin="GND"/>
+<wire x1="99.06" y1="30.48" x2="99.06" y2="33.02" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="C7" gate="G$1" pin="2"/>
-<pinref part="GND8" gate="1" pin="GND"/>
-<wire x1="154.94" y1="30.48" x2="154.94" y2="33.02" width="0.1524" layer="91"/>
+<pinref part="C6" gate="G$1" pin="2"/>
+<pinref part="GND7" gate="1" pin="GND"/>
+<wire x1="139.7" y1="30.48" x2="139.7" y2="33.02" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U$18" gate="G$1" pin="GND"/>
+<pinref part="SUP1" gate="G$1" pin="GND"/>
 <pinref part="U1" gate="G$1" pin="VSSA"/>
 <wire x1="71.12" y1="114.3" x2="68.58" y2="114.3" width="0.1524" layer="91"/>
 <wire x1="68.58" y1="114.3" x2="68.58" y2="111.76" width="0.1524" layer="91"/>
@@ -3646,83 +3668,82 @@ ease of routing</text>
 <junction x="68.58" y="106.68"/>
 </segment>
 <segment>
-<pinref part="LED2" gate="G$1" pin="C"/>
+<pinref part="D1" gate="G$1" pin="C"/>
 <pinref part="GND1" gate="1" pin="GND"/>
 <wire x1="38.1" y1="22.86" x2="38.1" y2="20.32" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U3" gate="MCP2551" pin="VSS"/>
-<wire x1="205.74" y1="93.98" x2="190.5" y2="93.98" width="0.1524" layer="91"/>
-<wire x1="190.5" y1="93.98" x2="190.5" y2="83.82" width="0.1524" layer="91"/>
-<pinref part="GND3" gate="1" pin="GND"/>
-<pinref part="C3" gate="G$1" pin="2"/>
-<wire x1="190.5" y1="83.82" x2="190.5" y2="81.28" width="0.1524" layer="91"/>
-<wire x1="180.34" y1="86.36" x2="180.34" y2="83.82" width="0.1524" layer="91"/>
-<wire x1="180.34" y1="83.82" x2="190.5" y2="83.82" width="0.1524" layer="91"/>
-<junction x="190.5" y="83.82"/>
+<wire x1="208.28" y1="76.2" x2="193.04" y2="76.2" width="0.1524" layer="91"/>
+<wire x1="193.04" y1="76.2" x2="193.04" y2="66.04" width="0.1524" layer="91"/>
+<pinref part="GND8" gate="1" pin="GND"/>
+<pinref part="C7" gate="G$1" pin="2"/>
+<wire x1="193.04" y1="66.04" x2="193.04" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="68.58" x2="182.88" y2="66.04" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="66.04" x2="193.04" y2="66.04" width="0.1524" layer="91"/>
+<junction x="193.04" y="66.04"/>
 </segment>
 <segment>
-<wire x1="251.46" y1="88.9" x2="248.92" y2="88.9" width="0.1524" layer="91"/>
-<wire x1="248.92" y1="88.9" x2="248.92" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="GND5" gate="1" pin="GND"/>
+<wire x1="254" y1="71.12" x2="251.46" y2="71.12" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="71.12" x2="251.46" y2="68.58" width="0.1524" layer="91"/>
+<pinref part="GND11" gate="1" pin="GND"/>
 <pinref part="J3" gate="G$1" pin="4"/>
 </segment>
 <segment>
 <pinref part="U3" gate="MCP2551" pin="RS"/>
-<wire x1="236.22" y1="96.52" x2="241.3" y2="96.52" width="0.1524" layer="91"/>
-<wire x1="241.3" y1="96.52" x2="241.3" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="GND6" gate="1" pin="GND"/>
-</segment>
-<segment>
-<pinref part="J1" gate="G$1" pin="GND"/>
-<wire x1="256.54" y1="66.04" x2="241.3" y2="66.04" width="0.1524" layer="91"/>
-<wire x1="241.3" y1="66.04" x2="241.3" y2="58.42" width="0.1524" layer="91"/>
+<wire x1="238.76" y1="78.74" x2="243.84" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="243.84" y1="78.74" x2="243.84" y2="68.58" width="0.1524" layer="91"/>
 <pinref part="GND9" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="C6" gate="G$1" pin="2"/>
+<pinref part="J2" gate="G$1" pin="GND"/>
+<wire x1="259.08" y1="48.26" x2="243.84" y2="48.26" width="0.1524" layer="91"/>
+<wire x1="243.84" y1="48.26" x2="243.84" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="GND10" gate="1" pin="GND"/>
+</segment>
+<segment>
+<pinref part="C1" gate="G$1" pin="2"/>
 <wire x1="30.48" y1="144.78" x2="30.48" y2="142.24" width="0.1524" layer="91"/>
-<pinref part="C4" gate="G$1" pin="2"/>
+<pinref part="C2" gate="G$1" pin="2"/>
 <wire x1="38.1" y1="149.86" x2="38.1" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="38.1" y1="142.24" x2="30.48" y2="142.24" width="0.1524" layer="91"/>
-<pinref part="C2" gate="G$1" pin="2"/>
+<pinref part="C3" gate="G$1" pin="2"/>
 <wire x1="38.1" y1="142.24" x2="48.26" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="48.26" y1="142.24" x2="48.26" y2="152.4" width="0.1524" layer="91"/>
 <junction x="38.1" y="142.24"/>
-<pinref part="C1" gate="G$1" pin="2"/>
+<pinref part="C4" gate="G$1" pin="2"/>
 <wire x1="48.26" y1="142.24" x2="58.42" y2="142.24" width="0.1524" layer="91"/>
 <wire x1="58.42" y1="142.24" x2="58.42" y2="154.94" width="0.1524" layer="91"/>
 <junction x="48.26" y="142.24"/>
 <wire x1="58.42" y1="142.24" x2="58.42" y2="139.7" width="0.1524" layer="91"/>
 <junction x="58.42" y="142.24"/>
-<pinref part="GND10" gate="1" pin="GND"/>
+<pinref part="GND4" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="GND11" gate="1" pin="GND"/>
-<pinref part="R4" gate="G$1" pin="1"/>
+<pinref part="GND2" gate="1" pin="GND"/>
+<pinref part="R3" gate="G$1" pin="1"/>
 <wire x1="50.8" y1="124.46" x2="53.34" y2="124.46" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="GND"/>
-<wire x1="167.64" y1="157.48" x2="170.18" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="170.18" y1="157.48" x2="170.18" y2="154.94" width="0.1524" layer="91"/>
-<pinref part="J2" gate="G$1" pin="SLD"/>
-<wire x1="170.18" y1="154.94" x2="170.18" y2="152.4" width="0.1524" layer="91"/>
-<wire x1="167.64" y1="154.94" x2="170.18" y2="154.94" width="0.1524" layer="91"/>
-<junction x="170.18" y="154.94"/>
-<pinref part="U$4" gate="G$1" pin="GND"/>
+<pinref part="J1" gate="G$1" pin="GND"/>
+<wire x1="170.18" y1="147.32" x2="172.72" y2="147.32" width="0.1524" layer="91"/>
+<wire x1="172.72" y1="147.32" x2="172.72" y2="144.78" width="0.1524" layer="91"/>
+<pinref part="J1" gate="G$1" pin="SLD"/>
+<wire x1="172.72" y1="144.78" x2="172.72" y2="142.24" width="0.1524" layer="91"/>
+<wire x1="170.18" y1="144.78" x2="172.72" y2="144.78" width="0.1524" layer="91"/>
+<junction x="172.72" y="144.78"/>
+<pinref part="SUP2" gate="G$1" pin="GND"/>
 </segment>
 </net>
 <net name="3.3V" class="0">
 <segment>
 <pinref part="U2" gate="G$1" pin="OUT"/>
-<wire x1="129.54" y1="43.18" x2="149.86" y2="43.18" width="0.1524" layer="91"/>
-<wire x1="149.86" y1="43.18" x2="149.86" y2="45.72" width="0.1524" layer="91"/>
-<pinref part="SUPPLY4" gate="G$1" pin="3.3V"/>
-<pinref part="C7" gate="G$1" pin="1"/>
-<wire x1="149.86" y1="43.18" x2="154.94" y2="43.18" width="0.1524" layer="91"/>
-<wire x1="154.94" y1="43.18" x2="154.94" y2="40.64" width="0.1524" layer="91"/>
-<junction x="149.86" y="43.18"/>
+<wire x1="129.54" y1="43.18" x2="139.7" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="139.7" y1="43.18" x2="139.7" y2="45.72" width="0.1524" layer="91"/>
+<pinref part="SUPPLY3" gate="G$1" pin="3.3V"/>
+<pinref part="C6" gate="G$1" pin="1"/>
+<wire x1="139.7" y1="43.18" x2="139.7" y2="40.64" width="0.1524" layer="91"/>
+<junction x="139.7" y="43.18"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="VDD1"/>
@@ -3745,32 +3766,32 @@ ease of routing</text>
 <wire x1="68.58" y1="149.86" x2="68.58" y2="152.4" width="0.1524" layer="91"/>
 <junction x="68.58" y="152.4"/>
 <pinref part="SUPPLY1" gate="G$1" pin="3.3V"/>
-<pinref part="C1" gate="G$1" pin="1"/>
+<pinref part="C4" gate="G$1" pin="1"/>
 <wire x1="68.58" y1="162.56" x2="58.42" y2="162.56" width="0.1524" layer="91"/>
-<pinref part="C2" gate="G$1" pin="1"/>
+<pinref part="C3" gate="G$1" pin="1"/>
 <wire x1="58.42" y1="162.56" x2="48.26" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="48.26" y1="162.56" x2="48.26" y2="160.02" width="0.1524" layer="91"/>
 <junction x="58.42" y="162.56"/>
-<pinref part="C4" gate="G$1" pin="1"/>
+<pinref part="C2" gate="G$1" pin="1"/>
 <wire x1="48.26" y1="162.56" x2="38.1" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="38.1" y1="162.56" x2="38.1" y2="157.48" width="0.1524" layer="91"/>
 <junction x="48.26" y="162.56"/>
-<pinref part="C6" gate="G$1" pin="1"/>
+<pinref part="C1" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="162.56" x2="30.48" y2="162.56" width="0.1524" layer="91"/>
 <wire x1="30.48" y1="162.56" x2="30.48" y2="152.4" width="0.1524" layer="91"/>
 <junction x="38.1" y="162.56"/>
 </segment>
 <segment>
-<pinref part="J1" gate="G$1" pin="VCC"/>
-<wire x1="256.54" y1="68.58" x2="254" y2="68.58" width="0.1524" layer="91"/>
-<wire x1="254" y1="68.58" x2="254" y2="71.12" width="0.1524" layer="91"/>
-<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+<pinref part="J2" gate="G$1" pin="VCC"/>
+<wire x1="259.08" y1="50.8" x2="256.54" y2="50.8" width="0.1524" layer="91"/>
+<wire x1="256.54" y1="50.8" x2="256.54" y2="53.34" width="0.1524" layer="91"/>
+<pinref part="SUPPLY8" gate="G$1" pin="3.3V"/>
 </segment>
 <segment>
-<pinref part="J4" gate="G$1" pin="1"/>
+<pinref part="JP3" gate="G$1" pin="1"/>
 <wire x1="251.46" y1="137.16" x2="243.84" y2="137.16" width="0.1524" layer="91"/>
 <wire x1="243.84" y1="137.16" x2="243.84" y2="139.7" width="0.1524" layer="91"/>
-<pinref part="SUPPLY8" gate="G$1" pin="3.3V"/>
+<pinref part="SUPPLY6" gate="G$1" pin="3.3V"/>
 </segment>
 </net>
 <net name="V_BATT" class="0">
@@ -3780,36 +3801,36 @@ ease of routing</text>
 <wire x1="109.22" y1="33.02" x2="109.22" y2="43.18" width="0.1524" layer="91"/>
 <pinref part="U2" gate="G$1" pin="IN"/>
 <wire x1="109.22" y1="43.18" x2="111.76" y2="43.18" width="0.1524" layer="91"/>
-<wire x1="109.22" y1="43.18" x2="106.68" y2="43.18" width="0.1524" layer="91"/>
-<wire x1="106.68" y1="43.18" x2="106.68" y2="45.72" width="0.1524" layer="91"/>
+<wire x1="109.22" y1="43.18" x2="99.06" y2="43.18" width="0.1524" layer="91"/>
+<wire x1="99.06" y1="43.18" x2="99.06" y2="45.72" width="0.1524" layer="91"/>
 <junction x="109.22" y="43.18"/>
-<pinref part="SUPPLY3" gate="G$1" pin="V_BATT"/>
+<pinref part="SUPPLY2" gate="G$1" pin="V_BATT"/>
 <pinref part="C5" gate="G$1" pin="2"/>
-<wire x1="93.98" y1="43.18" x2="106.68" y2="43.18" width="0.1524" layer="91"/>
-<junction x="106.68" y="43.18"/>
+<wire x1="99.06" y1="40.64" x2="99.06" y2="43.18" width="0.1524" layer="91"/>
+<junction x="99.06" y="43.18"/>
 </segment>
 <segment>
 <pinref part="U3" gate="MCP2551" pin="VDD"/>
-<wire x1="205.74" y1="91.44" x2="187.96" y2="91.44" width="0.1524" layer="91"/>
-<wire x1="187.96" y1="91.44" x2="187.96" y2="96.52" width="0.1524" layer="91"/>
-<pinref part="C3" gate="G$1" pin="1"/>
-<wire x1="187.96" y1="96.52" x2="187.96" y2="99.06" width="0.1524" layer="91"/>
-<wire x1="180.34" y1="93.98" x2="180.34" y2="96.52" width="0.1524" layer="91"/>
-<wire x1="180.34" y1="96.52" x2="187.96" y2="96.52" width="0.1524" layer="91"/>
-<junction x="187.96" y="96.52"/>
-<pinref part="SUPPLY6" gate="G$1" pin="V_BATT"/>
+<wire x1="208.28" y1="73.66" x2="190.5" y2="73.66" width="0.1524" layer="91"/>
+<wire x1="190.5" y1="73.66" x2="190.5" y2="78.74" width="0.1524" layer="91"/>
+<pinref part="C7" gate="G$1" pin="1"/>
+<wire x1="190.5" y1="78.74" x2="190.5" y2="81.28" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="76.2" x2="182.88" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="182.88" y1="78.74" x2="190.5" y2="78.74" width="0.1524" layer="91"/>
+<junction x="190.5" y="78.74"/>
+<pinref part="SUPPLY4" gate="G$1" pin="V_BATT"/>
 </segment>
 <segment>
 <pinref part="J3" gate="G$1" pin="1"/>
 <pinref part="SUPPLY7" gate="G$1" pin="V_BATT"/>
-<wire x1="251.46" y1="96.52" x2="248.92" y2="96.52" width="0.1524" layer="91"/>
-<wire x1="248.92" y1="96.52" x2="248.92" y2="99.06" width="0.1524" layer="91"/>
+<wire x1="254" y1="78.74" x2="251.46" y2="78.74" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="78.74" x2="251.46" y2="81.28" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="F1" gate="G$1" pin="1"/>
 <pinref part="SUPPLY5" gate="G$1" pin="V_BATT"/>
-<wire x1="185.42" y1="167.64" x2="190.5" y2="167.64" width="0.1524" layer="91"/>
-<wire x1="190.5" y1="167.64" x2="190.5" y2="170.18" width="0.1524" layer="91"/>
+<wire x1="187.96" y1="157.48" x2="193.04" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="193.04" y1="157.48" x2="193.04" y2="160.02" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="D+" class="0">
@@ -3819,9 +3840,9 @@ ease of routing</text>
 <label x="116.84" y="132.08" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="D+"/>
-<wire x1="170.18" y1="162.56" x2="167.64" y2="162.56" width="0.1524" layer="91"/>
-<label x="170.18" y="162.56" size="1.27" layer="95" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="D+"/>
+<wire x1="172.72" y1="152.4" x2="170.18" y2="152.4" width="0.1524" layer="91"/>
+<label x="172.72" y="152.4" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="D-" class="0">
@@ -3831,15 +3852,15 @@ ease of routing</text>
 <label x="116.84" y="134.62" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="J2" gate="G$1" pin="D-"/>
-<wire x1="170.18" y1="165.1" x2="167.64" y2="165.1" width="0.1524" layer="91"/>
-<label x="170.18" y="165.1" size="1.27" layer="95" xref="yes"/>
+<pinref part="J1" gate="G$1" pin="D-"/>
+<wire x1="172.72" y1="154.94" x2="170.18" y2="154.94" width="0.1524" layer="91"/>
+<label x="172.72" y="154.94" size="1.27" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="N$23" class="0">
 <segment>
-<pinref part="LED1" gate="G$1" pin="A"/>
-<pinref part="R1" gate="G$1" pin="2"/>
+<pinref part="D2" gate="G$1" pin="A"/>
+<pinref part="R2" gate="G$1" pin="2"/>
 <wire x1="50.8" y1="30.48" x2="50.8" y2="33.02" width="0.1524" layer="91"/>
 </segment>
 </net>
@@ -3850,9 +3871,9 @@ ease of routing</text>
 <label x="116.84" y="127" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="J1" gate="G$1" pin="SWCLK"/>
-<wire x1="254" y1="63.5" x2="256.54" y2="63.5" width="0.1524" layer="91"/>
-<label x="254" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J2" gate="G$1" pin="SWCLK"/>
+<wire x1="256.54" y1="45.72" x2="259.08" y2="45.72" width="0.1524" layer="91"/>
+<label x="256.54" y="45.72" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="SWDIO" class="0">
@@ -3862,14 +3883,14 @@ ease of routing</text>
 <label x="116.84" y="129.54" size="1.27" layer="95" xref="yes"/>
 </segment>
 <segment>
-<pinref part="J1" gate="G$1" pin="SWDIO"/>
-<wire x1="254" y1="60.96" x2="256.54" y2="60.96" width="0.1524" layer="91"/>
-<label x="254" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="J2" gate="G$1" pin="SWDIO"/>
+<wire x1="256.54" y1="43.18" x2="259.08" y2="43.18" width="0.1524" layer="91"/>
+<label x="256.54" y="43.18" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="LED_RX" class="0">
 <segment>
-<pinref part="R1" gate="G$1" pin="1"/>
+<pinref part="R2" gate="G$1" pin="1"/>
 <wire x1="50.8" y1="45.72" x2="50.8" y2="43.18" width="0.1524" layer="91"/>
 <label x="50.8" y="45.72" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
@@ -3881,14 +3902,14 @@ ease of routing</text>
 </net>
 <net name="N$2" class="0">
 <segment>
-<pinref part="LED2" gate="G$1" pin="A"/>
-<pinref part="R2" gate="G$1" pin="2"/>
+<pinref part="D1" gate="G$1" pin="A"/>
+<pinref part="R1" gate="G$1" pin="2"/>
 <wire x1="38.1" y1="30.48" x2="38.1" y2="33.02" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="LED_TX" class="0">
 <segment>
-<pinref part="R2" gate="G$1" pin="1"/>
+<pinref part="R1" gate="G$1" pin="1"/>
 <wire x1="38.1" y1="45.72" x2="38.1" y2="43.18" width="0.1524" layer="91"/>
 <label x="38.1" y="45.72" size="1.27" layer="95" rot="R90" xref="yes"/>
 </segment>
@@ -3906,8 +3927,8 @@ ease of routing</text>
 </segment>
 <segment>
 <pinref part="U3" gate="MCP2551" pin="RXD"/>
-<wire x1="205.74" y1="88.9" x2="203.2" y2="88.9" width="0.1524" layer="91"/>
-<label x="203.2" y="88.9" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="208.28" y1="71.12" x2="205.74" y2="71.12" width="0.1524" layer="91"/>
+<label x="205.74" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="CAN_TX" class="0">
@@ -3918,19 +3939,19 @@ ease of routing</text>
 </segment>
 <segment>
 <pinref part="U3" gate="MCP2551" pin="TXD"/>
-<wire x1="203.2" y1="96.52" x2="205.74" y2="96.52" width="0.1524" layer="91"/>
-<label x="203.2" y="96.52" size="1.27" layer="95" rot="R180" xref="yes"/>
+<wire x1="205.74" y1="78.74" x2="208.28" y2="78.74" width="0.1524" layer="91"/>
+<label x="205.74" y="78.74" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 </net>
 <net name="CANH" class="0">
 <segment>
 <pinref part="U3" gate="MCP2551" pin="CANH"/>
-<wire x1="236.22" y1="93.98" x2="251.46" y2="93.98" width="0.1524" layer="91"/>
-<label x="243.84" y="93.98" size="1.27" layer="95"/>
+<wire x1="238.76" y1="76.2" x2="254" y2="76.2" width="0.1524" layer="91"/>
+<label x="246.38" y="76.2" size="1.27" layer="95"/>
 <pinref part="J3" gate="G$1" pin="2"/>
 </segment>
 <segment>
-<pinref part="R3" gate="G$1" pin="1"/>
+<pinref part="R4" gate="G$1" pin="1"/>
 <wire x1="236.22" y1="160.02" x2="233.68" y2="160.02" width="0.1524" layer="91"/>
 <label x="233.68" y="160.02" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
@@ -3938,33 +3959,33 @@ ease of routing</text>
 <net name="CANL" class="0">
 <segment>
 <pinref part="U3" gate="MCP2551" pin="CANL"/>
-<wire x1="236.22" y1="91.44" x2="251.46" y2="91.44" width="0.1524" layer="91"/>
-<label x="243.84" y="91.44" size="1.27" layer="95"/>
+<wire x1="238.76" y1="73.66" x2="254" y2="73.66" width="0.1524" layer="91"/>
+<label x="246.38" y="73.66" size="1.27" layer="95"/>
 <pinref part="J3" gate="G$1" pin="3"/>
 </segment>
 <segment>
 <wire x1="251.46" y1="157.48" x2="233.68" y2="157.48" width="0.1524" layer="91"/>
 <label x="233.68" y="157.48" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="J5" gate="G$1" pin="3"/>
+<pinref part="JP2" gate="G$1" pin="3"/>
 </segment>
 </net>
 <net name="N$3" class="0">
 <segment>
-<pinref part="R3" gate="G$1" pin="2"/>
+<pinref part="R4" gate="G$1" pin="2"/>
 <wire x1="246.38" y1="160.02" x2="251.46" y2="160.02" width="0.1524" layer="91"/>
-<pinref part="J5" gate="G$1" pin="2"/>
+<pinref part="JP2" gate="G$1" pin="2"/>
 </segment>
 </net>
 <net name="BOOT0" class="0">
 <segment>
-<pinref part="J4" gate="G$1" pin="2"/>
+<pinref part="JP3" gate="G$1" pin="2"/>
 <wire x1="251.46" y1="134.62" x2="243.84" y2="134.62" width="0.1524" layer="91"/>
 <label x="243.84" y="134.62" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="PF11/BOOT0"/>
 <wire x1="71.12" y1="132.08" x2="66.04" y2="132.08" width="0.1524" layer="91"/>
-<pinref part="R4" gate="G$1" pin="2"/>
+<pinref part="R3" gate="G$1" pin="2"/>
 <wire x1="66.04" y1="132.08" x2="55.88" y2="132.08" width="0.1524" layer="91"/>
 <wire x1="63.5" y1="124.46" x2="66.04" y2="124.46" width="0.1524" layer="91"/>
 <wire x1="66.04" y1="124.46" x2="66.04" y2="127" width="0.1524" layer="91"/>
@@ -3979,13 +4000,19 @@ ease of routing</text>
 <net name="VBUS_RAW" class="0">
 <segment>
 <pinref part="F1" gate="G$1" pin="2"/>
-<wire x1="167.64" y1="167.64" x2="175.26" y2="167.64" width="0.1524" layer="91"/>
-<pinref part="J2" gate="G$1" pin="5V"/>
+<wire x1="170.18" y1="157.48" x2="177.8" y2="157.48" width="0.1524" layer="91"/>
+<pinref part="J1" gate="G$1" pin="5V"/>
 </segment>
 </net>
 </nets>
 </sheet>
 </sheets>
+<errors>
+<approved hash="202,1,129.54,33.02,U2,BP,,,,"/>
+<approved hash="104,1,170.18,157.48,J1,5V,VBUS_RAW,,,"/>
+<approved hash="104,1,170.18,144.78,J1,SLD,GND,,,"/>
+<approved hash="113,1,165.608,152.114,J1,,,,,"/>
+</errors>
 </schematic>
 </drawing>
 <compatibility>