diff --git a/zoncoffee.brd b/zoncoffee.brd
--- a/zoncoffee.brd
+++ b/zoncoffee.brd
@@ -23,7 +23,7 @@
 <layer number="13" name="Route13" color="4" fill="5" visible="no" active="no"/>
 <layer number="14" name="Route14" color="1" fill="6" visible="no" active="no"/>
 <layer number="15" name="Route15" color="4" fill="6" visible="no" active="no"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
@@ -51,8 +51,8 @@
 <layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
-<layer number="44" name="Drills" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="45" name="Holes" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
+<layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
 <layer number="46" name="Milling" color="3" fill="1" visible="no" active="yes"/>
 <layer number="47" name="Measures" color="7" fill="1" visible="no" active="yes"/>
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
@@ -236,6 +236,9 @@
 <text x="10.95375" y="9.36625" size="0.8128" layer="22" ratio="16" rot="MR180">tx</text>
 <text x="13.0175" y="3.96875" size="0.8128" layer="21" ratio="16" rot="R90">uart</text>
 <text x="0.396875" y="6.270625" size="0.8128" layer="22" ratio="16" rot="SMR90">Zonca 2014</text>
+<circle x="29.36875" y="11.90625" radius="0.127" width="0.2032" layer="21"/>
+<circle x="31.75" y="14.605" radius="0.127" width="0.2032" layer="21"/>
+<circle x="41.195625" y="14.525625" radius="0.127" width="0.2032" layer="21"/>
 </plain>
 <libraries>
 <library name="microbuilder">
@@ -2515,17 +2518,17 @@ design rules under a new name.</descript
 <attribute name="NAME" x="44.165" y="8.956875" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="46.99" y="7.62" size="0.762" layer="27" rot="R90"/>
 </element>
-<element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="26.3525" y="8.89" smashed="yes" rot="R180">
-<attribute name="NAME" x="29.924375" y="7.064375" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
+<element name="U3" library="dp_devices" package="SO-8" value="IC_MAX31855-SO-8" x="27.46375" y="8.016875" smashed="yes" rot="R180">
+<attribute name="NAME" x="31.035625" y="6.19125" size="0.8128" layer="25" font="vector" ratio="16" rot="R90"/>
 </element>
 <element name="U2" library="SparkFun-PowerIC" package="SOT23-5" value="AP2202K-3.3TRG1" x="21.59" y="9.2075" smashed="yes" rot="R180">
 <attribute name="PROD_ID" value="VREG-00822" x="-13.97" y="42.2275" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="NAME" x="20.066" y="7.20725" size="0.8128" layer="25" ratio="16" rot="R90"/>
 <attribute name="VALUE" x="22.5425" y="9.398" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="LED1" library="SparkFun-LED" package="LED-0603" value="" x="39.0525" y="14.2875" smashed="yes" rot="R270">
-<attribute name="NAME" x="37.766625" y="14.986" size="0.8128" layer="25" ratio="16"/>
-<attribute name="VALUE" x="38.0365" y="13.208" size="0.4064" layer="27"/>
+<element name="LED1" library="SparkFun-LED" package="LED-0603" value="" x="39.37" y="14.2875" smashed="yes" rot="R270">
+<attribute name="NAME" x="38.084125" y="14.986" size="0.8128" layer="25" ratio="16"/>
+<attribute name="VALUE" x="38.354" y="13.208" size="0.4064" layer="27"/>
 </element>
 <element name="JP2" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="23.8125" y="13.97" rot="MR0"/>
 <element name="JP3" library="SparkFun-Connectors" package="1X02_2.54_SCREWTERM" value="1546215-2" x="18.415" y="13.97" rot="MR0"/>
@@ -2538,26 +2541,26 @@ design rules under a new name.</descript
 <attribute name="NAME" x="23.08225" y="12.557125" size="0.8128" layer="25" ratio="16" rot="R270"/>
 <attribute name="VALUE" x="22.51075" y="13.5255" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.6675" smashed="yes">
-<attribute name="NAME" x="22.240875" y="4.587875" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="20.5105" y="5.5245" size="0.4064" layer="27"/>
+<element name="C7" library="SparkFun-Passives" package="0402-CAP" value="4.7uF" x="21.59" y="6.588125" smashed="yes" rot="R180">
+<attribute name="NAME" x="20.939125" y="8.66775" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="22.6695" y="7.731125" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="R1" library="SparkFun-Passives" package="0402-RES" value="" x="39.37" y="13.0175" smashed="yes" rot="R180">
 <attribute name="NAME" x="40.894" y="12.319" size="0.8128" layer="25" ratio="16" rot="R180"/>
 <attribute name="VALUE" x="40.4495" y="14.1605" size="0.4064" layer="27" rot="R180"/>
 </element>
-<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="29.845" y="11.7475" smashed="yes" rot="R270">
-<attribute name="NAME" x="30.25775" y="9.11225" size="0.8128" layer="25" ratio="16" rot="R90"/>
-<attribute name="VALUE" x="28.702" y="12.827" size="0.4064" layer="27" rot="R270"/>
+<element name="C8" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="23.97125" y="9.445625" smashed="yes" rot="R90">
+<attribute name="NAME" x="23.5585" y="12.080875" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="25.11425" y="8.366125" size="0.4064" layer="27" rot="R90"/>
 </element>
 <element name="LCD1" library="microbuilder" package="UG-2832HSWEG04_WRAPAROUND" value="SSD1306-SPI" x="0.635" y="9.36625" smashed="yes" rot="R180">
 <attribute name="VALUE" x="30.635" y="16.86625" size="0.4064" layer="27" ratio="10" rot="R180"/>
 </element>
 <element name="U$3" library="Protofusion" package="THERM_LOGO_0.2" value="" x="44.529375" y="5.715" rot="MR0"/>
 <element name="U1" library="Protofusion" package="UFQFPN32" value="STM32F042K" x="14.525625" y="9.68375" smashed="yes" rot="R270"/>
-<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="9.604375" y="13.0175" smashed="yes" rot="R180">
-<attribute name="NAME" x="9.271" y="12.319" size="0.8128" layer="25" ratio="16" rot="R270"/>
-<attribute name="VALUE" x="10.683875" y="14.1605" size="0.4064" layer="27" rot="R180"/>
+<element name="C2" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="13.49375" y="14.366875" smashed="yes" rot="R180">
+<attribute name="NAME" x="13.160375" y="13.668375" size="0.8128" layer="25" ratio="16" rot="R270"/>
+<attribute name="VALUE" x="14.57325" y="15.509875" size="0.4064" layer="27" rot="R180"/>
 </element>
 <element name="C1" library="SparkFun-Passives" package="0402-CAP" value="0.1uF" x="19.129375" y="12.3825" smashed="yes">
 <attribute name="NAME" x="18.669" y="10.541" size="0.8128" layer="25" ratio="16" rot="R90"/>
@@ -2577,6 +2580,7 @@ design rules under a new name.</descript
 <element name="R3" library="SparkFun-Passives" package="0402-RES" value="390k" x="1.5875" y="6.985"/>
 <element name="C3" library="SparkFun-Passives" package="0402-CAP" value="2.2uF" x="1.5875" y="12.065"/>
 <element name="U$6" library="Protofusion" package="THERM_LOGO_SMALL_0.2" value="" x="36.195" y="3.96875"/>
+<element name="C4" library="SparkFun-Passives" package="0402-CAP" value="0.01uF" x="27.46375" y="12.303125" rot="R180"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -2588,7 +2592,6 @@ design rules under a new name.</descript
 <contactref element="J2" pad="MT2"/>
 <contactref element="JP3" pad="P2"/>
 <contactref element="LED1" pad="C"/>
-<contactref element="U3" pad="1"/>
 <contactref element="C8" pad="1"/>
 <contactref element="C5" pad="1"/>
 <contactref element="C7" pad="2"/>
@@ -2602,13 +2605,8 @@ design rules under a new name.</descript
 <wire x1="21.59" y1="11.89125" x2="22.08125" y2="12.3825" width="0.2032" layer="1"/>
 <via x="22.86" y="12.3825" extent="1-16" drill="0.3048"/>
 <wire x1="22.08125" y1="12.3825" x2="22.86" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="28.2575" y1="12.065" x2="28.575" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="28.575" y1="12.3825" x2="29.83" y2="12.3825" width="0.2032" layer="1"/>
-<wire x1="29.83" y1="12.3825" x2="29.845" y2="12.3975" width="0.2032" layer="1"/>
-<via x="31.035625" y="13.81125" extent="1-16" drill="0.3048"/>
-<via x="23.33625" y="6.905625" extent="1-16" drill="0.3048"/>
+<via x="21.510625" y="5.635625" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="6"/>
-<wire x1="28.2575" y1="11.58" x2="28.2575" y2="12.065" width="0.2032" layer="1"/>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="2"/>
 <contactref element="C6" pad="2"/>
@@ -2627,24 +2625,18 @@ design rules under a new name.</descript
 <wire x1="0.8125" y1="9.925" x2="0.8125" y2="8.325" width="0.2032" layer="1"/>
 <via x="14.525625" y="9.68375" extent="1-16" drill="0.3048"/>
 <wire x1="8.335" y1="10.66625" x2="5.08" y2="10.66625" width="0.2032" layer="16"/>
-<wire x1="22.24" y1="6.6675" x2="23.098125" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="23.098125" y1="6.6675" x2="23.33625" y2="6.905625" width="0.2032" layer="1"/>
 <via x="10.16" y="5.953125" extent="1-16" drill="0.3048"/>
 <via x="36.35375" y="10.795" extent="1-16" drill="0.3048"/>
 <wire x1="37.276128125" y1="11.876128125" x2="37.276128125" y2="11.717378125" width="0.2032" layer="1"/>
 <wire x1="37.276128125" y1="11.717378125" x2="36.35375" y2="10.795" width="0.2032" layer="1"/>
-<via x="41.195625" y="13.731875" extent="1-16" drill="0.3048"/>
+<via x="41.43375" y="13.890625" extent="1-16" drill="0.3048"/>
 <wire x1="10.16" y1="5.953125" x2="9.286875" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="9.286875" y1="5.953125" x2="9.04875" y2="6.19125" width="0.2032" layer="1"/>
 <wire x1="9.04875" y1="6.19125" x2="9.04875" y2="6.97" width="0.2032" layer="1"/>
 <wire x1="9.04875" y1="6.97" x2="9.03375" y2="6.985" width="0.2032" layer="1"/>
-<via x="8.89" y="14.605" extent="1-16" drill="0.3048"/>
-<wire x1="8.954375" y1="13.0175" x2="8.954375" y2="14.540625" width="0.2032" layer="1"/>
-<wire x1="8.954375" y1="14.540625" x2="8.89" y2="14.605" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="12.3975" x2="31.035625" y2="13.588125" width="0.2032" layer="1"/>
-<wire x1="31.035625" y1="13.588125" x2="31.035625" y2="13.81125" width="0.2032" layer="1"/>
-<wire x1="39.9295" y1="14.2875" x2="40.64" y2="14.2875" width="0.2032" layer="1"/>
-<wire x1="40.64" y1="14.2875" x2="41.195625" y2="13.731875" width="0.2032" layer="1"/>
+<via x="11.7475" y="14.366875" extent="1-16" drill="0.3048"/>
+<wire x1="40.247" y1="14.2875" x2="41.036875" y2="14.2875" width="0.2032" layer="1"/>
+<wire x1="41.036875" y1="14.2875" x2="41.43375" y2="13.890625" width="0.2032" layer="1"/>
 <contactref element="J1" pad="2"/>
 <contactref element="U1" pad="31"/>
 <wire x1="16.875625" y1="10.93375" x2="15.775625" y2="10.93375" width="0.2032" layer="1"/>
@@ -2666,6 +2658,18 @@ design rules under a new name.</descript
 <via x="0.873125" y="6.0325" extent="1-16" drill="0.3048"/>
 <wire x1="0.873125" y1="6.0325" x2="0.873125" y2="7.12875" width="0.2032" layer="1"/>
 <wire x1="0.873125" y1="7.12875" x2="0.9375" y2="6.985" width="0.2032" layer="1"/>
+<contactref element="U3" pad="1"/>
+<wire x1="21.510625" y1="5.635625" x2="21.11375" y2="5.635625" width="0.2032" layer="1"/>
+<wire x1="21.11375" y1="5.635625" x2="20.955" y2="5.794375" width="0.2032" layer="1"/>
+<wire x1="20.955" y1="5.794375" x2="20.955" y2="6.6525" width="0.2032" layer="1"/>
+<wire x1="20.955" y1="6.6525" x2="20.94" y2="6.588125" width="0.2032" layer="1"/>
+<wire x1="29.36875" y1="9.525" x2="25.4" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="25.4" y1="9.525" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
+<wire x1="23.97125" y1="8.795625" x2="24.670625" y2="8.795625" width="0.2032" layer="1"/>
+<via x="29.36875" y="8.651875" extent="1-16" drill="0.3048"/>
+<wire x1="29.36875" y1="10.706875" x2="29.36875" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="29.36875" y1="9.525" x2="29.36875" y2="8.651875" width="0.2032" layer="1"/>
+<wire x1="11.7475" y1="14.366875" x2="12.84375" y2="14.366875" width="0.2032" layer="1"/>
 </signal>
 <signal name="N$1">
 <via x="4.445" y="13.6525" extent="1-16" drill="0.3048"/>
@@ -2742,7 +2746,6 @@ design rules under a new name.</descript
 </signal>
 <signal name="3.3V">
 <contactref element="U2" pad="5"/>
-<contactref element="U3" pad="4"/>
 <contactref element="C8" pad="2"/>
 <contactref element="C7" pad="1"/>
 <wire x1="22.5425" y1="7.9099" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
@@ -2752,17 +2755,10 @@ design rules under a new name.</descript
 <wire x1="22.5425" y1="8.969375" x2="20.558125" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="20.558125" y1="8.969375" x2="20.0025" y2="9.525" width="0.2032" layer="1"/>
 <wire x1="20.0025" y1="9.525" x2="20.0025" y2="11.43" width="0.2032" layer="1"/>
-<wire x1="29.86" y1="11.1125" x2="29.845" y2="11.0975" width="0.2032" layer="1"/>
 <contactref element="LCD1" pad="5"/>
 <contactref element="LCD1" pad="7"/>
 <wire x1="8.335" y1="10.01625" x2="8.35" y2="10.00125" width="0.2032" layer="16"/>
 <wire x1="3.855" y1="11.31625" x2="8.335" y2="11.31625" width="0.2032" layer="16"/>
-<wire x1="22.5425" y1="8.969375" x2="23.574375" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="23.574375" y1="10.00125" x2="24.4475" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="11.0975" x2="29.845" y2="10.428696875" width="0.2032" layer="1"/>
-<wire x1="29.845" y1="10.428696875" x2="29.417553125" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="29.417553125" y1="10.00125" x2="24.4475" y2="10.00125" width="0.2032" layer="1"/>
-<wire x1="24.4475" y1="11.58" x2="24.4475" y2="10.00125" width="0.2032" layer="1"/>
 <contactref element="C1" pad="1"/>
 <contactref element="U1" pad="1"/>
 <contactref element="U1" pad="5"/>
@@ -2783,7 +2779,6 @@ design rules under a new name.</descript
 <wire x1="14.275625" y1="12.03375" x2="14.275625" y2="12.85875" width="0.2032" layer="1"/>
 <wire x1="2.3625" y1="10.725" x2="3.26375" y2="10.725" width="0.2032" layer="1"/>
 <wire x1="3.26375" y1="10.725" x2="3.81" y2="11.27125" width="0.2032" layer="1"/>
-<wire x1="10.254375" y1="13.0175" x2="10.239375" y2="13.0325" width="0.2032" layer="1"/>
 <wire x1="10.16" y1="10.00125" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
 <wire x1="8.335" y1="11.31625" x2="10.16" y2="11.31625" width="0.2032" layer="16"/>
 <wire x1="16.275625" y1="12.03375" x2="16.275625" y2="12.85875" width="0.2032" layer="1"/>
@@ -2800,19 +2795,27 @@ design rules under a new name.</descript
 <wire x1="10.65125" y1="6.6675" x2="10.33375" y2="6.985" width="0.2032" layer="1"/>
 <wire x1="10.16" y1="11.31625" x2="10.16" y2="11.826875" width="0.2032" layer="16"/>
 <wire x1="10.16" y1="11.826875" x2="11.350625" y2="13.0175" width="0.2032" layer="16"/>
-<wire x1="10.254375" y1="13.0175" x2="11.350625" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="12.85875" x2="14.275625" y2="13.664375" width="0.2032" layer="1"/>
-<wire x1="14.275625" y1="13.664375" x2="13.97" y2="13.97" width="0.2032" layer="1"/>
-<wire x1="13.97" y1="13.97" x2="12.303125" y2="13.97" width="0.2032" layer="1"/>
-<wire x1="12.303125" y1="13.97" x2="11.350625" y2="13.0175" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="12.85875" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="13.49375" x2="14.275625" y2="13.996875" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="10.01625" x2="4.61875" y2="10.01625" width="0.2032" layer="16"/>
 <wire x1="4.61875" y1="10.01625" x2="4.60375" y2="10.00125" width="0.2032" layer="16"/>
 <wire x1="2.3625" y1="9.925" x2="4.5275" y2="9.925" width="0.2032" layer="1"/>
 <wire x1="4.5275" y1="9.925" x2="4.60375" y2="10.00125" width="0.2032" layer="1"/>
 <wire x1="3.855" y1="11.31625" x2="3.81" y2="11.27125" width="0.2032" layer="16"/>
-<wire x1="22.115525" y1="7.9074" x2="20.94" y2="6.731875" width="0.2032" layer="1"/>
-<wire x1="20.94" y1="6.731875" x2="20.94" y2="6.6675" width="0.2032" layer="1"/>
-<wire x1="22.115525" y1="7.9074" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
+<contactref element="U3" pad="4"/>
+<wire x1="22.24" y1="6.588125" x2="22.24" y2="6.6825" width="0.2032" layer="1"/>
+<wire x1="22.24" y1="6.6825" x2="22.463125" y2="6.905625" width="0.2032" layer="1"/>
+<wire x1="22.463125" y1="6.905625" x2="22.463125" y2="7.830525" width="0.2032" layer="1"/>
+<wire x1="22.463125" y1="7.830525" x2="22.54" y2="7.9074" width="0.2032" layer="1"/>
+<wire x1="23.97125" y1="10.095625" x2="23.97125" y2="10.63625" width="0.2032" layer="1"/>
+<wire x1="23.97125" y1="10.63625" x2="24.13" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="10.795" x2="25.470625" y2="10.795" width="0.2032" layer="1"/>
+<wire x1="25.470625" y1="10.795" x2="25.55875" y2="10.706875" width="0.2032" layer="1"/>
+<wire x1="22.5425" y1="8.969375" x2="22.845" y2="8.969375" width="0.2032" layer="1"/>
+<wire x1="22.845" y1="8.969375" x2="23.97125" y2="10.095625" width="0.2032" layer="1"/>
+<wire x1="14.275625" y1="13.996875" x2="14.14375" y2="14.366875" width="0.2032" layer="1"/>
+<wire x1="11.350625" y1="13.0175" x2="11.826875" y2="13.49375" width="0.2032" layer="1"/>
+<wire x1="11.826875" y1="13.49375" x2="14.275625" y2="13.49375" width="0.2032" layer="1"/>
 </signal>
 <signal name="V_BATT">
 <contactref element="JP2" pad="P1"/>
@@ -2909,37 +2912,45 @@ design rules under a new name.</descript
 </signal>
 <signal name="D+">
 <contactref element="J2" pad="D+"/>
-<wire x1="41.165" y1="9.525" x2="40.33925625" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="40.33925625" y1="9.525" x2="39.766875" y2="8.95261875" width="0.2032" layer="1"/>
-<wire x1="39.766875" y1="8.95261875" x2="39.766875" y2="5.3975" width="0.2032" layer="1"/>
-<wire x1="39.766875" y1="5.3975" x2="39.21125" y2="4.841875" width="0.2032" layer="1"/>
-<wire x1="39.21125" y1="4.841875" x2="18.4975" y2="4.841875" width="0.2032" layer="1"/>
 <contactref element="U1" pad="22"/>
+<wire x1="24.13" y1="6.429375" x2="24.13" y2="5.731878125" width="0.2032" layer="1"/>
+<wire x1="24.13" y1="5.731878125" x2="23.001871875" y2="4.60375" width="0.2032" layer="1"/>
+<wire x1="23.001871875" y1="4.60375" x2="18.735625" y2="4.60375" width="0.2032" layer="1"/>
 <wire x1="15.275625" y1="7.33375" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
 <contactref element="J1" pad="5"/>
 <wire x1="17.700625" y1="4.683125" x2="17.700625" y2="5.63875" width="0.2032" layer="16"/>
 <via x="17.700625" y="5.63875" extent="1-16" drill="0.3048"/>
-<wire x1="18.4975" y1="4.841875" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
+<wire x1="18.735625" y1="4.60375" x2="17.700625" y2="5.63875" width="0.2032" layer="1"/>
 <wire x1="17.700625" y1="5.63875" x2="17.38625" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="17.38625" y1="5.953125" x2="15.636875" y2="5.953125" width="0.2032" layer="1"/>
 <wire x1="15.636875" y1="5.953125" x2="15.275625" y2="6.314375" width="0.2032" layer="1"/>
+<via x="39.0525" y="9.50824375" extent="1-16" drill="0.3048"/>
+<via x="24.13" y="6.429375" extent="1-16" drill="0.3048"/>
+<wire x1="39.0525" y1="9.50824375" x2="41.14824375" y2="9.50824375" width="0.2032" layer="1"/>
+<wire x1="41.14824375" y1="9.50824375" x2="41.165" y2="9.525" width="0.2032" layer="1"/>
+<wire x1="39.0525" y1="9.50824375" x2="35.97363125" y2="6.429375" width="0.2032" layer="16"/>
+<wire x1="35.97363125" y1="6.429375" x2="24.13" y2="6.429375" width="0.2032" layer="16"/>
 </signal>
 <signal name="D-">
 <contactref element="J2" pad="D-"/>
-<wire x1="41.165" y1="8.875" x2="40.3075" y2="8.875" width="0.2032" layer="1"/>
-<wire x1="40.3075" y1="8.875" x2="40.16375" y2="8.73125" width="0.2032" layer="1"/>
-<wire x1="18.018125" y1="4.445" x2="39.414928125" y2="4.445" width="0.2032" layer="1"/>
-<wire x1="39.414928125" y1="4.445" x2="40.16375" y2="5.193821875" width="0.2032" layer="1"/>
-<wire x1="40.16375" y1="5.193821875" x2="40.16375" y2="8.73125" width="0.2032" layer="1"/>
 <contactref element="U1" pad="21"/>
 <wire x1="14.775625" y1="7.33375" x2="14.775625" y2="6.179375" width="0.2032" layer="1"/>
 <contactref element="J1" pad="6"/>
 <via x="15.39875" y="4.683125" extent="1-16" drill="0.3048"/>
 <wire x1="14.775625" y1="6.179375" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.430625" y1="4.683125" x2="15.39875" y2="4.683125" width="0.2032" layer="16"/>
-<wire x1="18.018125" y1="4.445" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
+<wire x1="18.25625" y1="4.206875" x2="16.906875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="16.906875" y1="5.55625" x2="15.39875" y2="5.55625" width="0.2032" layer="1"/>
 <wire x1="15.39875" y1="5.55625" x2="15.39875" y2="4.683125" width="0.2032" layer="1"/>
+<via x="39.6875" y="8.89" extent="1-16" drill="0.3048"/>
+<wire x1="36.83" y1="6.0325" x2="25.0825" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="25.0825" y1="6.0325" x2="24.765" y2="5.715" width="0.2032" layer="16"/>
+<via x="24.765" y="5.715" extent="1-16" drill="0.3048"/>
+<wire x1="18.25625" y1="4.206875" x2="23.256875" y2="4.206875" width="0.2032" layer="1"/>
+<wire x1="23.256875" y1="4.206875" x2="24.765" y2="5.715" width="0.2032" layer="1"/>
+<wire x1="39.6875" y1="8.89" x2="41.15" y2="8.89" width="0.2032" layer="1"/>
+<wire x1="41.15" y1="8.89" x2="41.165" y2="8.875" width="0.2032" layer="1"/>
+<wire x1="36.83" y1="6.0325" x2="39.6875" y2="8.89" width="0.2032" layer="16"/>
 </signal>
 <signal name="VUSB">
 <contactref element="J2" pad="VBUS"/>
@@ -2951,12 +2962,15 @@ design rules under a new name.</descript
 <via x="34.925" y="14.605" extent="1-16" drill="0.3048"/>
 <wire x1="34.925" y1="14.605" x2="33.72" y2="14.605" width="0.2032" layer="1"/>
 <contactref element="J1" pad="1"/>
-<wire x1="22.780625" y1="4.683125" x2="40.243125" y2="4.683125" width="0.2032" layer="16"/>
-<via x="42.38625" y="6.82625" extent="1-16" drill="0.3048"/>
-<wire x1="40.243125" y1="4.683125" x2="42.38625" y2="6.82625" width="0.2032" layer="16"/>
+<via x="41.11625" y="5.55625" extent="1-16" drill="0.3048"/>
+<wire x1="39.84625" y1="4.28625" x2="41.11625" y2="5.55625" width="0.2032" layer="16"/>
 <wire x1="42.38625" y1="14.035" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
+<wire x1="42.35625" y1="8.225" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
+<wire x1="39.84625" y1="4.28625" x2="23.97125" y2="4.28625" width="0.2032" layer="16"/>
+<wire x1="23.97125" y1="4.28625" x2="23.574375" y2="4.683125" width="0.2032" layer="16"/>
+<wire x1="23.574375" y1="4.683125" x2="22.780625" y2="4.683125" width="0.2032" layer="16"/>
 <wire x1="42.38625" y1="8.255" x2="42.38625" y2="6.82625" width="0.2032" layer="1"/>
-<wire x1="42.35625" y1="8.225" x2="42.38625" y2="8.255" width="0.2032" layer="1"/>
+<wire x1="42.38625" y1="6.82625" x2="41.11625" y2="5.55625" width="0.2032" layer="1"/>
 </signal>
 <signal name="SSR+">
 <contactref element="JP3" pad="P1"/>
@@ -2970,10 +2984,8 @@ design rules under a new name.</descript
 <signal name="N$23">
 <contactref element="LED1" pad="A"/>
 <contactref element="R1" pad="2"/>
-<wire x1="38.1755" y1="14.2875" x2="38.25875" y2="14.2875" width="0.2032" layer="1"/>
-<wire x1="38.25875" y1="14.2875" x2="38.496875" y2="14.049375" width="0.2032" layer="1"/>
-<wire x1="38.496875" y1="14.049375" x2="38.496875" y2="13.240625" width="0.2032" layer="1"/>
-<wire x1="38.496875" y1="13.240625" x2="38.72" y2="13.0175" width="0.2032" layer="1"/>
+<wire x1="38.72" y1="13.0175" x2="38.72" y2="14.0605" width="0.2032" layer="1"/>
+<wire x1="38.72" y1="14.0605" x2="38.493" y2="14.2875" width="0.2032" layer="1"/>
 </signal>
 <signal name="LED_PWR">
 <contactref element="R1" pad="1"/>
@@ -3018,18 +3030,22 @@ design rules under a new name.</descript
 <wire x1="6.50875" y1="9.68375" x2="6.50875" y2="8.09625" width="0.2032" layer="1"/>
 </signal>
 <signal name="T-">
+<contactref element="JP4" pad="P2"/>
+<contactref element="C4" pad="1"/>
 <contactref element="U3" pad="2"/>
-<contactref element="JP4" pad="P2"/>
-<wire x1="26.9875" y1="11.58" x2="26.9875" y2="12.54125" width="0.2032" layer="1"/>
-<wire x1="26.9875" y1="12.54125" x2="27.14625" y2="12.7" width="0.2032" layer="1"/>
-<wire x1="27.14625" y1="12.7" x2="27.94" y2="12.7" width="0.2032" layer="1"/>
-<wire x1="27.94" y1="12.7" x2="29.21" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="28.09875" y1="10.706875" x2="28.09875" y2="12.288125" width="0.2032" layer="1"/>
+<wire x1="28.09875" y1="12.288125" x2="28.11375" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="28.11375" y1="12.303125" x2="28.11375" y2="12.87375" width="0.2032" layer="1"/>
+<wire x1="28.11375" y1="12.87375" x2="29.21" y2="13.97" width="0.2032" layer="1"/>
 </signal>
 <signal name="T+">
+<contactref element="JP4" pad="P1"/>
+<contactref element="C4" pad="2"/>
 <contactref element="U3" pad="3"/>
-<contactref element="JP4" pad="P1"/>
-<wire x1="25.7175" y1="11.58" x2="25.7175" y2="13.0175" width="0.2032" layer="1"/>
-<wire x1="25.7175" y1="13.0175" x2="26.67" y2="13.97" width="0.2032" layer="1"/>
+<wire x1="26.82875" y1="10.706875" x2="26.82875" y2="12.288125" width="0.2032" layer="1"/>
+<wire x1="26.82875" y1="12.288125" x2="26.81375" y2="12.303125" width="0.2032" layer="1"/>
+<wire x1="26.81375" y1="12.303125" x2="26.81375" y2="13.82625" width="0.2032" layer="1"/>
+<wire x1="26.81375" y1="13.82625" x2="26.67" y2="13.97" width="0.2032" layer="1"/>
 </signal>
 <signal name="SW-BTN">
 <contactref element="SW1" pad="2"/>
@@ -3050,57 +3066,55 @@ design rules under a new name.</descript
 <via x="6.50875" y="6.746875" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="12"/>
 <contactref element="U1" pad="13"/>
-<wire x1="11.191875" y1="8.73125" x2="8.711875" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="11.350625" y1="8.969375" x2="8.95" y2="8.969375" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="6.76625" x2="6.528125" y2="6.76625" width="0.2032" layer="16"/>
 <wire x1="6.528125" y1="6.76625" x2="6.50875" y2="6.746875" width="0.2032" layer="16"/>
-<wire x1="8.711875" y1="8.73125" x2="6.7275" y2="6.746875" width="0.2032" layer="1"/>
+<wire x1="8.95" y1="8.969375" x2="6.7275" y2="6.746875" width="0.2032" layer="1"/>
 <wire x1="6.7275" y1="6.746875" x2="6.50875" y2="6.746875" width="0.2032" layer="1"/>
-<wire x1="12.175625" y1="9.43375" x2="11.894375" y2="9.43375" width="0.2032" layer="1"/>
-<wire x1="11.894375" y1="9.43375" x2="11.191875" y2="8.73125" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="9.43375" x2="11.815" y2="9.43375" width="0.2032" layer="1"/>
+<wire x1="11.815" y1="9.43375" x2="11.350625" y2="8.969375" width="0.2032" layer="1"/>
 </signal>
 <signal name="SPI_MISO">
 <contactref element="U3" pad="7"/>
-<wire x1="26.9875" y1="6.18" x2="26.9875" y2="8.255" width="0.2032" layer="1"/>
-<wire x1="27.066875" y1="6.100625" x2="26.9875" y2="6.18" width="0.2032" layer="1"/>
+<wire x1="28.09875" y1="5.306875" x2="28.09875" y2="8.651875" width="0.2032" layer="1"/>
 <contactref element="U1" pad="12"/>
-<via x="26.9875" y="8.255" extent="1-16" drill="0.3048"/>
-<wire x1="26.273125" y1="7.540625" x2="25.479375" y2="7.540625" width="0.2032" layer="16"/>
-<wire x1="25.479375" y1="7.540625" x2="24.526875" y2="8.493125" width="0.2032" layer="16"/>
-<wire x1="24.526875" y1="8.493125" x2="20.79625" y2="8.493125" width="0.2032" layer="16"/>
+<via x="28.09875" y="8.651875" extent="1-16" drill="0.3048"/>
+<wire x1="26.114375" y1="8.493125" x2="20.79625" y2="8.493125" width="0.2032" layer="16"/>
 <wire x1="20.79625" y1="8.493125" x2="19.52625" y2="7.223125" width="0.2032" layer="16"/>
 <wire x1="19.52625" y1="7.223125" x2="13.05498125" y2="7.223125" width="0.2032" layer="16"/>
-<wire x1="13.05498125" y1="7.223125" x2="11.43" y2="8.84810625" width="0.2032" layer="16"/>
-<wire x1="11.43" y1="8.84810625" x2="11.43" y2="9.763125" width="0.2032" layer="16"/>
-<via x="11.43" y="9.763125" extent="1-16" drill="0.3048"/>
-<wire x1="12.175625" y1="9.93375" x2="11.600625" y2="9.93375" width="0.2032" layer="1"/>
-<wire x1="11.600625" y1="9.93375" x2="11.43" y2="9.763125" width="0.2032" layer="1"/>
-<wire x1="26.273125" y1="7.540625" x2="26.9875" y2="8.255" width="0.2032" layer="16"/>
+<wire x1="13.05498125" y1="7.223125" x2="11.191875" y2="9.08623125" width="0.2032" layer="16"/>
+<via x="11.191875" y="9.604375" extent="1-16" drill="0.3048"/>
+<wire x1="26.114375" y1="8.493125" x2="26.590625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="26.590625" y1="8.016875" x2="27.860625" y2="8.016875" width="0.2032" layer="16"/>
+<wire x1="27.860625" y1="8.016875" x2="28.09875" y2="8.255" width="0.2032" layer="16"/>
+<wire x1="28.09875" y1="8.255" x2="28.09875" y2="8.651875" width="0.2032" layer="16"/>
+<wire x1="12.175625" y1="9.93375" x2="11.52125" y2="9.93375" width="0.2032" layer="1"/>
+<wire x1="11.52125" y1="9.93375" x2="11.191875" y2="9.604375" width="0.2032" layer="1"/>
+<wire x1="11.191875" y1="9.08623125" x2="11.191875" y2="9.604375" width="0.2032" layer="16"/>
 </signal>
 <signal name="SPI_SCK">
 <via x="6.0325" y="7.46125" extent="1-16" drill="0.3048"/>
 <contactref element="LCD1" pad="11"/>
 <contactref element="U3" pad="5"/>
-<via x="24.13" y="7.77875" extent="1-16" drill="0.3048"/>
+<via x="25.55875" y="7.77875" extent="1-16" drill="0.3048"/>
 <contactref element="U1" pad="11"/>
 <via x="10.795" y="10.31875" extent="1-16" drill="0.3048"/>
-<wire x1="10.795" y1="8.884109375" x2="12.852859375" y2="6.82625" width="0.2032" layer="16"/>
+<wire x1="10.556875" y1="9.042859375" x2="12.852859375" y2="6.82625" width="0.2032" layer="16"/>
 <wire x1="12.852859375" y1="6.82625" x2="19.685" y2="6.82625" width="0.2032" layer="16"/>
-<wire x1="10.795" y1="10.43375" x2="8.52875" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="8.52875" y1="10.43375" x2="7.62" y2="9.525" width="0.2032" layer="1"/>
-<wire x1="7.62" y1="9.525" x2="7.62" y2="8.21" width="0.2032" layer="1"/>
-<wire x1="7.62" y1="8.21" x2="6.82625" y2="7.41625" width="0.2032" layer="1"/>
 <wire x1="19.685" y1="6.82625" x2="20.955" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="20.955" y1="8.09625" x2="23.8125" y2="8.09625" width="0.2032" layer="16"/>
-<wire x1="23.8125" y1="8.09625" x2="24.13" y2="7.77875" width="0.2032" layer="16"/>
-<wire x1="12.175625" y1="10.43375" x2="10.795" y2="10.43375" width="0.2032" layer="1"/>
-<wire x1="10.795" y1="10.43375" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
-<wire x1="10.795" y1="8.884109375" x2="10.795" y2="10.31875" width="0.2032" layer="16"/>
-<wire x1="24.4475" y1="6.18" x2="24.4475" y2="7.46125" width="0.2032" layer="1"/>
-<wire x1="24.4475" y1="7.46125" x2="24.13" y2="7.77875" width="0.2032" layer="1"/>
+<wire x1="20.955" y1="8.09625" x2="25.24125" y2="8.09625" width="0.2032" layer="16"/>
+<wire x1="25.24125" y1="8.09625" x2="25.55875" y2="7.77875" width="0.2032" layer="16"/>
+<wire x1="25.55875" y1="5.306875" x2="25.55875" y2="7.77875" width="0.2032" layer="1"/>
 <wire x1="8.335" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="16"/>
 <wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="16"/>
 <wire x1="6.82625" y1="7.41625" x2="6.0775" y2="7.41625" width="0.2032" layer="1"/>
 <wire x1="6.0775" y1="7.41625" x2="6.0325" y2="7.46125" width="0.2032" layer="1"/>
+<wire x1="6.82625" y1="7.41625" x2="9.72875" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="9.72875" y1="10.31875" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="12.175625" y1="10.43375" x2="10.91" y2="10.43375" width="0.2032" layer="1"/>
+<wire x1="10.91" y1="10.43375" x2="10.795" y2="10.31875" width="0.2032" layer="1"/>
+<wire x1="10.556875" y1="9.042859375" x2="10.556875" y2="10.080625" width="0.2032" layer="16"/>
+<wire x1="10.556875" y1="10.080625" x2="10.795" y2="10.31875" width="0.2032" layer="16"/>
 </signal>
 <signal name="!CS_OLED">
 <contactref element="LCD1" pad="8"/>
@@ -3115,15 +3129,15 @@ design rules under a new name.</descript
 <contactref element="U3" pad="6"/>
 <contactref element="U1" pad="25"/>
 <wire x1="19.52625" y1="7.77875" x2="20.6375" y2="8.89" width="0.2032" layer="16"/>
-<wire x1="20.6375" y1="8.89" x2="25.161875" y2="8.89" width="0.2032" layer="16"/>
-<via x="25.7175" y="8.334375" extent="1-16" drill="0.3048"/>
-<wire x1="25.7175" y1="8.334375" x2="25.7175" y2="6.18" width="0.2032" layer="1"/>
+<wire x1="20.6375" y1="8.89" x2="26.67" y2="8.89" width="0.2032" layer="16"/>
+<via x="26.82875" y="8.651875" extent="1-16" drill="0.3048"/>
+<wire x1="26.82875" y1="8.651875" x2="26.82875" y2="5.306875" width="0.2032" layer="1"/>
 <wire x1="19.52625" y1="7.77875" x2="18.0975" y2="7.77875" width="0.2032" layer="16"/>
 <wire x1="18.0975" y1="7.77875" x2="18.018125" y2="7.858125" width="0.2032" layer="16"/>
 <via x="18.018125" y="7.858125" extent="1-16" drill="0.3048"/>
-<wire x1="25.161875" y1="8.89" x2="25.7175" y2="8.334375" width="0.2032" layer="16"/>
 <wire x1="16.875625" y1="7.93375" x2="17.9425" y2="7.93375" width="0.2032" layer="1"/>
 <wire x1="17.9425" y1="7.93375" x2="18.018125" y2="7.858125" width="0.2032" layer="1"/>
+<wire x1="26.67" y1="8.89" x2="26.82875" y2="8.651875" width="0.2032" layer="16"/>
 </signal>
 <signal name="AUX-TX">
 <contactref element="U1" pad="19"/>
diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.1.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="yes"/>
@@ -4109,6 +4109,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="C9" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
 <part name="R3" library="SparkFun-Passives" deviceset="RESISTOR" device="0402-RES" value="390k"/>
 <part name="C3" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="2.2uF"/>
+<part name="U$1" library="microbuilder" deviceset="GND" device=""/>
+<part name="SUPPLY2" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
+<part name="C4" library="SparkFun-Passives" deviceset="CAP" device="0402-CAP" value="0.01uF"/>
 </parts>
 <sheets>
 <sheet>
@@ -4127,7 +4130,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="U$17" gate="G$1" x="99.06" y="66.04"/>
 <instance part="SW1" gate="SW" x="147.32" y="30.48"/>
 <instance part="J2" gate="G$1" x="256.54" y="35.56"/>
-<instance part="U3" gate="G$1" x="231.14" y="160.02" rot="R180"/>
+<instance part="U3" gate="G$1" x="205.74" y="160.02" rot="R180"/>
 <instance part="U2" gate="G$1" x="149.86" y="66.04"/>
 <instance part="LED1" gate="G$1" x="27.94" y="48.26"/>
 <instance part="JP2" gate="G$1" x="261.62" y="129.54" rot="R180"/>
@@ -4147,9 +4150,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="R1" gate="G$1" x="27.94" y="58.42" rot="R270"/>
 <instance part="GND3" gate="1" x="228.6" y="106.68"/>
 <instance part="GND4" gate="1" x="27.94" y="38.1"/>
-<instance part="U$10" gate="G$1" x="264.16" y="149.86"/>
-<instance part="SUPPLY9" gate="G$1" x="264.16" y="170.18"/>
-<instance part="C8" gate="G$1" x="264.16" y="162.56" rot="R180"/>
+<instance part="U$10" gate="G$1" x="269.24" y="152.4"/>
+<instance part="SUPPLY9" gate="G$1" x="269.24" y="167.64"/>
+<instance part="C8" gate="G$1" x="269.24" y="162.56" rot="R180"/>
 <instance part="GND7" gate="1" x="121.92" y="58.42"/>
 <instance part="GND8" gate="1" x="182.88" y="55.88"/>
 <instance part="FRAME1" gate="G$1" x="5.08" y="5.08"/>
@@ -4175,6 +4178,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="C9" gate="G$1" x="71.12" y="71.12" rot="R90"/>
 <instance part="R3" gate="G$1" x="55.88" y="40.64"/>
 <instance part="C3" gate="G$1" x="60.96" y="66.04" rot="R270"/>
+<instance part="U$1" gate="G$1" x="223.52" y="152.4"/>
+<instance part="SUPPLY2" gate="G$1" x="223.52" y="167.64"/>
+<instance part="C4" gate="G$1" x="251.46" y="162.56" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -4273,15 +4279,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="27.94" y1="43.18" x2="27.94" y2="40.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="GND"/>
-<wire x1="248.92" y1="157.48" x2="246.38" y2="157.48" width="0.1524" layer="91"/>
-<wire x1="248.92" y1="157.48" x2="248.92" y2="154.94" width="0.1524" layer="91"/>
 <pinref part="C8" gate="G$1" pin="1"/>
-<wire x1="248.92" y1="154.94" x2="264.16" y2="154.94" width="0.1524" layer="91"/>
-<wire x1="264.16" y1="154.94" x2="264.16" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="U$10" gate="G$1" pin="GND"/>
-<wire x1="264.16" y1="154.94" x2="264.16" y2="152.4" width="0.1524" layer="91"/>
-<junction x="264.16" y="154.94"/>
+<wire x1="269.24" y1="157.48" x2="269.24" y2="154.94" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="C5" gate="G$1" pin="1"/>
@@ -4324,6 +4324,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="175.26" y1="160.02" x2="175.26" y2="157.48" width="0.1524" layer="91"/>
 <pinref part="U$7" gate="G$1" pin="GND"/>
 </segment>
+<segment>
+<pinref part="U3" gate="G$1" pin="GND"/>
+<wire x1="223.52" y1="157.48" x2="220.98" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="157.48" x2="223.52" y2="154.94" width="0.1524" layer="91"/>
+<pinref part="U$1" gate="G$1" pin="GND"/>
+</segment>
 </net>
 <net name="N$8" class="0">
 <segment>
@@ -4374,15 +4380,9 @@ Standard 0603 ceramic capacitor, and 0.1
 <junction x="177.8" y="71.12"/>
 </segment>
 <segment>
-<pinref part="U3" gate="G$1" pin="VCC"/>
-<wire x1="248.92" y1="165.1" x2="246.38" y2="165.1" width="0.1524" layer="91"/>
-<wire x1="248.92" y1="165.1" x2="248.92" y2="167.64" width="0.1524" layer="91"/>
 <pinref part="C8" gate="G$1" pin="2"/>
-<wire x1="248.92" y1="167.64" x2="264.16" y2="167.64" width="0.1524" layer="91"/>
-<wire x1="264.16" y1="167.64" x2="264.16" y2="165.1" width="0.1524" layer="91"/>
 <pinref part="SUPPLY9" gate="G$1" pin="3.3V"/>
-<wire x1="264.16" y1="167.64" x2="264.16" y2="170.18" width="0.1524" layer="91"/>
-<junction x="264.16" y="167.64"/>
+<wire x1="269.24" y1="165.1" x2="269.24" y2="167.64" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U1" gate="G$1" pin="VDD"/>
@@ -4410,6 +4410,12 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="SUPPLY13" gate="G$1" pin="3.3V"/>
 <junction x="160.02" y="124.46"/>
 </segment>
+<segment>
+<pinref part="U3" gate="G$1" pin="VCC"/>
+<wire x1="223.52" y1="165.1" x2="223.52" y2="167.64" width="0.1524" layer="91"/>
+<wire x1="223.52" y1="165.1" x2="220.98" y2="165.1" width="0.1524" layer="91"/>
+<pinref part="SUPPLY2" gate="G$1" pin="3.3V"/>
+</segment>
 </net>
 <net name="V_BATT" class="0">
 <segment>
@@ -4595,27 +4601,39 @@ Standard 0603 ceramic capacitor, and 0.1
 </net>
 <net name="T-" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="T-"/>
-<wire x1="248.92" y1="160.02" x2="246.38" y2="160.02" width="0.1524" layer="91"/>
-<label x="248.92" y="160.02" size="1.016" layer="95" xref="yes"/>
-</segment>
-<segment>
 <pinref part="JP4" gate="G$1" pin="2"/>
 <wire x1="254" y1="96.52" x2="228.6" y2="96.52" width="0.1524" layer="91"/>
 <label x="228.6" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="C4" gate="G$1" pin="1"/>
+<wire x1="251.46" y1="152.4" x2="251.46" y2="157.48" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="152.4" x2="254" y2="152.4" width="0.1524" layer="91"/>
+<junction x="251.46" y="152.4"/>
+<label x="254" y="152.4" size="1.27" layer="95" xref="yes"/>
+<pinref part="U3" gate="G$1" pin="T-"/>
+<wire x1="220.98" y1="160.02" x2="231.14" y2="160.02" width="0.1524" layer="91"/>
+<wire x1="231.14" y1="160.02" x2="231.14" y2="152.4" width="0.1524" layer="91"/>
+<wire x1="231.14" y1="152.4" x2="251.46" y2="152.4" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="T+" class="0">
 <segment>
-<pinref part="U3" gate="G$1" pin="T+"/>
-<wire x1="248.92" y1="162.56" x2="246.38" y2="162.56" width="0.1524" layer="91"/>
-<label x="248.92" y="162.56" size="1.016" layer="95" xref="yes"/>
-</segment>
-<segment>
 <pinref part="JP4" gate="G$1" pin="1"/>
 <wire x1="254" y1="99.06" x2="228.6" y2="99.06" width="0.1524" layer="91"/>
 <label x="228.6" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
+<segment>
+<pinref part="C4" gate="G$1" pin="2"/>
+<wire x1="251.46" y1="167.64" x2="251.46" y2="165.1" width="0.1524" layer="91"/>
+<wire x1="251.46" y1="167.64" x2="254" y2="167.64" width="0.1524" layer="91"/>
+<junction x="251.46" y="167.64"/>
+<label x="254" y="167.64" size="1.27" layer="95" xref="yes"/>
+<pinref part="U3" gate="G$1" pin="T+"/>
+<wire x1="220.98" y1="162.56" x2="231.14" y2="162.56" width="0.1524" layer="91"/>
+<wire x1="231.14" y1="162.56" x2="231.14" y2="167.64" width="0.1524" layer="91"/>
+<wire x1="231.14" y1="167.64" x2="251.46" y2="167.64" width="0.1524" layer="91"/>
+</segment>
 </net>
 <net name="SW-BTN" class="0">
 <segment>
@@ -4644,8 +4662,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="SPI_MISO" class="0">
 <segment>
 <pinref part="U3" gate="G$1" pin="SO"/>
-<wire x1="213.36" y1="160.02" x2="215.9" y2="160.02" width="0.1524" layer="91"/>
-<label x="213.36" y="160.02" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="187.96" y1="160.02" x2="190.5" y2="160.02" width="0.1524" layer="91"/>
+<label x="187.96" y="160.02" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="66.04" y1="134.62" x2="55.88" y2="134.62" width="0.1524" layer="91"/>
@@ -4661,8 +4679,8 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="U3" gate="G$1" pin="SCK"/>
-<wire x1="213.36" y1="165.1" x2="215.9" y2="165.1" width="0.1524" layer="91"/>
-<label x="213.36" y="165.1" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="187.96" y1="165.1" x2="190.5" y2="165.1" width="0.1524" layer="91"/>
+<label x="187.96" y="165.1" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="66.04" y1="137.16" x2="55.88" y2="137.16" width="0.1524" layer="91"/>
@@ -4685,8 +4703,8 @@ Standard 0603 ceramic capacitor, and 0.1
 <net name="!CS_MAX" class="0">
 <segment>
 <pinref part="U3" gate="G$1" pin="!CS"/>
-<wire x1="213.36" y1="162.56" x2="215.9" y2="162.56" width="0.1524" layer="91"/>
-<label x="213.36" y="162.56" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="187.96" y1="162.56" x2="190.5" y2="162.56" width="0.1524" layer="91"/>
+<label x="187.96" y="162.56" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
 <wire x1="152.4" y1="144.78" x2="162.56" y2="144.78" width="0.1524" layer="91"/>