diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -14,7 +14,7 @@
 <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"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
@@ -32,9 +32,9 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
 <layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
 <layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="yes" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
@@ -146,12 +146,7 @@
 <wire x1="43.18" y1="48.26" x2="38.1" y2="43.18" width="0.4064" layer="21"/>
 <wire x1="38.1" y1="43.18" x2="35.56" y2="43.18" width="0.4064" layer="21"/>
 <circle x="24.4475" y="39.0525" radius="0.127" width="0.4064" layer="21"/>
-<text x="80.01" y="27.94" size="1.778" layer="21">heater</text>
 <text x="54.61" y="25.4" size="1.27" layer="21" font="vector" rot="R90">via to gnd plane below</text>
-<wire x1="76.2" y1="25.4" x2="87.63" y2="25.4" width="0.4064" layer="21"/>
-<wire x1="87.63" y1="25.4" x2="87.63" y2="16.51" width="0.4064" layer="21"/>
-<wire x1="87.63" y1="16.51" x2="76.2" y2="16.51" width="0.4064" layer="21"/>
-<wire x1="76.2" y1="16.51" x2="76.2" y2="25.4" width="0.4064" layer="21"/>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -948,7 +943,7 @@ www.irf.com&lt;p&gt;
 <class number="2" name="20" width="0.508" drill="0">
 </class>
 </classes>
-<designrules name="LaenPCBOrder">
+<designrules name="LaenPCBOrder *">
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -977,8 +972,8 @@ Please make sure your boards conform to 
 <param name="mdDrill" value="6mil"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="6mil"/>
-<param name="msDrill" value="13mil"/>
-<param name="msMicroVia" value="13mil"/>
+<param name="msDrill" value="6mil"/>
+<param name="msMicroVia" value="6mil"/>
 <param name="msBlindViaRatio" value="0.5"/>
 <param name="rvPadTop" value="0.25"/>
 <param name="rvPadInner" value="0.25"/>
@@ -1124,7 +1119,7 @@ Please make sure your boards conform to 
 <element name="U$2" library="SparkFun" package="XBEE-SMD" value="XBEE-1B3" x="28.575" y="14.2875" rot="MR270"/>
 <element name="C1" library="SparkFun" package="0603-CAP" value="18pf" x="46.0375" y="6.985" rot="R90"/>
 <element name="C2" library="SparkFun" package="0603-CAP" value="18pf" x="37.7825" y="6.985" rot="R90"/>
-<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="28.575" y="7.3025" rot="R90"/>
+<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="26.9875" y="6.35" rot="R90"/>
 <element name="IC1" library="atmel" package="TQFP44" value="ATMEGA644P" x="36.83" y="16.51" rot="R90">
 <attribute name="OC_NEWARK" value="58M3748" x="82.55" y="59.69" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MPN" value="ATMEGA644PV-10AU" x="82.55" y="59.69" size="1.778" layer="27" rot="R90" display="off"/>
@@ -1144,15 +1139,15 @@ Please make sure your boards conform to 
 <element name="C3" library="SparkFun" package="0603-CAP" value=".1uF" x="36.83" y="25.4" rot="R180"/>
 <element name="IC2" library="74xx-little-us" package="SOT23-5" value="ON M74VHC1GT125DT1G" x="34.29" y="45.72"/>
 <element name="TX" library="adafruit" package="CHIPLED_0603" value="GREEN" x="43.815" y="50.8"/>
-<element name="STAT" library="adafruit" package="CHIPLED_0603" value="BLUE" x="19.05" y="1.27" rot="R90"/>
-<element name="ERROR" library="adafruit" package="CHIPLED_0603" value="RED" x="15.24" y="1.27" rot="R90"/>
+<element name="STAT" library="adafruit" package="CHIPLED_0603" value="BLUE" x="15.24" y="1.27" rot="R90"/>
+<element name="ERROR" library="adafruit" package="CHIPLED_0603" value="RED" x="11.43" y="1.27" rot="R90"/>
 <element name="POWER" library="adafruit" package="CHIPLED_0603" value="WHITE" x="22.86" y="1.27" rot="R90"/>
 <element name="R10" library="SparkFun" package="0603-RES" value="4.7k" x="48.895" y="16.51" rot="R180"/>
 <element name="R11" library="SparkFun" package="0603-RES" value="4.7k" x="48.895" y="21.59"/>
 <element name="Q5" library="transistor-npn" package="SOT23-BEC" value="NPN" x="30.48" y="44.45"/>
 <element name="R18" library="SparkFun" package="0603-RES" value="10k" x="46.0375" y="50.8" rot="R270"/>
-<element name="R19" library="SparkFun" package="0603-RES" value="10k" x="19.05" y="2.54" rot="R180"/>
-<element name="R20" library="SparkFun" package="0603-RES" value="10k" x="15.24" y="2.54" rot="R180"/>
+<element name="R19" library="SparkFun" package="0603-RES" value="10k" x="15.24" y="2.54" rot="R180"/>
+<element name="R20" library="SparkFun" package="0603-RES" value="10k" x="11.43" y="2.54" rot="R180"/>
 <element name="R21" library="SparkFun" package="0603-RES" value="10k" x="22.86" y="2.54" rot="R180"/>
 <element name="BATT" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="22.86" y="48.895"/>
 <element name="BUZZ" library="SLAT-CON-JST-ZH" package="ZH-H-2-1" value="ZH-H-2-1" x="29.21" y="48.895"/>
@@ -1201,21 +1196,21 @@ Please make sure your boards conform to 
 <element name="R25" library="SparkFun" package="0603-RES" value="10k" x="64.77" y="6.35"/>
 <element name="SETGPS" library="SLAT-CON-JST-ZH" package="ZH-V-3-1" value="ZH-V-3-1" x="50.8" y="12.7" rot="R270"/>
 <element name="IC3" library="74xx-little-us" package="SOT23-5" value="ON M74VHC1GT125DT1G" x="38.1" y="45.72"/>
-<element name="R27" library="SparkFun" package="R2512" value="18R" x="83.82" y="31.75" rot="R180"/>
-<element name="Q7" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="87.63" y="35.56"/>
-<element name="Q9" library="transistor-npn" package="SOT23-BEC" value="NPN" x="82.55" y="35.56" rot="R180"/>
-<element name="R29" library="SparkFun" package="0603-RES" value="1M" x="85.09" y="35.56" rot="R90"/>
-<element name="10K" library="SparkFun" package="0603-RES" value="100k" x="80.01" y="35.56" rot="R270"/>
-<element name="AUX4" library="adafruit" package="CHIPLED_0603" value="GREEN" x="63.5" y="26.67" rot="R90"/>
-<element name="R4" library="SparkFun" package="0603-RES" value="10k" x="63.5" y="25.4"/>
+<element name="R27" library="SparkFun" package="R2512" value="18R" x="14.2875" y="35.56" rot="R180"/>
+<element name="Q7" library="SparkFun" package="SOT23-3" value="MOSFET-PCHANNELSMD" x="18.0975" y="39.37" rot="R180"/>
+<element name="Q9" library="transistor-npn" package="SOT23-BEC" value="NPN" x="13.0175" y="39.37" rot="R180"/>
+<element name="R29" library="SparkFun" package="0603-RES" value="1M" x="15.5575" y="39.37" rot="R90"/>
+<element name="10K" library="SparkFun" package="0603-RES" value="100k" x="10.4775" y="39.37" rot="R270"/>
+<element name="AUX4" library="adafruit" package="CHIPLED_0603" value="GREEN" x="19.05" y="1.27" rot="R90"/>
+<element name="R4" library="SparkFun" package="0603-RES" value="10k" x="19.05" y="2.54" rot="R180"/>
 <element name="L1" library="SparkFun" package="C0402" value="BLM18HB331SN1D" x="15.24" y="8.89" rot="R180"/>
-<element name="C4" library="SparkFun" package="0603-CAP" value=".1uF" x="52.07" y="19.05" rot="R90"/>
+<element name="C4" library="SparkFun" package="0603-CAP" value=".1uF" x="46.355" y="16.1925" rot="R90"/>
 <element name="ASDF" library="adafruit" package="MICROSD" value="MICROSD" x="16.1925" y="6.985" rot="MR90"/>
-<element name="C6" library="SparkFun" package="0603-CAP" value=".1uF" x="85.09" y="22.86" rot="R270"/>
-<element name="R5" library="SparkFun" package="0603-RES" value="100k" x="77.47" y="22.86" rot="R90"/>
-<element name="C22" library="SparkFun" package="0603-CAP" value="10uF" x="82.55" y="22.86" rot="R270"/>
-<element name="R6" library="SparkFun" package="0603-RES" value="100k" x="80.01" y="22.86" rot="R90"/>
-<element name="R7" library="SparkFun" package="0603-ARV" value="4.7k" x="78.74" y="19.05" rot="R270"/>
+<element name="C6" library="SparkFun" package="0603-CAP" value=".1uF" x="2.2225" y="23.8125" rot="MR90"/>
+<element name="R5" library="SparkFun" package="0603-RES" value="100k" x="26.3525" y="17.4625" rot="R90"/>
+<element name="C22" library="SparkFun" package="0603-CAP" value="10uF" x="4.445" y="23.8125" rot="MR90"/>
+<element name="R6" library="SparkFun" package="0603-RES" value="100k" x="25.0825" y="6.35" rot="R270"/>
+<element name="R12" library="SparkFun" package="0603-ARV" value="4.7k" x="25.0825" y="10.16" rot="R90"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -1295,10 +1290,6 @@ Please make sure your boards conform to 
 <wire x1="36.83" y1="22.31" x2="36.83" y2="24.55" width="0.4064" layer="1"/>
 <wire x1="36.83" y1="24.55" x2="37.68" y2="25.4" width="0.4064" layer="1"/>
 <wire x1="39.79" y1="25.4" x2="37.68" y2="25.4" width="0.4064" layer="1"/>
-<wire x1="22.86" y1="48.875" x2="22.86" y2="48.26" width="0.4064" layer="1"/>
-<wire x1="22.86" y1="48.26" x2="20.32" y2="45.72" width="0.4064" layer="1"/>
-<wire x1="20.32" y1="45.72" x2="20.32" y2="44.94" width="0.4064" layer="1"/>
-<wire x1="20.32" y1="44.94" x2="21.91" y2="43.35" width="0.4064" layer="1"/>
 <wire x1="38.95" y1="48.895" x2="38.95" y2="50.38" width="0.4064" layer="1"/>
 <wire x1="38.95" y1="50.38" x2="39.37" y2="50.8" width="0.4064" layer="1"/>
 <contactref element="SETGPS" pad="2"/>
@@ -1316,10 +1307,10 @@ Please make sure your boards conform to 
 <contactref element="R27" pad="2"/>
 <contactref element="Q9" pad="E"/>
 <polygon width="0.4064" layer="1">
-<vertex x="76.2" y="40.64"/>
-<vertex x="90.17" y="40.64"/>
-<vertex x="90.17" y="27.94"/>
-<vertex x="76.2" y="27.94"/>
+<vertex x="-2.54" y="57.15"/>
+<vertex x="20.32" y="57.15"/>
+<vertex x="20.32" y="5.08"/>
+<vertex x="-2.54" y="5.08"/>
 </polygon>
 <contactref element="AUX4" pad="C"/>
 <contactref element="C4" pad="2"/>
@@ -1342,13 +1333,13 @@ Please make sure your boards conform to 
 <wire x1="11.745" y1="7.935" x2="12.3825" y2="7.3025" width="0.4064" layer="1"/>
 <wire x1="14.39" y1="7.3025" x2="14.39" y2="6.4525" width="0.4064" layer="1"/>
 <wire x1="14.39" y1="6.4525" x2="14.2875" y2="6.35" width="0.4064" layer="1"/>
+<via x="9.525" y="1.905" extent="1-16" drill="0.254"/>
 <via x="13.335" y="1.905" extent="1-16" drill="0.254"/>
-<via x="17.145" y="1.905" extent="1-16" drill="0.254"/>
 <via x="20.955" y="1.905" extent="1-16" drill="0.254"/>
+<wire x1="10.68" y1="1.27" x2="10.16" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="10.16" y1="1.27" x2="9.525" y2="1.905" width="0.4064" layer="1"/>
 <wire x1="14.49" y1="1.27" x2="13.97" y2="1.27" width="0.4064" layer="1"/>
 <wire x1="13.97" y1="1.27" x2="13.335" y2="1.905" width="0.4064" layer="1"/>
-<wire x1="18.3" y1="1.27" x2="17.78" y2="1.27" width="0.4064" layer="1"/>
-<wire x1="17.78" y1="1.27" x2="17.145" y2="1.905" width="0.4064" layer="1"/>
 <wire x1="22.11" y1="1.27" x2="21.59" y2="1.27" width="0.4064" layer="1"/>
 <wire x1="21.59" y1="1.27" x2="20.955" y2="1.905" width="0.4064" layer="1"/>
 <wire x1="34.29" y1="4.1275" x2="34.29" y2="4.865" width="0.4064" layer="1"/>
@@ -1414,23 +1405,55 @@ Please make sure your boards conform to 
 <via x="38.735" y="26.3525" extent="1-16" drill="0.254"/>
 <wire x1="38.735" y1="26.3525" x2="38.735" y2="25.4" width="0.4064" layer="1"/>
 <wire x1="38.735" y1="25.4" x2="39.79" y2="25.4" width="0.4064" layer="1"/>
-<via x="29.21" y="15.875" extent="1-16" drill="0.254"/>
-<wire x1="29.21" y1="15.875" x2="29.21" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="82.55" y1="22.01" x2="85.09" y2="22.01" width="0" layer="19" extent="1-1"/>
-<wire x1="81.02" y1="31.75" x2="82.55" y2="22.01" width="0" layer="19" extent="1-1"/>
-<wire x1="70.37" y1="8.89" x2="82.55" y2="22.01" width="0" layer="19" extent="1-1"/>
+<via x="29.21" y="17.145" extent="1-16" drill="0.254"/>
+<wire x1="29.21" y1="17.145" x2="29.21" y2="16.51" width="0.4064" layer="1"/>
+<via x="9.8425" y="36.5125" extent="1-16" drill="0.254"/>
+<via x="9.8425" y="35.56" extent="1-16" drill="0.254"/>
+<via x="9.8425" y="34.6075" extent="1-16" drill="0.254"/>
+<via x="9.8425" y="33.655" extent="1-16" drill="0.254"/>
+<via x="9.8425" y="32.7025" extent="1-16" drill="0.254"/>
+<via x="10.795" y="32.7025" extent="1-16" drill="0.254"/>
+<via x="13.335" y="36.5125" extent="1-16" drill="0.254"/>
+<via x="13.335" y="35.56" extent="1-16" drill="0.254"/>
+<via x="13.335" y="34.6075" extent="1-16" drill="0.254"/>
+<via x="13.335" y="33.655" extent="1-16" drill="0.254"/>
+<via x="13.335" y="32.7025" extent="1-16" drill="0.254"/>
+<via x="14.2875" y="36.5125" extent="1-16" drill="0.254"/>
+<via x="14.2875" y="35.56" extent="1-16" drill="0.254"/>
+<via x="14.2875" y="34.6075" extent="1-16" drill="0.254"/>
+<via x="14.2875" y="33.655" extent="1-16" drill="0.254"/>
+<via x="14.2875" y="32.7025" extent="1-16" drill="0.254"/>
+<via x="15.24" y="36.5125" extent="1-16" drill="0.254"/>
+<via x="15.24" y="35.56" extent="1-16" drill="0.254"/>
+<via x="15.24" y="34.6075" extent="1-16" drill="0.254"/>
+<via x="15.24" y="33.655" extent="1-16" drill="0.254"/>
+<via x="15.24" y="32.7025" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="36.5125" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="35.56" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="34.6075" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="33.655" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="32.7025" extent="1-16" drill="0.254"/>
+<via x="17.78" y="32.7025" extent="1-16" drill="0.254"/>
+<wire x1="21.91" y1="43.35" x2="18.88" y2="43.35" width="0.8128" layer="1"/>
+<wire x1="18.88" y1="43.35" x2="17.78" y2="44.45" width="0.8128" layer="1"/>
+<via x="36.5125" y="20.6375" extent="1-16" drill="0.254"/>
+<wire x1="36.5125" y1="20.6375" x2="36.83" y2="20.955" width="0.4064" layer="1"/>
+<wire x1="36.83" y1="20.955" x2="36.83" y2="22.31" width="0.4064" layer="1"/>
+<via x="40.9575" y="17.4625" extent="1-16" drill="0.254"/>
+<wire x1="42.63" y1="17.31" x2="41.11" y2="17.31" width="0.4064" layer="1"/>
+<wire x1="41.11" y1="17.31" x2="40.9575" y2="17.4625" width="0.4064" layer="1"/>
+<via x="46.355" y="18.415" extent="1-16" drill="0.254"/>
+<wire x1="47.605" y1="19.05" x2="46.99" y2="19.05" width="0.4064" layer="1"/>
+<wire x1="46.99" y1="19.05" x2="46.355" y2="18.415" width="0.4064" layer="1"/>
+<wire x1="46.355" y1="17.0425" x2="46.355" y2="18.415" width="0.4064" layer="1"/>
+<via x="17.145" y="1.905" extent="1-16" drill="0.254"/>
+<wire x1="18.3" y1="1.27" x2="17.78" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="17.78" y1="1.27" x2="17.145" y2="1.905" width="0.4064" layer="1"/>
 <wire x1="71.64" y1="5.08" x2="70.37" y2="8.89" width="0" layer="19" extent="1-1"/>
 <wire x1="67.83" y1="5.08" x2="71.64" y2="5.08" width="0" layer="19" extent="1-1"/>
 <wire x1="64.02" y1="5.08" x2="67.83" y2="5.08" width="0" layer="19" extent="1-1"/>
 <wire x1="50.78" y1="11.2" x2="64.02" y2="5.08" width="0" layer="19" extent="1-1"/>
 <wire x1="17.175" y1="12.9" x2="15.7525" y2="14.985" width="0" layer="19" extent="1-16"/>
-<wire x1="3.175" y1="24.7" x2="1.7525" y2="20.585" width="0" layer="19" extent="1-16"/>
-<wire x1="5.375" y1="24.7" x2="3.175" y2="24.7" width="0" layer="19" extent="1-1"/>
-<wire x1="10.575" y1="24.7" x2="5.375" y2="24.7" width="0" layer="19" extent="1-1"/>
-<wire x1="42.63" y1="17.31" x2="36.83" y2="22.31" width="0" layer="19" extent="1-1"/>
-<wire x1="47.605" y1="19.05" x2="42.63" y2="17.31" width="0" layer="19" extent="1-1"/>
-<wire x1="52.07" y1="19.9" x2="47.605" y2="19.05" width="0" layer="19" extent="1-1"/>
-<wire x1="62.75" y1="26.67" x2="52.07" y2="19.9" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="IC1" pad="7"/>
@@ -1478,12 +1501,12 @@ Please make sure your boards conform to 
 <contactref element="TEMP" pad="4"/>
 <wire x1="49.745" y1="16.51" x2="49.745" y2="17.65" width="0.4064" layer="1"/>
 <wire x1="49.745" y1="17.65" x2="50.195" y2="18.1" width="0.4064" layer="1"/>
-<wire x1="42.63" y1="18.11" x2="45.39" y2="18.11" width="0.4064" layer="1"/>
-<wire x1="45.39" y1="18.11" x2="45.72" y2="17.78" width="0.4064" layer="1"/>
-<wire x1="45.72" y1="17.78" x2="45.72" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="45.72" y1="16.51" x2="46.99" y2="15.24" width="0.4064" layer="1"/>
-<wire x1="46.99" y1="15.24" x2="49.53" y2="15.24" width="0.4064" layer="1"/>
-<wire x1="49.53" y1="15.24" x2="49.53" y2="16.295" width="0.4064" layer="1"/>
+<wire x1="42.63" y1="18.11" x2="44.755" y2="18.11" width="0.4064" layer="1"/>
+<wire x1="44.755" y1="18.11" x2="45.085" y2="17.78" width="0.4064" layer="1"/>
+<wire x1="45.085" y1="17.78" x2="45.085" y2="14.605" width="0.4064" layer="1"/>
+<wire x1="45.085" y1="14.605" x2="45.72" y2="13.97" width="0.4064" layer="1"/>
+<wire x1="45.72" y1="13.97" x2="49.53" y2="13.97" width="0.4064" layer="1"/>
+<wire x1="49.53" y1="13.97" x2="49.53" y2="16.295" width="0.4064" layer="1"/>
 <wire x1="49.53" y1="16.295" x2="49.745" y2="16.51" width="0.4064" layer="1"/>
 </signal>
 <signal name="SCK">
@@ -1493,14 +1516,18 @@ Please make sure your boards conform to 
 <wire x1="34.43" y1="9.03" x2="34.29" y2="8.89" width="0.4064" layer="1"/>
 <wire x1="34.29" y1="8.89" x2="33.02" y2="8.89" width="0.4064" layer="1"/>
 <wire x1="33.02" y1="8.89" x2="32.0675" y2="7.9375" width="0.4064" layer="1"/>
-<contactref element="R7" pad="2"/>
 <wire x1="32.0675" y1="7.9375" x2="32.0675" y2="6.985" width="0.4064" layer="1"/>
 <via x="32.0675" y="6.985" extent="1-16" drill="0.254"/>
 <wire x1="32.0675" y1="6.985" x2="32.0675" y2="6.0325" width="0.4064" layer="16"/>
 <wire x1="32.0675" y1="6.0325" x2="33.02" y2="5.08" width="0.4064" layer="16"/>
 <wire x1="33.02" y1="5.08" x2="33.02" y2="2.8575" width="0.254" layer="16"/>
 <wire x1="33.02" y1="2.8575" x2="31.75" y2="1.5875" width="0.254" layer="16"/>
-<wire x1="34.43" y1="10.71" x2="78.115" y2="19.45" width="0" layer="19" extent="1-1"/>
+<contactref element="R12" pad="3"/>
+<via x="26.67" y="10.4775" extent="1-16" drill="0.254"/>
+<wire x1="25.7075" y1="10.56" x2="26.67" y2="10.56" width="0.4064" layer="1"/>
+<wire x1="26.67" y1="10.56" x2="26.67" y2="10.4775" width="0.4064" layer="1"/>
+<wire x1="26.67" y1="10.4775" x2="28.575" y2="10.4775" width="0.4064" layer="16"/>
+<wire x1="28.575" y1="10.4775" x2="32.0675" y2="6.985" width="0.4064" layer="16"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="2"/>
@@ -1510,22 +1537,27 @@ Please make sure your boards conform to 
 <wire x1="33.63" y1="10.71" x2="33.63" y2="9.8175" width="0.4064" layer="1"/>
 <wire x1="33.63" y1="9.8175" x2="33.3375" y2="9.525" width="0.4064" layer="1"/>
 <wire x1="33.3375" y1="9.525" x2="32.7025" y2="9.525" width="0.4064" layer="1"/>
-<contactref element="R7" pad="3"/>
 <via x="31.115" y="6.0325" extent="1-16" drill="0.254"/>
 <wire x1="31.115" y1="6.0325" x2="30.48" y2="5.3975" width="0.3048" layer="16"/>
 <wire x1="30.48" y1="5.3975" x2="30.48" y2="2.8575" width="0.254" layer="16"/>
 <wire x1="30.48" y1="2.8575" x2="29.21" y2="1.5875" width="0.254" layer="16"/>
-<wire x1="33.63" y1="10.71" x2="78.115" y2="18.65" width="0" layer="19" extent="1-1"/>
+<contactref element="R12" pad="2"/>
+<via x="27.6225" y="9.8425" extent="1-16" drill="0.254"/>
+<wire x1="25.7075" y1="9.76" x2="27.6225" y2="9.76" width="0.4064" layer="1"/>
+<wire x1="27.6225" y1="9.76" x2="27.6225" y2="9.8425" width="0.4064" layer="1"/>
+<wire x1="27.6225" y1="9.8425" x2="31.115" y2="6.35" width="0.4064" layer="16"/>
+<wire x1="31.115" y1="6.35" x2="31.115" y2="6.0325" width="0.4064" layer="16"/>
 </signal>
 <signal name="MOSI">
 <contactref element="IC1" pad="1"/>
 <contactref element="ICSP" pad="4"/>
 <wire x1="32.83" y1="10.71" x2="31.665" y2="10.71" width="0.4064" layer="1"/>
 <wire x1="31.665" y1="10.71" x2="30.1625" y2="9.2075" width="0.4064" layer="1"/>
-<wire x1="30.1625" y1="9.2075" x2="30.1625" y2="5.715" width="0.4064" layer="1"/>
-<contactref element="R7" pad="1"/>
+<wire x1="30.1625" y1="8.96" x2="30.1625" y2="5.715" width="0.4064" layer="1"/>
 <wire x1="30.1625" y1="5.715" x2="31.75" y2="4.1275" width="0.4064" layer="1"/>
-<wire x1="32.83" y1="10.71" x2="78.115" y2="20.25" width="0" layer="19" extent="1-1"/>
+<contactref element="R12" pad="1"/>
+<wire x1="25.7075" y1="8.96" x2="30.1625" y2="8.96" width="0.4064" layer="1"/>
+<wire x1="30.1625" y1="8.96" x2="30.1625" y2="9.2075" width="0.4064" layer="1"/>
 </signal>
 <signal name="RESET">
 <contactref element="IC1" pad="4"/>
@@ -1537,7 +1569,7 @@ Please make sure your boards conform to 
 <wire x1="33.655" y1="8.255" x2="33.02" y2="7.62" width="0.4064" layer="1"/>
 <wire x1="33.02" y1="7.62" x2="33.02" y2="2.8575" width="0.254" layer="1"/>
 <wire x1="33.02" y1="2.8575" x2="34.29" y2="1.5875" width="0.254" layer="1"/>
-<wire x1="33.02" y1="7.62" x2="28.575" y2="8.1525" width="0" layer="19" extent="1-1"/>
+<wire x1="26.9875" y1="7.2" x2="33.02" y2="7.62" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="TCK">
 <contactref element="IC1" pad="21"/>
@@ -1584,9 +1616,9 @@ Please make sure your boards conform to 
 <wire x1="39.23" y1="10.71" x2="39.23" y2="11.57" width="0.4064" layer="1"/>
 <wire x1="39.23" y1="11.57" x2="36.5125" y2="14.2875" width="0.4064" layer="1"/>
 <via x="36.5125" y="14.2875" extent="1-16" drill="0.2286"/>
-<wire x1="36.5125" y1="14.2875" x2="19.685" y2="14.2875" width="0.4064" layer="16"/>
+<wire x1="10.575" y1="23.3975" x2="19.685" y2="14.2875" width="0.4064" layer="16"/>
+<wire x1="19.685" y1="14.2875" x2="36.5125" y2="14.2875" width="0.4064" layer="16"/>
 <wire x1="10.575" y1="23.7875" x2="10.575" y2="23.3975" width="0.4064" layer="16"/>
-<wire x1="10.575" y1="23.3975" x2="19.685" y2="14.2875" width="0.4064" layer="16"/>
 </signal>
 <signal name="TXD0">
 <contactref element="IC1" pad="10"/>
@@ -1700,9 +1732,9 @@ Please make sure your boards conform to 
 <wire x1="31.4325" y1="38.4175" x2="31.4325" y2="35.2425" width="0.6096" layer="1"/>
 <wire x1="31.4325" y1="35.2425" x2="31.4325" y2="34.29" width="0.6096" layer="1"/>
 <wire x1="30.48" y1="35.2425" x2="29.5875" y2="35.2425" width="0.4064" layer="1"/>
-<wire x1="27.94" y1="18.3125" x2="28.6775" y2="18.3125" width="0.4064" layer="1"/>
-<wire x1="28.6775" y1="18.3125" x2="29.68" y2="17.31" width="0.4064" layer="1"/>
-<wire x1="31.03" y1="17.31" x2="29.68" y2="17.31" width="0.4064" layer="1"/>
+<wire x1="27.94" y1="18.3125" x2="29.3125" y2="18.3125" width="0.4064" layer="1"/>
+<wire x1="29.3125" y1="18.3125" x2="30.315" y2="17.31" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="17.31" x2="30.315" y2="17.31" width="0.4064" layer="1"/>
 <wire x1="41.49" y1="25.4" x2="41.49" y2="25.2975" width="0.4064" layer="1"/>
 <wire x1="41.49" y1="25.2975" x2="40.3225" y2="24.13" width="0.4064" layer="1"/>
 <wire x1="27.8375" y1="39.6875" x2="30.1625" y2="39.6875" width="0.6096" layer="1"/>
@@ -1729,30 +1761,51 @@ Please make sure your boards conform to 
 <wire x1="29.5875" y1="33.9725" x2="31.115" y2="33.9725" width="0.6096" layer="1"/>
 <wire x1="31.115" y1="33.9725" x2="31.4325" y2="34.29" width="0.6096" layer="1"/>
 <wire x1="29.5875" y1="35.2425" x2="31.4325" y2="35.2425" width="0.6096" layer="1"/>
-<wire x1="82.55" y1="23.71" x2="85.09" y2="23.71" width="0" layer="19" extent="1-1"/>
-<wire x1="80.01" y1="23.71" x2="82.55" y2="23.71" width="0" layer="19" extent="1-1"/>
-<wire x1="77.47" y1="23.71" x2="80.01" y2="23.71" width="0" layer="19" extent="1-1"/>
-<wire x1="52.07" y1="18.2" x2="77.47" y2="23.71" width="0" layer="19" extent="1-1"/>
-<wire x1="48.895" y1="17.78" x2="52.07" y2="18.2" width="0" layer="19" extent="1-1"/>
-<wire x1="47.605" y1="20" x2="48.045" y2="20.44" width="0" layer="19" extent="1-1"/>
-<wire x1="42.63" y1="16.51" x2="48.045" y2="16.51" width="0" layer="19" extent="1-1"/>
-<wire x1="41.49" y1="25.2975" x2="48.045" y2="21.59" width="0" layer="19" extent="1-1"/>
+<polygon width="0.4064" layer="1">
+<vertex x="34.6075" y="18.415"/>
+<vertex x="39.0525" y="18.415"/>
+<vertex x="39.0525" y="15.875"/>
+<vertex x="34.6075" y="15.875"/>
+</polygon>
+<via x="35.56" y="17.78" extent="1-16" drill="0.254"/>
+<via x="35.56" y="16.51" extent="1-16" drill="0.254"/>
+<via x="38.1" y="17.78" extent="1-16" drill="0.254"/>
+<via x="38.1" y="16.51" extent="1-16" drill="0.254"/>
+<wire x1="31.03" y1="17.31" x2="35.09" y2="17.31" width="0.4064" layer="1"/>
+<wire x1="35.09" y1="17.31" x2="35.56" y2="17.78" width="0.4064" layer="1"/>
+<wire x1="36.03" y1="10.71" x2="36.03" y2="13.5" width="0.4064" layer="1"/>
+<wire x1="36.03" y1="13.5" x2="35.56" y2="13.97" width="0.4064" layer="1"/>
+<wire x1="35.56" y1="13.97" x2="35.56" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="38.1" y1="16.51" x2="42.63" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="37.63" y1="22.31" x2="37.63" y2="18.25" width="0.4064" layer="1"/>
+<wire x1="37.63" y1="18.25" x2="38.1" y2="17.78" width="0.4064" layer="1"/>
+<wire x1="46.355" y1="15.3425" x2="46.8775" y2="15.3425" width="0.4064" layer="1"/>
+<wire x1="46.8775" y1="15.3425" x2="48.045" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="30.48" y1="24.55" x2="33.02" y2="24.55" width="0.4064" layer="16"/>
+<wire x1="26.3525" y1="18.3125" x2="27.94" y2="18.3125" width="0.4064" layer="1"/>
+<wire x1="4.445" y1="22.9625" x2="2.2225" y2="22.9625" width="0.4064" layer="16"/>
+<wire x1="4.445" y1="22.9625" x2="4.445" y2="17.145" width="0.4064" layer="16"/>
+<wire x1="4.445" y1="17.145" x2="3.81" y2="16.51" width="0.4064" layer="16"/>
+<wire x1="3.81" y1="16.51" x2="3.81" y2="13.0175" width="0.4064" layer="16"/>
+<wire x1="3.81" y1="13.0175" x2="4.1275" y2="12.7" width="0.4064" layer="16"/>
+<wire x1="4.1275" y1="12.7" x2="5.1375" y2="12.7" width="0.4064" layer="16"/>
+<wire x1="5.1375" y1="12.7" x2="5.1525" y2="12.685" width="0.4064" layer="16"/>
+<wire x1="48.045" y1="20.44" x2="47.605" y2="20" width="0" layer="19" extent="1-1"/>
+<wire x1="42.63" y1="16.51" x2="46.355" y2="15.3425" width="0" layer="19" extent="1-1"/>
 <wire x1="33.02" y1="24.55" x2="37.63" y2="23.66" width="0" layer="19" extent="1-16"/>
-<wire x1="30.48" y1="24.55" x2="33.02" y2="24.55" width="0" layer="19" extent="16-16"/>
-<wire x1="28.6775" y1="18.3125" x2="30.48" y2="24.55" width="0" layer="19" extent="1-16"/>
-<wire x1="36.03" y1="10.71" x2="31.03" y2="17.31" width="0" layer="19" extent="1-1"/>
 <wire x1="29.21" y1="4.1275" x2="34.075" y2="6.35" width="0" layer="19" extent="1-1"/>
-<wire x1="28.575" y1="6.4525" x2="29.21" y2="4.1275" width="0" layer="19" extent="1-1"/>
+<wire x1="26.9875" y1="5.5" x2="29.21" y2="4.1275" width="0" layer="19" extent="1-1"/>
+<wire x1="25.0825" y1="5.5" x2="26.9875" y2="5.5" width="0" layer="19" extent="1-1"/>
 <wire x1="31.115" y1="33.9725" x2="30.48" y2="24.55" width="0" layer="19" extent="1-16"/>
-<wire x1="16.39" y1="10.16" x2="28.575" y2="6.4525" width="0" layer="19" extent="1-1"/>
+<wire x1="16.39" y1="10.16" x2="25.0825" y2="5.5" width="0" layer="19" extent="1-1"/>
 <wire x1="5.1525" y1="12.685" x2="9.845" y2="8.225" width="0" layer="19" extent="1-16"/>
-<wire x1="8.575" y1="26.7875" x2="5.1525" y2="12.685" width="0" layer="19" extent="16-16"/>
+<wire x1="8.575" y1="26.7875" x2="4.445" y2="22.9625" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="HX1_EN_5V">
 <contactref element="M2" pad="EN"/>
 <contactref element="IC2" pad="4"/>
-<wire x1="34.29" y1="50.8" x2="34.29" y2="49.24" width="0.4064" layer="1"/>
-<wire x1="34.29" y1="49.24" x2="35.24" y2="47.02" width="0.4064" layer="1"/>
+<wire x1="34.29" y1="50.8" x2="34.29" y2="47.97" width="0.4064" layer="1"/>
+<wire x1="34.29" y1="47.97" x2="35.24" y2="47.02" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="IC1" pad="29"/>
@@ -1825,30 +1878,33 @@ Please make sure your boards conform to 
 <signal name="STATLED">
 <contactref element="IC1" pad="43"/>
 <contactref element="R19" pad="1"/>
-<wire x1="31.03" y1="13.31" x2="28.55" y2="13.31" width="0.4064" layer="1"/>
-<wire x1="28.55" y1="13.31" x2="21.9075" y2="3.81" width="0.4064" layer="1"/>
-<wire x1="21.9075" y1="3.81" x2="20.955" y2="3.81" width="0.4064" layer="1"/>
-<wire x1="20.955" y1="3.81" x2="20.0025" y2="2.8575" width="0.4064" layer="1"/>
-<wire x1="20.0025" y1="2.8575" x2="20.0025" y2="2.6425" width="0.4064" layer="1"/>
-<wire x1="20.0025" y1="2.6425" x2="19.9" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="13.31" x2="22.559" y2="13.31" width="0.4064" layer="1"/>
+<wire x1="22.559" y1="13.31" x2="21.8825" y2="12.6335" width="0.4064" layer="1"/>
+<wire x1="21.8825" y1="12.6335" x2="21.8825" y2="5.3725" width="0.4064" layer="1"/>
+<wire x1="16.1925" y1="2.6425" x2="16.09" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="21.8825" y1="5.3725" x2="20.955" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="20.955" y1="4.445" x2="17.6775" y2="4.445" width="0.4064" layer="1"/>
+<wire x1="17.6775" y1="4.445" x2="16.09" y2="2.54" width="0.4064" layer="1"/>
 </signal>
 <signal name="ERRLED">
 <contactref element="IC1" pad="42"/>
 <contactref element="R20" pad="1"/>
-<wire x1="31.03" y1="14.11" x2="28.08" y2="14.11" width="0.4064" layer="1"/>
-<wire x1="28.08" y1="14.11" x2="21.2725" y2="4.7625" width="0.4064" layer="1"/>
-<wire x1="21.2725" y1="4.7625" x2="17.4625" y2="4.7625" width="0.4064" layer="1"/>
-<wire x1="17.4625" y1="4.7625" x2="16.1925" y2="3.4925" width="0.4064" layer="1"/>
-<wire x1="16.1925" y1="3.4925" x2="16.1925" y2="2.6425" width="0.4064" layer="1"/>
-<wire x1="16.1925" y1="2.6425" x2="16.09" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="14.11" x2="22.014590625" y2="14.11" width="0.4064" layer="1"/>
+<wire x1="22.014590625" y1="14.11" x2="21.095" y2="13.190409375" width="0.4064" layer="1"/>
+<wire x1="21.095" y1="13.190409375" x2="21.095" y2="5.86264375" width="0.4064" layer="1"/>
+<wire x1="21.095" y1="5.86264375" x2="20.31235625" y2="5.08" width="0.4064" layer="1"/>
+<wire x1="20.31235625" y1="5.08" x2="14.82" y2="5.08" width="0.4064" layer="1"/>
+<wire x1="12.3825" y1="2.6425" x2="12.28" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="14.82" y1="5.08" x2="12.28" y2="2.54" width="0.4064" layer="1"/>
 </signal>
 <signal name="POWLED">
 <contactref element="IC1" pad="44"/>
 <contactref element="R21" pad="1"/>
-<wire x1="31.03" y1="12.51" x2="29.02" y2="12.51" width="0.4064" layer="1"/>
-<wire x1="29.02" y1="12.51" x2="23.8125" y2="4.7625" width="0.4064" layer="1"/>
-<wire x1="23.8125" y1="4.7625" x2="23.8125" y2="2.6425" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="12.51" x2="23.344965625" y2="12.51" width="0.4064" layer="1"/>
+<wire x1="23.344965625" y1="12.51" x2="22.67" y2="11.835034375" width="0.4064" layer="1"/>
+<wire x1="22.67" y1="11.835034375" x2="22.67" y2="3.58" width="0.4064" layer="1"/>
 <wire x1="23.8125" y1="2.6425" x2="23.71" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="22.67" y1="3.58" x2="23.71" y2="2.54" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$13">
 <contactref element="Q5" pad="C"/>
@@ -1872,11 +1928,19 @@ Please make sure your boards conform to 
 <wire x1="35.2425" y1="22.3225" x2="35.23" y2="22.31" width="0.4064" layer="1"/>
 </signal>
 <signal name="SD_CS">
-<contactref element="IC1" pad="41"/>
 <contactref element="ASDF" pad="2"/>
 <contactref element="R5" pad="1"/>
-<wire x1="31.03" y1="14.91" x2="77.47" y2="22.01" width="0" layer="19" extent="1-1"/>
-<wire x1="5.9525" y1="14.885" x2="31.03" y2="14.91" width="0" layer="19" extent="1-16"/>
+<contactref element="IC1" pad="40"/>
+<wire x1="31.03" y1="15.71" x2="26.67" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="26.3525" y1="15.71" x2="16.04" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="16.04" y1="15.71" x2="15.24" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="15.24" y1="16.51" x2="9.2075" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="9.2075" y1="16.51" x2="7.62" y2="14.9225" width="0.4064" layer="1"/>
+<via x="7.62" y="14.9225" extent="1-16" drill="0.254"/>
+<wire x1="7.62" y1="14.9225" x2="5.99" y2="14.9225" width="0.4064" layer="16"/>
+<wire x1="5.99" y1="14.9225" x2="5.9525" y2="14.885" width="0.4064" layer="16"/>
+<wire x1="26.3525" y1="16.6125" x2="26.3525" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="26.3525" y1="15.71" x2="26.67" y2="15.71" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$24">
 <contactref element="R18" pad="2"/>
@@ -1887,14 +1951,14 @@ Please make sure your boards conform to 
 <signal name="N$26">
 <contactref element="R19" pad="2"/>
 <contactref element="STAT" pad="A"/>
-<wire x1="18.2" y1="2.54" x2="18.53" y2="2.54" width="0.4064" layer="1"/>
-<wire x1="18.53" y1="2.54" x2="19.8" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="14.39" y1="2.54" x2="14.72" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="14.72" y1="2.54" x2="15.99" y2="1.27" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$27">
 <contactref element="R20" pad="2"/>
 <contactref element="ERROR" pad="A"/>
-<wire x1="14.39" y1="2.54" x2="14.72" y2="2.54" width="0.4064" layer="1"/>
-<wire x1="14.72" y1="2.54" x2="15.99" y2="1.27" width="0.4064" layer="1"/>
+<wire x1="10.58" y1="2.54" x2="10.91" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="10.91" y1="2.54" x2="12.18" y2="1.27" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$28">
 <contactref element="R21" pad="2"/>
@@ -1923,7 +1987,6 @@ Please make sure your boards conform to 
 <wire x1="41.85" y1="33.655" x2="40.005" y2="33.655" width="0.4064" layer="1"/>
 <wire x1="40.005" y1="33.655" x2="39.37" y2="33.02" width="0.4064" layer="1"/>
 <contactref element="R29" pad="2"/>
-<wire x1="85.09" y1="36.41" x2="87.63" y2="36.41" width="0.4064" layer="1"/>
 <contactref element="Q7" pad="2"/>
 <via x="23.8125" y="41.91" extent="1-16" drill="0.254"/>
 <via x="25.0825" y="41.91" extent="1-16" drill="0.254"/>
@@ -1954,8 +2017,10 @@ Please make sure your boards conform to 
 <vertex x="44.45" y="31.75"/>
 <vertex x="43.18" y="31.75"/>
 </polygon>
-<wire x1="88.58" y1="34.56" x2="87.63" y2="36.41" width="0" layer="19" extent="1-1"/>
-<wire x1="43.55" y1="30.48" x2="85.09" y2="36.41" width="0" layer="19" extent="1-1"/>
+<wire x1="17.1475" y1="40.37" x2="15.7075" y2="40.37" width="0.8128" layer="1"/>
+<wire x1="15.7075" y1="40.37" x2="15.5575" y2="40.22" width="0.8128" layer="1"/>
+<wire x1="23.8125" y1="41.91" x2="18.6875" y2="41.91" width="0.8128" layer="1"/>
+<wire x1="18.6875" y1="41.91" x2="17.1475" y2="40.37" width="0.8128" layer="1"/>
 </signal>
 <signal name="N$4">
 <contactref element="5V_SWITCHING" pad="3"/>
@@ -2047,11 +2112,11 @@ Please make sure your boards conform to 
 <signal name="N$32">
 <contactref element="U$7" pad="V+"/>
 <contactref element="R3" pad="2"/>
-<wire x1="2.55" y1="8.14" x2="2.55" y2="6.975" width="0.4064" layer="1"/>
+<wire x1="2.55" y1="8.14" x2="2.55" y2="7.2925" width="0.4064" layer="1"/>
 <wire x1="18.415" y1="8.04" x2="18.415" y2="7.62" width="0.4064" layer="1"/>
-<wire x1="18.415" y1="7.62" x2="16.1925" y2="5.3975" width="0.4064" layer="1"/>
-<wire x1="16.1925" y1="5.3975" x2="4.1275" y2="5.3975" width="0.4064" layer="1"/>
-<wire x1="4.1275" y1="5.3975" x2="2.55" y2="6.975" width="0.4064" layer="1"/>
+<wire x1="18.415" y1="7.62" x2="16.51" y2="5.715" width="0.4064" layer="1"/>
+<wire x1="16.51" y1="5.715" x2="4.445" y2="5.715" width="0.4064" layer="1"/>
+<wire x1="4.445" y1="5.715" x2="2.55" y2="7.2925" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="R13" pad="2"/>
@@ -2097,42 +2162,55 @@ Please make sure your boards conform to 
 <wire x1="36.83" y1="41.91" x2="36.83" y2="37.465" width="0.4064" layer="16"/>
 <wire x1="36.83" y1="37.465" x2="34.6075" y2="35.2425" width="0.4064" layer="16"/>
 <via x="34.6075" y="35.2425" extent="1-16" drill="0.254"/>
-<wire x1="34.6075" y1="35.2425" x2="34.6075" y2="33.02" width="0.4064" layer="1"/>
-<wire x1="42.63" y1="15.71" x2="34.6075" y2="33.02" width="0" layer="19" extent="1-1"/>
+<wire x1="34.6075" y1="35.2425" x2="34.6075" y2="31.75" width="0.4064" layer="1"/>
+<via x="40.9575" y="15.5575" extent="1-16" drill="0.254"/>
+<wire x1="42.63" y1="15.71" x2="41.11" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="41.11" y1="15.71" x2="40.9575" y2="15.5575" width="0.4064" layer="1"/>
+<wire x1="40.9575" y1="15.5575" x2="39.6875" y2="16.8275" width="0.4064" layer="16"/>
+<wire x1="34.6075" y1="31.75" x2="35.2425" y2="31.115" width="0.4064" layer="1"/>
+<via x="35.2425" y="31.115" extent="1-16" drill="0.254"/>
+<wire x1="35.2425" y1="31.115" x2="39.6875" y2="26.67" width="0.4064" layer="16"/>
+<wire x1="39.6875" y1="26.67" x2="39.6875" y2="16.8275" width="0.4064" layer="16"/>
 </signal>
 <signal name="HEAT">
 <contactref element="IC1" pad="31"/>
 <contactref element="10K" pad="2"/>
-<wire x1="80.01" y1="34.71" x2="78.32" y2="34.71" width="0.4064" layer="1"/>
-<wire x1="78.32" y1="34.71" x2="77.47" y2="35.56" width="0.4064" layer="1"/>
-<wire x1="34.43" y1="22.31" x2="77.47" y2="35.56" width="0" layer="19" extent="1-1"/>
+<wire x1="10.4775" y1="38.52" x2="34.43" y2="22.31" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$36">
 <contactref element="Q9" pad="C"/>
 <contactref element="R29" pad="1"/>
 <contactref element="Q7" pad="1"/>
-<wire x1="86.68" y1="34.56" x2="85.09" y2="34.56" width="0.4064" layer="1"/>
-<wire x1="85.09" y1="34.56" x2="85.09" y2="34.71" width="0.4064" layer="1"/>
-<wire x1="85.09" y1="34.71" x2="82.55" y2="34.71" width="0.4064" layer="1"/>
-<wire x1="82.55" y1="34.71" x2="82.55" y2="34.46" width="0.4064" layer="1"/>
+<wire x1="15.5575" y1="38.37" x2="15.5575" y2="38.52" width="0.4064" layer="1"/>
+<wire x1="15.5575" y1="38.52" x2="13.0175" y2="38.52" width="0.4064" layer="1"/>
+<wire x1="13.0175" y1="38.52" x2="13.0175" y2="38.27" width="0.4064" layer="1"/>
+<wire x1="19.0475" y1="40.37" x2="19.0475" y2="40.32" width="0.4064" layer="1"/>
+<wire x1="19.0475" y1="40.32" x2="18.0975" y2="39.37" width="0.4064" layer="1"/>
+<wire x1="18.0975" y1="39.37" x2="16.4075" y2="39.37" width="0.4064" layer="1"/>
+<wire x1="16.4075" y1="39.37" x2="15.5575" y2="38.52" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$38">
 <contactref element="Q9" pad="B"/>
 <contactref element="10K" pad="1"/>
-<wire x1="83.5" y1="36.66" x2="82.06" y2="38.1" width="0.4064" layer="1"/>
-<wire x1="82.06" y1="38.1" x2="80.9625" y2="38.1" width="0.4064" layer="1"/>
-<wire x1="80.9625" y1="38.1" x2="80.01" y2="37.1475" width="0.4064" layer="1"/>
-<wire x1="80.01" y1="37.1475" x2="80.01" y2="36.41" width="0.4064" layer="1"/>
+<wire x1="13.9675" y1="40.47" x2="12.5275" y2="41.91" width="0.4064" layer="1"/>
+<wire x1="12.5275" y1="41.91" x2="11.43" y2="41.91" width="0.4064" layer="1"/>
+<wire x1="11.43" y1="41.91" x2="10.4775" y2="40.9575" width="0.4064" layer="1"/>
+<wire x1="10.4775" y1="40.9575" x2="10.4775" y2="40.22" width="0.4064" layer="1"/>
 </signal>
 <signal name="ASSOCLED">
 <contactref element="U$2" pad="15"/>
 <contactref element="R4" pad="1"/>
-<wire x1="18.575" y1="1.7875" x2="62.65" y2="25.4" width="0" layer="19" extent="1-16"/>
+<via x="20.955" y="3.175" extent="1-16" drill="0.254"/>
+<wire x1="20.955" y1="3.175" x2="20.535" y2="3.175" width="0.4064" layer="1"/>
+<wire x1="20.535" y1="3.175" x2="19.9" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="18.575" y1="1.7875" x2="19.5675" y2="1.7875" width="0.4064" layer="16"/>
+<wire x1="19.5675" y1="1.7875" x2="20.955" y2="3.175" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$5">
 <contactref element="R4" pad="2"/>
 <contactref element="AUX4" pad="A"/>
-<wire x1="64.25" y1="26.67" x2="64.35" y2="25.4" width="0" layer="19" extent="1-1"/>
+<wire x1="18.2" y1="2.54" x2="18.53" y2="2.54" width="0.4064" layer="1"/>
+<wire x1="18.53" y1="2.54" x2="19.8" y2="1.27" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$6">
 <contactref element="U3" pad="23"/>
@@ -2149,31 +2227,68 @@ Please make sure your boards conform to 
 <wire x1="17.145" y1="11.1125" x2="17.4625" y2="10.795" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$8">
-<contactref element="R7" pad="8"/>
 <contactref element="ASDF" pad="3"/>
 <contactref element="R6" pad="1"/>
-<wire x1="79.365" y1="20.25" x2="80.01" y2="22.01" width="0" layer="19" extent="1-1"/>
-<wire x1="5.5525" y1="13.785" x2="79.365" y2="20.25" width="0" layer="19" extent="1-16"/>
+<contactref element="R12" pad="8"/>
+<via x="23.495" y="8.5725" extent="1-16" drill="0.254"/>
+<wire x1="25.0825" y1="7.2" x2="25.0825" y2="8.335" width="0.4064" layer="1"/>
+<wire x1="25.0825" y1="8.335" x2="24.4575" y2="8.96" width="0.4064" layer="1"/>
+<wire x1="24.4575" y1="8.96" x2="23.8825" y2="8.96" width="0.4064" layer="1"/>
+<wire x1="23.8825" y1="8.96" x2="23.495" y2="8.5725" width="0.4064" layer="1"/>
+<wire x1="5.5525" y1="13.785" x2="23.495" y2="8.5725" width="0" layer="19" extent="16-16"/>
 </signal>
 <signal name="N$9">
-<contactref element="R7" pad="6"/>
 <contactref element="ASDF" pad="7"/>
-<wire x1="5.5525" y1="9.385" x2="79.365" y2="18.65" width="0" layer="19" extent="1-16"/>
+<contactref element="R12" pad="7"/>
+<via x="23.495" y="9.525" extent="1-16" drill="0.254"/>
+<wire x1="24.4575" y1="9.76" x2="23.73" y2="9.76" width="0.4064" layer="1"/>
+<wire x1="23.73" y1="9.76" x2="23.495" y2="9.525" width="0.4064" layer="1"/>
+<wire x1="23.495" y1="9.525" x2="21.2725" y2="9.525" width="0.4064" layer="16"/>
+<wire x1="21.2725" y1="9.525" x2="19.3675" y2="7.62" width="0.4064" layer="16"/>
+<wire x1="19.3675" y1="7.62" x2="14.2875" y2="7.62" width="0.4064" layer="16"/>
+<wire x1="14.2875" y1="7.62" x2="13.6525" y2="8.255" width="0.4064" layer="16"/>
+<wire x1="13.6525" y1="8.255" x2="11.43" y2="8.255" width="0.4064" layer="16"/>
+<wire x1="11.43" y1="8.255" x2="10.16" y2="9.525" width="0.4064" layer="16"/>
+<wire x1="10.16" y1="9.525" x2="5.6925" y2="9.525" width="0.4064" layer="16"/>
+<wire x1="5.6925" y1="9.525" x2="5.5525" y2="9.385" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$7">
-<contactref element="R7" pad="7"/>
 <contactref element="ASDF" pad="5"/>
-<wire x1="5.5525" y1="11.585" x2="79.365" y2="19.45" width="0" layer="19" extent="1-16"/>
+<contactref element="R12" pad="6"/>
+<via x="23.495" y="10.4775" extent="1-16" drill="0.254"/>
+<wire x1="24.4575" y1="10.56" x2="23.5775" y2="10.56" width="0.4064" layer="1"/>
+<wire x1="23.5775" y1="10.56" x2="23.495" y2="10.4775" width="0.4064" layer="1"/>
+<wire x1="23.495" y1="10.4775" x2="22.5425" y2="10.4775" width="0.4064" layer="16"/>
+<wire x1="22.5425" y1="10.4775" x2="21.59" y2="11.43" width="0.4064" layer="16"/>
+<wire x1="21.59" y1="11.43" x2="19.685" y2="11.43" width="0.4064" layer="16"/>
+<wire x1="19.685" y1="11.43" x2="18.7325" y2="10.4775" width="0.4064" layer="16"/>
+<wire x1="18.7325" y1="10.4775" x2="14.9225" y2="10.4775" width="0.4064" layer="16"/>
+<wire x1="14.9225" y1="10.4775" x2="13.6525" y2="9.2075" width="0.4064" layer="16"/>
+<wire x1="13.6525" y1="9.2075" x2="12.3825" y2="9.2075" width="0.4064" layer="16"/>
+<wire x1="12.3825" y1="9.2075" x2="10.16" y2="11.43" width="0.4064" layer="16"/>
+<wire x1="10.16" y1="11.43" x2="5.7075" y2="11.43" width="0.4064" layer="16"/>
+<wire x1="5.7075" y1="11.43" x2="5.5525" y2="11.585" width="0.4064" layer="16"/>
 </signal>
 <signal name="SD_DETECT">
 <contactref element="ASDF" pad="CD1"/>
-<contactref element="IC1" pad="40"/>
-<wire x1="15.7525" y1="8.985" x2="31.03" y2="15.71" width="0" layer="19" extent="1-16"/>
+<wire x1="15.7525" y1="8.985" x2="18.51" y2="8.985" width="0.4064" layer="16"/>
+<wire x1="18.51" y1="8.985" x2="20.0025" y2="10.4775" width="0.4064" layer="16"/>
+<via x="20.0025" y="10.4775" extent="1-16" drill="0.254"/>
+<wire x1="20.0025" y1="10.4775" x2="20.32" y2="10.795" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="14.91" x2="21.658228125" y2="14.91" width="0.4064" layer="1"/>
+<wire x1="21.658228125" y1="14.91" x2="20.32" y2="13.571771875" width="0.4064" layer="1"/>
+<wire x1="20.32" y1="13.571771875" x2="20.32" y2="10.795" width="0.4064" layer="1"/>
+<contactref element="IC1" pad="37"/>
+<contactref element="IC1" pad="41"/>
+<wire x1="31.03" y1="14.91" x2="31.03" y2="18.11" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$11">
 <contactref element="Q7" pad="3"/>
 <contactref element="R27" pad="1"/>
-<wire x1="86.62" y1="31.75" x2="87.63" y2="36.66" width="0" layer="19" extent="1-1"/>
+<wire x1="18.0975" y1="38.27" x2="18.0975" y2="37.1475" width="0.8128" layer="1"/>
+<wire x1="18.0975" y1="37.1475" x2="17.145" y2="36.195" width="0.8128" layer="1"/>
+<wire x1="17.145" y1="36.195" x2="17.145" y2="35.6175" width="0.8128" layer="1"/>
+<wire x1="17.145" y1="35.6175" x2="17.0875" y2="35.56" width="0.8128" layer="1"/>
 </signal>
 </signals>
 </board>
diff --git a/master/master.sch b/master/master.sch
--- a/master/master.sch
+++ b/master/master.sch
@@ -5545,9 +5545,9 @@ There are 2 variants that must be carefu
 <part name="P+13" library="SparkFun" deviceset="3.3V" device=""/>
 <part name="C22" library="SparkFun" deviceset="CAP" device="0603-CAP" value="10uF"/>
 <part name="R6" library="SparkFun" deviceset="RESISTOR" device="0603-RES" value="100k"/>
-<part name="R7" library="SparkFun" deviceset="RESISTOR-ARRAY" device="0603-ARV" value="4.7k"/>
 <part name="GND43" library="supply1" deviceset="GND" device=""/>
 <part name="GND42" library="supply1" deviceset="GND" device=""/>
+<part name="R12" library="SparkFun" deviceset="RESISTOR-ARRAY" device="0603-ARV" value="4.7k"/>
 </parts>
 <sheets>
 <sheet>
@@ -5833,12 +5833,12 @@ Maybe use bigger R's</text>
 <attribute name="NAME" x="67.31" y="118.3386" size="1.778" layer="95"/>
 <attribute name="VALUE" x="67.31" y="116.078" size="1.778" layer="96"/>
 </instance>
-<instance part="R7" gate="A" x="60.96" y="101.6"/>
-<instance part="R7" gate="B" x="71.12" y="99.06"/>
-<instance part="R7" gate="C" x="50.8" y="104.14"/>
-<instance part="R7" gate="D" x="63.5" y="81.28"/>
 <instance part="GND43" gate="1" x="88.9" y="71.12"/>
 <instance part="GND42" gate="1" x="88.9" y="109.22"/>
+<instance part="R12" gate="A" x="60.96" y="101.6"/>
+<instance part="R12" gate="B" x="50.8" y="104.14"/>
+<instance part="R12" gate="C" x="71.12" y="99.06"/>
+<instance part="R12" gate="D" x="63.5" y="81.28"/>
 </instances>
 <busses>
 </busses>
@@ -6254,7 +6254,7 @@ Maybe use bigger R's</text>
 <segment>
 <wire x1="66.04" y1="99.06" x2="38.1" y2="99.06" width="0.1524" layer="91"/>
 <label x="38.1" y="99.06" size="1.778" layer="95"/>
-<pinref part="R7" gate="B" pin="1"/>
+<pinref part="R12" gate="C" pin="1"/>
 </segment>
 </net>
 <net name="MISO" class="0">
@@ -6271,7 +6271,7 @@ Maybe use bigger R's</text>
 <segment>
 <wire x1="45.72" y1="104.14" x2="38.1" y2="104.14" width="0.1524" layer="91"/>
 <label x="38.1" y="104.14" size="1.778" layer="95"/>
-<pinref part="R7" gate="C" pin="1"/>
+<pinref part="R12" gate="B" pin="1"/>
 </segment>
 </net>
 <net name="MOSI" class="0">
@@ -6288,7 +6288,7 @@ Maybe use bigger R's</text>
 <segment>
 <wire x1="55.88" y1="101.6" x2="38.1" y2="101.6" width="0.1524" layer="91"/>
 <label x="38.1" y="101.6" size="1.778" layer="95"/>
-<pinref part="R7" gate="A" pin="1"/>
+<pinref part="R12" gate="A" pin="1"/>
 </segment>
 </net>
 <net name="RESET" class="0">
@@ -6710,11 +6710,6 @@ Maybe use bigger R's</text>
 </net>
 <net name="SD_CS" class="0">
 <segment>
-<pinref part="IC1" gate="G$1" pin="(PCINT9/CLKO/T1)PB1"/>
-<wire x1="325.12" y1="114.3" x2="335.28" y2="114.3" width="0.1524" layer="91"/>
-<label x="330.2" y="114.3" size="1.778" layer="95"/>
-</segment>
-<segment>
 <pinref part="ASDF" gate="G$1" pin="CS"/>
 <wire x1="91.44" y1="96.52" x2="81.28" y2="96.52" width="0.1524" layer="91"/>
 <label x="38.1" y="96.52" size="1.778" layer="95"/>
@@ -6723,6 +6718,11 @@ Maybe use bigger R's</text>
 <wire x1="81.28" y1="109.22" x2="81.28" y2="96.52" width="0.1524" layer="91"/>
 <junction x="81.28" y="96.52"/>
 </segment>
+<segment>
+<pinref part="IC1" gate="G$1" pin="(PCINT8/XCK0/T0)PB0"/>
+<wire x1="325.12" y1="111.76" x2="335.28" y2="111.76" width="0.1524" layer="91"/>
+<label x="330.2" y="111.76" size="1.778" layer="95"/>
+</segment>
 </net>
 <net name="N$24" class="0">
 <segment>
@@ -7045,26 +7045,26 @@ Maybe use bigger R's</text>
 <net name="N$8" class="0">
 <segment>
 <wire x1="91.44" y1="101.6" x2="76.2" y2="101.6" width="0.1524" layer="91"/>
-<pinref part="R7" gate="A" pin="2"/>
 <pinref part="ASDF" gate="G$1" pin="DATA_IN"/>
 <pinref part="R6" gate="G$1" pin="1"/>
 <wire x1="76.2" y1="101.6" x2="66.04" y2="101.6" width="0.1524" layer="91"/>
 <wire x1="76.2" y1="106.68" x2="76.2" y2="101.6" width="0.1524" layer="91"/>
 <junction x="76.2" y="101.6"/>
+<pinref part="R12" gate="A" pin="2"/>
 </segment>
 </net>
 <net name="N$9" class="0">
 <segment>
 <wire x1="55.88" y1="104.14" x2="91.44" y2="104.14" width="0.1524" layer="91"/>
-<pinref part="R7" gate="C" pin="2"/>
 <pinref part="ASDF" gate="G$1" pin="DATA_OUT"/>
+<pinref part="R12" gate="B" pin="2"/>
 </segment>
 </net>
 <net name="N$7" class="0">
 <segment>
-<pinref part="R7" gate="B" pin="2"/>
 <pinref part="ASDF" gate="G$1" pin="SCLK"/>
 <wire x1="76.2" y1="99.06" x2="91.44" y2="99.06" width="0.1524" layer="91"/>
+<pinref part="R12" gate="C" pin="2"/>
 </segment>
 </net>
 <net name="SD_DETECT" class="0">
@@ -7074,9 +7074,14 @@ Maybe use bigger R's</text>
 <label x="38.1" y="114.3" size="1.778" layer="95"/>
 </segment>
 <segment>
-<pinref part="IC1" gate="G$1" pin="(PCINT8/XCK0/T0)PB0"/>
-<wire x1="325.12" y1="111.76" x2="335.28" y2="111.76" width="0.1524" layer="91"/>
-<label x="330.2" y="111.76" size="1.778" layer="95"/>
+<pinref part="IC1" gate="G$1" pin="(PCINT0/ADC0)PA0"/>
+<wire x1="325.12" y1="134.62" x2="335.28" y2="134.62" width="0.1524" layer="91"/>
+<label x="330.2" y="134.62" size="1.778" layer="95"/>
+</segment>
+<segment>
+<pinref part="IC1" gate="G$1" pin="(PCINT9/CLKO/T1)PB1"/>
+<wire x1="325.12" y1="114.3" x2="335.28" y2="114.3" width="0.1524" layer="91"/>
+<label x="330.2" y="114.3" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="N$11" class="0">