diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -6,16 +6,16 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.05" unitdist="inch" unit="inch" style="lines" multiple="1" display="no" altdistance="0.0125" altunitdist="inch" altunit="inch"/>
+<grid distance="0.05" unitdist="inch" unit="mil" style="lines" multiple="1" display="no" altdistance="12.5" altunitdist="mil" altunit="mil"/>
 <layers>
 <layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
-<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="no" 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"/>
 <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="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" 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"/>
 <layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
@@ -32,10 +32,10 @@
 <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="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="no" active="yes"/>
-<layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
+<layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" 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="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="yes" active="yes"/>
@@ -123,15 +123,18 @@
 </layers>
 <board>
 <plain>
-<wire x1="0" y1="0" x2="53.34" y2="0" width="0" layer="20"/>
-<wire x1="53.34" y1="0" x2="53.34" y2="53.34" width="0" layer="20"/>
-<wire x1="53.34" y1="53.34" x2="0" y2="53.34" width="0" layer="20"/>
-<wire x1="0" y1="53.34" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="0" y1="50.50019375" x2="0" y2="2.83980625" width="0" layer="20"/>
+<wire x1="0" y1="2.83980625" x2="2.83980625" y2="0" width="0" layer="20" curve="90"/>
+<wire x1="2.83980625" y1="0" x2="50.50019375" y2="0" width="0" layer="20"/>
+<wire x1="50.50019375" y1="0" x2="53.34" y2="2.83980625" width="0" layer="20" curve="90"/>
+<wire x1="53.34" y1="2.83980625" x2="53.34" y2="50.50019375" width="0" layer="20"/>
+<wire x1="53.34" y1="50.50019375" x2="50.50019375" y2="53.34" width="0" layer="20" curve="90"/>
+<wire x1="50.50019375" y1="53.34" x2="2.83980625" y2="53.34" width="0" layer="20"/>
+<wire x1="2.83980625" y1="53.34" x2="0" y2="50.50019375" width="0" layer="20" curve="90"/>
 <hole x="3.175" y="3.175" drill="3.2"/>
 <hole x="3.175" y="50.165" drill="3.2"/>
 <hole x="50.165" y="50.165" drill="3.2"/>
 <hole x="49.53" y="3.175" drill="3.2"/>
-<text x="4.445" y="19.05" size="1.778" layer="21">xbee</text>
 <circle x="46.99" y="31.115" radius="0.127" width="0.4064" layer="21"/>
 <wire x1="53.975" y1="22.86" x2="53.975" y2="15.24" width="0.4064" layer="21"/>
 <wire x1="53.975" y1="15.24" x2="46.355" y2="15.24" width="0.4064" layer="21"/>
@@ -146,7 +149,6 @@
 <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="54.61" y="25.4" size="1.27" layer="21" font="vector" rot="R90">via to gnd plane below</text>
 <text x="10.16" y="59.69" size="1.778" layer="21">TODO: USE NICK"S THING</text>
 </plain>
 <libraries>
@@ -1120,7 +1122,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="26.9875" y="6.35" rot="R90"/>
+<element name="R1" library="SparkFun" package="0603-RES" value="10k" x="37.1475" y="2.8575" rot="R270"/>
 <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"/>
@@ -1129,8 +1131,8 @@ Please make sure your boards conform to 
 </element>
 <element name="Y2" library="SparkFun" package="CRYSTAL-SMD-5X3" value="11.0592MHz" x="41.91" y="6.985" rot="R180"/>
 <element name="C7" library="SparkFun" package="0603-CAP" value=".1uF" x="15.24" y="7.3025" rot="R180"/>
-<element name="C8" library="SparkFun" package="0603-CAP" value="8.2pF" x="30.48" y="25.4" rot="MR90"/>
-<element name="C9" library="SparkFun" package="0603-CAP" value="1uF" x="33.02" y="25.4" rot="MR90"/>
+<element name="C8" library="SparkFun" package="0603-CAP" value="8.2pF" x="10.16" y="29.21" rot="R90"/>
+<element name="C9" library="SparkFun" package="0603-CAP" value="1uF" x="12.065" y="29.21" rot="R90"/>
 <element name="C13" library="SparkFun" package="0603-CAP" value=".1uF" x="38.1" y="48.895" rot="R180"/>
 <element name="C14" library="SparkFun" package="0603-CAP" value=".1uF" x="40.64" y="25.4" rot="R180"/>
 <element name="C15" library="SparkFun" package="0603-CAP" value=".1uF" x="34.925" y="6.35"/>
@@ -1174,7 +1176,7 @@ Please make sure your boards conform to 
 <element name="U7" library="SeniorDesign" package="SOT23-5" value="24AA32AFT" x="10.795" y="9.525" rot="R180"/>
 <element name="U$7" library="SeniorDesign" package="MS412FE-FL26E" value="MS412FE-FL26E" x="6.35" y="8.89" rot="R180"/>
 <element name="D2" library="SparkFun" package="SOD-323" value="SCHOTTKEY" x="15.24" y="10.16"/>
-<element name="R3" library="SparkFun" package="0603-RES" value="220R" x="18.415" y="8.89" rot="R270"/>
+<element name="R3" library="SparkFun" package="0603-RES" value="220R" x="19.05" y="8.89" rot="R270"/>
 <element name="X5" library="con-coax" package="BU-SMA-H" value="BU-SMA-H" x="4.445" y="33.655" rot="R180">
 <attribute name="OC_NEWARK" value="unknown" x="4.445" y="33.655" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="MPN" value="" x="4.445" y="33.655" size="1.778" layer="27" rot="R180" display="off"/>
@@ -1187,14 +1189,14 @@ Please make sure your boards conform to 
 <attribute name="MF" value="" x="4.445" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
 <attribute name="OC_FARNELL" value="unknown" x="4.445" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
 </element>
-<element name="AUX0" library="adafruit" package="CHIPLED_0603" value="ORANGE" x="71.12" y="8.89" rot="R90"/>
-<element name="R13" library="SparkFun" package="0603-RES" value="10k" x="71.12" y="10.16"/>
-<element name="AUX1" library="adafruit" package="CHIPLED_0603" value="VIOLET" x="72.39" y="5.08" rot="R90"/>
-<element name="R14" library="SparkFun" package="0603-RES" value="10k" x="72.39" y="6.35"/>
-<element name="AUX2" library="adafruit" package="CHIPLED_0603" value="AQUA" x="68.58" y="5.08" rot="R90"/>
-<element name="R16" library="SparkFun" package="0603-RES" value="10k" x="68.58" y="6.35"/>
-<element name="AUX3" library="adafruit" package="CHIPLED_0603" value="YELLOW" x="64.77" y="5.08" rot="R90"/>
-<element name="R25" library="SparkFun" package="0603-RES" value="10k" x="64.77" y="6.35"/>
+<element name="AUX0" library="adafruit" package="CHIPLED_0603" value="ORANGE" x="29.21" y="26.67" rot="R90"/>
+<element name="R13" library="SparkFun" package="0603-RES" value="10k" x="29.21" y="27.94"/>
+<element name="AUX1" library="adafruit" package="CHIPLED_0603" value="VIOLET" x="25.4" y="26.67" rot="R90"/>
+<element name="R14" library="SparkFun" package="0603-RES" value="10k" x="25.4" y="27.94"/>
+<element name="AUX2" library="adafruit" package="CHIPLED_0603" value="AQUA" x="29.21" y="24.13" rot="R90"/>
+<element name="R16" library="SparkFun" package="0603-RES" value="10k" x="29.21" y="25.4"/>
+<element name="AUX3" library="adafruit" package="CHIPLED_0603" value="YELLOW" x="25.4" y="24.13" rot="R90"/>
+<element name="R25" library="SparkFun" package="0603-RES" value="10k" x="25.4" y="25.4"/>
 <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="14.2875" y="35.56" rot="R180"/>
@@ -1208,10 +1210,10 @@ Please make sure your boards conform to 
 <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="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="R5" library="SparkFun" package="0603-RES" value="100k" x="25.4" 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"/>
+<element name="R6" library="SparkFun" package="0603-RES" value="100k" x="26.035" y="10.16"/>
+<element name="R12" library="SparkFun" package="0603-ARV" value="4.7k" x="26.035" y="7.62" rot="R90"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -1302,8 +1304,8 @@ Please make sure your boards conform to 
 <wire x1="3.175" y1="9.64" x2="10.795" y2="9.64" width="0.4064" layer="1"/>
 <wire x1="10.795" y1="9.64" x2="10.795" y2="9.175" width="0.4064" layer="1"/>
 <wire x1="10.795" y1="10.815" x2="10.795" y2="9.64" width="0.4064" layer="1"/>
-<wire x1="31.03" y1="16.51" x2="29.21" y2="16.51" width="0.4064" layer="1"/>
-<wire x1="29.21" y1="16.51" x2="28.0425" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="16.51" x2="28.0425" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="26.67" y1="16.51" x2="28.0425" y2="16.51" width="0.4064" layer="1"/>
 <wire x1="28.0425" y1="16.51" x2="27.94" y2="16.6125" width="0.4064" layer="1"/>
 <contactref element="R27" pad="2"/>
 <contactref element="Q9" pad="E"/>
@@ -1329,9 +1331,9 @@ Please make sure your boards conform to 
 <vertex x="-7.62" y="-5.08"/>
 </polygon>
 <via x="14.2875" y="6.35" extent="1-16" drill="0.254"/>
-<via x="12.3825" y="7.3025" extent="1-16" drill="0.254"/>
+<via x="12.7" y="9.2075" extent="1-16" drill="0.254"/>
 <wire x1="11.745" y1="8.225" x2="11.745" y2="7.935" width="0.4064" layer="1"/>
-<wire x1="11.745" y1="7.935" x2="12.3825" y2="7.3025" width="0.4064" layer="1"/>
+<wire x1="11.745" y1="7.935" x2="12.7" y2="9.2075" 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"/>
@@ -1406,8 +1408,8 @@ 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="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="26.67" y="17.145" extent="1-16" drill="0.254"/>
+<wire x1="26.67" y1="17.145" x2="26.67" 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"/>
@@ -1450,11 +1452,52 @@ Please make sure your boards conform to 
 <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"/>
+<via x="3.4925" y="29.845" extent="1-16" drill="0.254"/>
+<via x="3.4925" y="28.8925" extent="1-16" drill="0.254"/>
+<via x="3.4925" y="27.94" extent="1-16" drill="0.254"/>
+<via x="3.4925" y="26.9875" extent="1-16" drill="0.254"/>
+<via x="5.3975" y="29.845" extent="1-16" drill="0.254"/>
+<via x="8.5725" y="29.21" extent="1-16" drill="0.254"/>
+<via x="8.5725" y="28.2575" extent="1-16" drill="0.254"/>
+<via x="9.525" y="27.305" extent="1-16" drill="0.254"/>
+<via x="9.525" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="2.54" y="26.9875" extent="1-16" drill="0.254"/>
+<via x="1.5875" y="26.9875" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="26.035" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="25.0825" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="24.13" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="23.1775" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="22.225" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="19.05" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="18.0975" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="17.145" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="16.1925" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="15.24" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="14.2875" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="13.335" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="12.3825" extent="1-16" drill="0.254"/>
+<via x="0.9525" y="11.43" extent="1-16" drill="0.254"/>
+<via x="1.905" y="10.795" extent="1-16" drill="0.254"/>
+<via x="2.8575" y="10.795" extent="1-16" drill="0.254"/>
+<via x="3.81" y="10.795" extent="1-16" drill="0.254"/>
+<via x="10.4775" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="11.43" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="13.6525" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="14.605" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="15.5575" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="17.78" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="26.3525" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="25.4" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="20.16125" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="19.20875" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="18.25625" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="22.38375" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="14.76375" extent="1-16" drill="0.254"/>
+<via x="18.7325" y="15.71625" extent="1-16" drill="0.254"/>
+<wire x1="28.46" y1="24.13" x2="28.46" y2="26.67" width="0" layer="19" extent="1-1"/>
+<wire x1="26.575" y1="23.7875" x2="28.46" y2="24.13" width="0" layer="19" extent="1-16"/>
+<wire x1="24.65" y1="24.13" x2="26.575" y2="23.7875" width="0" layer="19" extent="1-16"/>
+<wire x1="24.65" y1="26.67" x2="24.65" y2="24.13" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$1">
 <contactref element="IC1" pad="7"/>
@@ -1524,11 +1567,11 @@ Please make sure your boards conform to 
 <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"/>
 <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"/>
+<via x="27.6225" y="7.9375" extent="1-16" drill="0.254"/>
+<wire x1="26.66" y1="8.02" x2="27.6225" y2="8.02" width="0.4064" layer="1"/>
+<wire x1="27.6225" y1="8.02" x2="27.6225" y2="7.9375" width="0.4064" layer="1"/>
+<wire x1="27.6225" y1="7.9375" x2="31.115" y2="7.9375" width="0.4064" layer="16"/>
+<wire x1="31.115" y1="7.9375" x2="32.0675" y2="6.985" width="0.4064" layer="16"/>
 </signal>
 <signal name="MISO">
 <contactref element="IC1" pad="2"/>
@@ -1543,22 +1586,22 @@ Please make sure your boards conform to 
 <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"/>
 <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"/>
+<via x="28.575" y="7.3025" extent="1-16" drill="0.254"/>
+<wire x1="26.66" y1="7.22" x2="28.575" y2="7.22" width="0.4064" layer="1"/>
+<wire x1="28.575" y1="7.22" x2="28.575" y2="7.3025" width="0.4064" layer="1"/>
+<wire x1="28.575" y1="7.3025" x2="29.845" y2="7.3025" width="0.4064" layer="16"/>
+<wire x1="29.845" y1="7.3025" 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="8.96" x2="30.1625" y2="5.715" width="0.4064" layer="1"/>
+<wire x1="32.83" y1="10.71" x2="32.3" y2="10.71" width="0.4064" layer="1"/>
+<wire x1="32.3" y1="10.71" x2="30.41" y2="8.82" width="0.4064" layer="1"/>
+<wire x1="30.1625" y1="8.5725" 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"/>
-<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"/>
+<contactref element="R12" pad="4"/>
+<wire x1="26.66" y1="8.82" x2="30.41" y2="8.82" width="0.4064" layer="1"/>
+<wire x1="30.41" y1="8.82" x2="30.1625" y2="8.5725" width="0.4064" layer="1"/>
 </signal>
 <signal name="RESET">
 <contactref element="IC1" pad="4"/>
@@ -1570,7 +1613,8 @@ 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="26.9875" y1="7.2" x2="33.02" y2="7.62" width="0" layer="19" extent="1-1"/>
+<wire x1="37.1475" y1="2.0075" x2="34.71" y2="2.0075" width="0.4064" layer="1"/>
+<wire x1="34.71" y1="2.0075" x2="34.29" y2="1.5875" width="0.4064" layer="1"/>
 </signal>
 <signal name="TCK">
 <contactref element="IC1" pad="21"/>
@@ -1617,8 +1661,10 @@ 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="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.3975" x2="13.0175" y2="20.955" width="0.4064" layer="16"/>
+<wire x1="13.0175" y1="20.955" x2="30.48" y2="20.955" width="0.4064" layer="16"/>
+<wire x1="30.48" y1="20.955" x2="36.195" y2="14.605" width="0.4064" layer="16"/>
+<wire x1="36.195" y1="14.605" 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"/>
 </signal>
 <signal name="TXD0">
@@ -1628,8 +1674,9 @@ Please make sure your boards conform to 
 <wire x1="40.03" y1="12.04" x2="37.7825" y2="14.2875" width="0.4064" layer="1"/>
 <via x="37.7825" y="14.2875" extent="1-16" drill="0.2286"/>
 <wire x1="37.7825" y1="14.2875" x2="37.1475" y2="14.9225" width="0.4064" layer="16"/>
-<wire x1="37.1475" y1="14.9225" x2="20.0025" y2="14.9225" width="0.4064" layer="16"/>
-<wire x1="20.0025" y1="14.9225" x2="12.7" y2="22.225" width="0.4064" layer="16"/>
+<wire x1="37.1475" y1="14.9225" x2="31.115" y2="21.59" width="0.4064" layer="16"/>
+<wire x1="31.115" y1="21.59" x2="13.335" y2="21.59" width="0.4064" layer="16"/>
+<wire x1="13.335" y1="21.59" x2="12.7" y2="22.225" width="0.4064" layer="16"/>
 <wire x1="12.7" y1="22.225" x2="12.7" y2="26.6625" width="0.4064" layer="16"/>
 <wire x1="12.7" y1="26.6625" x2="12.575" y2="26.7875" width="0.4064" layer="16"/>
 </signal>
@@ -1637,8 +1684,8 @@ Please make sure your boards conform to 
 <contactref element="IC1" pad="11"/>
 <contactref element="U3" pad="20"/>
 <wire x1="40.83" y1="10.71" x2="40.83" y2="12.1925" width="0.4064" layer="1"/>
-<wire x1="40.83" y1="12.1925" x2="40.64" y2="12.3825" width="0.4064" layer="1"/>
-<via x="40.64" y="12.3825" extent="1-16" drill="0.2286"/>
+<wire x1="40.83" y1="12.1925" x2="40.3225" y2="12.7" width="0.4064" layer="1"/>
+<via x="40.3225" y="12.7" extent="1-16" drill="0.2286"/>
 <contactref element="SETGPS" pad="3"/>
 <wire x1="12.775" y1="12.9" x2="12.775" y2="14.68" width="0.4064" layer="1"/>
 <wire x1="12.775" y1="14.68" x2="13.0175" y2="14.9225" width="0.4064" layer="1"/>
@@ -1647,8 +1694,8 @@ Please make sure your boards conform to 
 <wire x1="43.64" y1="9.7" x2="43.18" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="43.18" y1="10.16" x2="40.83" y2="10.16" width="0.4064" layer="1"/>
 <wire x1="40.83" y1="10.16" x2="40.83" y2="10.71" width="0.4064" layer="1"/>
-<wire x1="40.64" y1="12.3825" x2="14.2875" y2="12.3825" width="0.4064" layer="16"/>
-<wire x1="14.2875" y1="12.3825" x2="13.0175" y2="13.6525" width="0.4064" layer="16"/>
+<wire x1="40.3225" y1="12.7" x2="13.97" y2="12.7" width="0.4064" layer="16"/>
+<wire x1="13.97" y1="12.7" x2="13.0175" y2="13.6525" width="0.4064" layer="16"/>
 <wire x1="13.0175" y1="13.6525" x2="13.0175" y2="14.9225" width="0.4064" layer="16"/>
 </signal>
 <signal name="TXD1">
@@ -1663,10 +1710,9 @@ Please make sure your boards conform to 
 <wire x1="41.465" y1="12.51" x2="40.64" y2="13.335" width="0.4064" layer="1"/>
 <wire x1="42.63" y1="12.51" x2="50.59" y2="12.51" width="0.4064" layer="1"/>
 <wire x1="50.59" y1="12.51" x2="50.78" y2="12.7" width="0.4064" layer="1"/>
-<wire x1="14.2875" y1="15.5575" x2="14.2875" y2="13.6525" width="0.4064" layer="16"/>
-<wire x1="14.2875" y1="13.6525" x2="14.9225" y2="13.0175" width="0.4064" layer="16"/>
-<wire x1="14.9225" y1="13.0175" x2="40.3225" y2="13.0175" width="0.4064" layer="16"/>
-<wire x1="40.3225" y1="13.0175" x2="40.64" y2="13.335" width="0.4064" layer="16"/>
+<wire x1="14.2875" y1="15.5575" x2="14.2875" y2="13.97" width="0.4064" layer="16"/>
+<wire x1="14.2875" y1="13.97" x2="14.9225" y2="13.335" width="0.4064" layer="16"/>
+<wire x1="14.9225" y1="13.335" x2="40.64" y2="13.335" width="0.4064" layer="16"/>
 </signal>
 <signal name="RFOUT" class="2">
 <contactref element="M2" pad="RFOUT"/>
@@ -1680,15 +1726,14 @@ Please make sure your boards conform to 
 <contactref element="R18" pad="1"/>
 <via x="44.7675" y="52.07" extent="1-16" drill="0.254"/>
 <wire x1="46.0375" y1="51.65" x2="44.7675" y2="52.07" width="0.4064" layer="1"/>
-<via x="34.29" y="45.72" extent="1-16" drill="0.254"/>
-<wire x1="34.29" y1="44.43" x2="34.29" y2="45.72" width="0.4064" layer="1"/>
+<via x="34.29" y="49.2125" extent="1-16" drill="0.254"/>
+<wire x1="34.29" y1="44.43" x2="34.29" y2="49.2125" width="0.4064" layer="1"/>
 <wire x1="44.7675" y1="52.07" x2="33.3375" y2="52.07" width="0.4064" layer="16"/>
 <wire x1="33.3375" y1="52.07" x2="33.02" y2="51.7525" width="0.4064" layer="16"/>
 <wire x1="33.02" y1="51.7525" x2="33.02" y2="49.8475" width="0.4064" layer="16"/>
 <wire x1="33.02" y1="49.8475" x2="33.3375" y2="49.53" width="0.4064" layer="16"/>
 <wire x1="33.3375" y1="49.53" x2="33.9725" y2="49.53" width="0.4064" layer="16"/>
 <wire x1="33.9725" y1="49.53" x2="34.29" y2="49.2125" width="0.4064" layer="16"/>
-<wire x1="34.29" y1="49.2125" x2="34.29" y2="45.72" width="0.4064" layer="16"/>
 <wire x1="34.29" y1="44.43" x2="34.29" y2="42.545" width="0.4064" layer="1"/>
 <via x="34.29" y="42.545" extent="1-16" drill="0.254"/>
 <wire x1="34.29" y1="42.545" x2="34.29" y2="40.9575" width="0.4064" layer="16"/>
@@ -1722,20 +1767,20 @@ Please make sure your boards conform to 
 <wire x1="34.075" y1="6.35" x2="34.075" y2="7.405" width="0.4064" layer="1"/>
 <wire x1="34.075" y1="7.405" x2="34.29" y2="7.62" width="0.4064" layer="1"/>
 <wire x1="34.29" y1="7.62" x2="35.56" y2="7.62" width="0.4064" layer="1"/>
-<wire x1="48.045" y1="21.59" x2="48.045" y2="20.44" width="0.4064" layer="1"/>
+<wire x1="48.045" y1="21.59" x2="48.045" y2="20.1225" width="0.4064" layer="1"/>
 <wire x1="48.045" y1="16.51" x2="48.045" y2="16.93" width="0.4064" layer="1"/>
 <wire x1="48.045" y1="16.93" x2="48.895" y2="17.78" width="0.4064" layer="1"/>
-<wire x1="48.895" y1="17.78" x2="48.895" y2="19.59" width="0.4064" layer="1"/>
-<wire x1="48.895" y1="19.59" x2="48.045" y2="20.44" width="0.4064" layer="1"/>
+<wire x1="48.895" y1="17.78" x2="48.895" y2="19.2725" width="0.4064" layer="1"/>
+<wire x1="48.895" y1="19.2725" x2="48.045" y2="20.1225" width="0.4064" layer="1"/>
 <wire x1="37.63" y1="22.31" x2="37.63" y2="23.66" width="0.4064" layer="1"/>
 <wire x1="37.63" y1="23.66" x2="38.1" y2="24.13" width="0.4064" layer="1"/>
 <wire x1="38.1" y1="24.13" x2="40.3225" y2="24.13" width="0.4064" layer="1"/>
 <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="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="27.94" y1="18.3125" x2="28.0425" y2="18.3125" width="0.4064" layer="1"/>
+<wire x1="28.0425" y1="18.3125" x2="29.045" y2="17.31" width="0.4064" layer="1"/>
+<wire x1="31.03" y1="17.31" x2="29.045" 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"/>
@@ -1758,9 +1803,9 @@ Please make sure your boards conform to 
 <wire x1="13.335" y1="6.985" x2="13.335" y2="8.255" width="0.4064" layer="1"/>
 <wire x1="13.335" y1="8.255" x2="13.97" y2="8.89" width="0.4064" layer="1"/>
 <wire x1="36.03" y1="10.71" x2="36.03" y2="8.09" width="0.4064" layer="1"/>
-<wire x1="36.03" y1="8.09" x2="35.56" y2="7.62" width="0.4064" layer="1"/>
+<wire x1="36.03" y1="8.09" x2="35.8775" y2="7.9375" width="0.4064" layer="1"/>
+<wire x1="35.8775" y1="7.9375" x2="35.56" y2="7.62" width="0.4064" layer="1"/>
 <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"/>
 <polygon width="0.4064" layer="1">
 <vertex x="34.6075" y="18.415"/>
@@ -1769,44 +1814,97 @@ Please make sure your boards conform to 
 <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="36.83" 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="36.03" y1="13.5" x2="34.925" y2="14.605" width="0.4064" layer="1"/>
+<wire x1="34.925" y1="17.145" x2="36.83" 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="25.4" 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="4.445" y1="22.9625" x2="4.445" y2="17.4625" 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="29.21" y1="4.1275" x2="34.075" y2="6.35" 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="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="4.445" y2="22.9625" width="0" layer="19" extent="16-16"/>
+<via x="44.1325" y="16.51" extent="1-16" drill="0.254"/>
+<via x="47.9425" y="15.24" extent="1-16" drill="0.254"/>
+<wire x1="42.63" y1="16.51" x2="44.1325" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="44.1325" y1="16.51" x2="46.6725" y2="16.51" width="0.4064" layer="16"/>
+<wire x1="46.6725" y1="16.51" x2="47.9425" y2="15.24" width="0.4064" layer="16"/>
+<wire x1="48.045" y1="20.1225" x2="47.7275" y2="20.1225" width="0.4064" layer="1"/>
+<wire x1="47.7275" y1="20.1225" x2="47.605" y2="20" width="0.4064" layer="1"/>
+<via x="35.8775" y="7.9375" extent="1-16" drill="0.254"/>
+<via x="37.1475" y="4.7625" extent="1-16" drill="0.254"/>
+<wire x1="37.1475" y1="4.7625" x2="37.1475" y2="3.7075" width="0.4064" layer="1"/>
+<wire x1="37.1475" y1="4.7625" x2="37.1475" y2="6.6675" width="0.4064" layer="16"/>
+<wire x1="37.1475" y1="6.6675" x2="35.8775" y2="7.9375" width="0.4064" layer="16"/>
+<wire x1="4.445" y1="22.9625" x2="7.405" y2="22.9625" width="0.4064" layer="16"/>
+<wire x1="7.405" y1="22.9625" x2="8.5725" y2="24.13" width="0.4064" layer="16"/>
+<wire x1="8.5725" y1="24.13" x2="8.5725" y2="26.785" width="0.4064" layer="16"/>
+<wire x1="8.5725" y1="26.785" x2="8.575" y2="26.7875" width="0.4064" layer="16"/>
+<wire x1="31.115" y1="33.9725" x2="31.4325" y2="34.29" width="0.6096" layer="1"/>
+<polygon width="0.6096" layer="1">
+<vertex x="27.94" y="35.56"/>
+<vertex x="27.94" y="35.2425"/>
+<vertex x="26.3525" y="35.2425"/>
+<vertex x="26.3525" y="31.115"/>
+<vertex x="31.4325" y="31.115"/>
+<vertex x="31.4325" y="35.56"/>
+</polygon>
+<via x="26.67" y="31.75" extent="1-16" drill="0.254"/>
+<via x="27.6225" y="31.75" extent="1-16" drill="0.254"/>
+<via x="28.575" y="31.75" extent="1-16" drill="0.254"/>
+<via x="29.5275" y="31.75" extent="1-16" drill="0.254"/>
+<via x="30.48" y="31.75" extent="1-16" drill="0.254"/>
+<wire x1="30.48" y1="31.75" x2="26.67" y2="31.75" width="0.8128" layer="16"/>
+<wire x1="30.48" y1="31.75" x2="33.02" y2="31.75" width="0.8128" layer="16"/>
+<wire x1="33.02" y1="31.75" x2="38.1" y2="26.67" width="0.8128" layer="16"/>
+<wire x1="38.1" y1="26.67" x2="38.1" y2="17.78" width="0.8128" layer="16"/>
+<wire x1="29.21" y1="4.1275" x2="26.67" y2="4.1275" width="0.6096" layer="16"/>
+<wire x1="26.67" y1="4.1275" x2="26.035" y2="4.7625" width="0.6096" layer="16"/>
+<wire x1="26.035" y1="4.7625" x2="26.035" y2="10.16" width="0.6096" layer="16"/>
+<via x="26.035" y="11.1125" extent="1-16" drill="0.254"/>
+<wire x1="26.035" y1="10.16" x2="26.035" y2="11.1125" width="0.6096" layer="16"/>
+<wire x1="26.885" y1="10.16" x2="26.885" y2="10.2625" width="0.4064" layer="1"/>
+<wire x1="26.885" y1="10.2625" x2="26.035" y2="11.1125" width="0.4064" layer="1"/>
+<wire x1="26.035" y1="11.1125" x2="31.4325" y2="11.1125" width="0.6096" layer="1"/>
+<wire x1="31.4325" y1="11.1125" x2="34.925" y2="14.605" width="0.6096" layer="1"/>
+<wire x1="34.925" y1="14.605" x2="34.925" y2="17.145" width="0.6096" layer="1"/>
+<wire x1="34.925" y1="17.145" x2="35.09" y2="17.31" width="0.6096" layer="1"/>
+<via x="17.145" y="10.16" extent="1-16" drill="0.254"/>
+<wire x1="17.145" y1="10.16" x2="16.51" y2="10.16" width="0.6096" layer="1"/>
+<wire x1="17.145" y1="10.16" x2="26.035" y2="10.16" width="0.6096" layer="16"/>
+<wire x1="5.1525" y1="12.685" x2="4.1425" y2="12.685" width="0.4064" layer="16"/>
+<wire x1="4.1425" y1="12.685" x2="4.1275" y2="12.7" width="0.4064" layer="16"/>
+<wire x1="3.81" y1="13.0175" x2="3.81" y2="16.8275" width="0.4064" layer="16"/>
+<wire x1="3.81" y1="16.8275" x2="4.445" y2="17.4625" width="0.4064" layer="16"/>
+<wire x1="4.445" y1="17.4625" x2="20.32" y2="17.4625" width="0.4064" layer="16"/>
+<via x="20.32" y="17.4625" extent="1-16" drill="0.254"/>
+<wire x1="20.32" y1="17.4625" x2="20.955" y2="18.0975" width="0.4064" layer="1"/>
+<wire x1="20.955" y1="18.0975" x2="25.5025" y2="18.0975" width="0.4064" layer="1"/>
+<wire x1="25.5025" y1="18.0975" x2="25.4" y2="18.3125" width="0.4064" layer="1"/>
+<wire x1="11.1125" y1="28.36" x2="12.065" y2="28.36" width="0.4064" layer="1"/>
+<wire x1="10.16" y1="28.36" x2="11.1125" y2="28.36" width="0.4064" layer="1"/>
+<wire x1="11.1125" y1="28.36" x2="11.1125" y2="27.305" width="0.4064" layer="1"/>
+<via x="11.1125" y="27.305" extent="1-16" drill="0.254"/>
+<wire x1="11.1125" y1="27.305" x2="8.575" y2="27.305" width="0.4064" layer="16"/>
+<wire x1="8.575" y1="27.305" x2="8.575" y2="26.7875" width="0.4064" layer="16"/>
+<wire x1="16.39" y1="10.16" x2="16.51" y2="10.16" width="0.4064" layer="1"/>
+<wire x1="48.045" y1="16.51" x2="48.045" y2="15.3425" width="0.4064" layer="1"/>
+<wire x1="48.045" y1="15.3425" x2="47.9425" y2="15.24" width="0.4064" layer="1"/>
+<wire x1="46.355" y1="15.3425" x2="47.84" y2="15.3425" width="0.4064" layer="1"/>
+<wire x1="47.84" y1="15.3425" x2="47.9425" y2="15.24" width="0.4064" layer="1"/>
 </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="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"/>
+<wire x1="34.29" y1="50.8" x2="35.24" y2="49.85" width="0.4064" layer="1"/>
+<wire x1="35.24" y1="49.85" x2="35.24" y2="47.02" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$3">
 <contactref element="IC1" pad="29"/>
@@ -1868,7 +1966,11 @@ Please make sure your boards conform to 
 <vertex x="24.765" y="32.7025"/>
 </polygon>
 <wire x1="24.4475" y1="33.02" x2="22.5425" y2="33.02" width="0.8128" layer="16"/>
-<wire x1="37.15" y1="47.02" x2="33.34" y2="47.02" width="0" layer="19" extent="1-1"/>
+<via x="33.3375" y="48.26" extent="1-16" drill="0.254"/>
+<wire x1="33.34" y1="47.02" x2="33.3375" y2="47.0225" width="0.4064" layer="1"/>
+<wire x1="33.3375" y1="47.0225" x2="33.3375" y2="48.26" width="0.4064" layer="1"/>
+<wire x1="33.3375" y1="48.26" x2="34.29" y2="48.26" width="0.4064" layer="16"/>
+<wire x1="34.29" y1="48.26" x2="36.83" y2="50.8" width="0.4064" layer="16"/>
 </signal>
 <signal name="HX1_TX_5V">
 <contactref element="M2" pad="TXD"/>
@@ -1932,16 +2034,15 @@ Please make sure your boards conform to 
 <contactref element="ASDF" pad="2"/>
 <contactref element="R5" pad="1"/>
 <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="31.03" y1="15.71" x2="25.4" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="25.4" y1="15.71" x2="21.12" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="20.32" y1="16.51" x2="11.7475" y2="16.51" width="0.4064" layer="1"/>
+<wire x1="11.7475" y1="16.51" x2="10.16" y2="14.9225" width="0.4064" layer="1"/>
+<via x="10.16" y="14.9225" extent="1-16" drill="0.254"/>
+<wire x1="10.16" 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"/>
+<wire x1="25.4" y1="16.6125" x2="25.4" y2="15.71" width="0.4064" layer="1"/>
+<wire x1="20.32" y1="16.51" x2="21.12" y2="15.71" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$24">
 <contactref element="R18" pad="2"/>
@@ -2061,7 +2162,7 @@ Please make sure your boards conform to 
 <contactref element="R23" pad="1"/>
 <wire x1="6.475" y1="24.7" x2="6.475" y2="26.6925" width="0.4064" layer="1"/>
 <wire x1="6.475" y1="26.6925" x2="6.135" y2="26.9875" width="0.4064" layer="1"/>
-<wire x1="6.475" y1="24.7" x2="7.575" y2="24.7" width="0" layer="19" extent="1-1"/>
+<wire x1="6.475" y1="24.7" x2="7.575" y2="24.7" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$30">
 <contactref element="L5" pad="2"/>
@@ -2100,29 +2201,29 @@ Please make sure your boards conform to 
 <wire x1="14.9225" y1="10.16" x2="15.24" y2="10.4775" width="0.4064" layer="1"/>
 <wire x1="15.24" y1="10.4775" x2="15.24" y2="12.635" width="0.4064" layer="1"/>
 <wire x1="15.24" y1="12.635" x2="14.975" y2="12.9" width="0.4064" layer="1"/>
-<via x="13.335" y="10.16" extent="1-16" drill="0.2286"/>
-<wire x1="14.09" y1="10.16" x2="13.335" y2="10.16" width="0.4064" layer="1"/>
-<wire x1="18.415" y1="9.74" x2="18.3125" y2="9.74" width="0.4064" layer="1"/>
-<wire x1="18.415" y1="11.43" x2="18.415" y2="9.74" width="0.4064" layer="1"/>
-<wire x1="18.3125" y1="9.74" x2="18.415" y2="9.8425" width="0.4064" layer="1"/>
-<wire x1="18.415" y1="9.8425" x2="18.415" y2="11.43" width="0.4064" layer="1"/>
-<via x="18.415" y="11.43" extent="1-16" drill="0.254"/>
-<wire x1="18.415" y1="11.43" x2="14.605" y2="11.43" width="0.4064" layer="16"/>
-<wire x1="14.605" y1="11.43" x2="13.335" y2="10.16" width="0.4064" layer="16"/>
+<via x="13.0175" y="10.16" extent="1-16" drill="0.2286"/>
+<wire x1="14.09" y1="10.16" x2="13.0175" y2="10.16" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="9.74" x2="18.9475" y2="9.74" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="9.8425" x2="19.05" y2="9.74" width="0.4064" layer="1"/>
+<wire x1="18.9475" y1="9.74" x2="19.05" y2="9.8425" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="9.8425" x2="19.05" y2="11.1125" width="0.4064" layer="1"/>
+<via x="19.05" y="11.1125" extent="1-16" drill="0.254"/>
+<wire x1="19.05" y1="11.1125" x2="13.97" y2="11.1125" width="0.4064" layer="16"/>
+<wire x1="13.97" y1="11.1125" x2="13.0175" y2="10.16" width="0.4064" layer="16"/>
 </signal>
 <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="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.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="19.05" y1="8.04" x2="19.05" y2="7.62" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="7.62" x2="17.145" y2="5.715" width="0.4064" layer="1"/>
+<wire x1="17.145" 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"/>
 <contactref element="AUX0" pad="A"/>
-<wire x1="71.87" y1="8.89" x2="71.97" y2="10.16" width="0" layer="19" extent="1-1"/>
+<wire x1="29.96" y1="26.67" x2="30.06" y2="27.94" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="AUXLED1">
 <contactref element="R14" pad="1"/>
@@ -2139,20 +2240,20 @@ Please make sure your boards conform to 
 <signal name="N$12">
 <contactref element="R14" pad="2"/>
 <contactref element="AUX1" pad="A"/>
-<wire x1="73.24" y1="6.35" x2="73.24" y2="5.18" width="0.4064" layer="1"/>
-<wire x1="73.24" y1="5.18" x2="73.14" y2="5.08" width="0.4064" layer="1"/>
+<wire x1="26.25" y1="27.94" x2="26.25" y2="26.77" width="0.4064" layer="1"/>
+<wire x1="26.25" y1="26.77" x2="26.15" y2="26.67" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$33">
 <contactref element="R16" pad="2"/>
 <contactref element="AUX2" pad="A"/>
-<wire x1="69.43" y1="5.18" x2="69.33" y2="5.08" width="0.4064" layer="1"/>
-<wire x1="69.43" y1="5.18" x2="69.43" y2="6.35" width="0" layer="19" extent="1-1"/>
+<wire x1="30.06" y1="24.23" x2="29.96" y2="24.13" width="0.4064" layer="1"/>
+<wire x1="30.06" y1="24.23" x2="30.06" y2="25.4" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$34">
 <contactref element="R25" pad="2"/>
 <contactref element="AUX3" pad="A"/>
-<wire x1="65.62" y1="5.18" x2="65.52" y2="5.08" width="0.4064" layer="1"/>
-<wire x1="65.62" y1="5.18" x2="65.62" y2="6.35" width="0" layer="19" extent="1-1"/>
+<wire x1="26.25" y1="25.4" x2="26.25" y2="24.23" width="0.4064" layer="1"/>
+<wire x1="26.25" y1="24.23" x2="26.15" y2="24.13" width="0.4064" layer="1"/>
 </signal>
 <signal name="HX1_TX">
 <contactref element="IC3" pad="2"/>
@@ -2176,7 +2277,18 @@ Please make sure your boards conform to 
 <signal name="HEAT">
 <contactref element="IC1" pad="31"/>
 <contactref element="10K" pad="2"/>
-<wire x1="10.4775" y1="38.52" x2="34.43" y2="22.31" width="0" layer="19" extent="1-1"/>
+<via x="34.29" y="23.8125" extent="1-16" drill="0.254"/>
+<wire x1="34.43" y1="22.31" x2="34.43" y2="23.6725" width="0.4064" layer="1"/>
+<wire x1="34.43" y1="23.6725" x2="34.29" y2="23.8125" width="0.4064" layer="1"/>
+<wire x1="10.4775" y1="38.52" x2="8.89" y2="36.9325" width="0.4064" layer="1"/>
+<wire x1="8.89" y1="36.9325" x2="8.89" y2="32.385" width="0.4064" layer="1"/>
+<wire x1="8.89" y1="32.385" x2="9.525" y2="31.75" width="0.4064" layer="1"/>
+<via x="9.525" y="31.75" extent="1-16" drill="0.254"/>
+<wire x1="9.525" y1="31.75" x2="25.0825" y2="31.75" width="0.4064" layer="16"/>
+<wire x1="25.0825" y1="31.75" x2="26.3525" y2="30.48" width="0.4064" layer="16"/>
+<wire x1="26.3525" y1="30.48" x2="32.7025" y2="30.48" width="0.4064" layer="16"/>
+<wire x1="32.7025" y1="30.48" x2="34.29" y2="28.8925" width="0.4064" layer="16"/>
+<wire x1="34.29" y1="28.8925" x2="34.29" y2="23.8125" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$36">
 <contactref element="Q9" pad="C"/>
@@ -2219,69 +2331,61 @@ Please make sure your boards conform to 
 <contactref element="L1" pad="1"/>
 <wire x1="16.09" y1="7.3025" x2="15.89" y2="7.3025" width="0.4064" layer="1"/>
 <wire x1="15.89" y1="7.3025" x2="15.89" y2="8.89" width="0.4064" layer="1"/>
-<wire x1="15.89" y1="8.89" x2="16.51" y2="8.89" width="0.4064" layer="1"/>
-<wire x1="16.51" y1="8.89" x2="17.4625" y2="9.8425" width="0.4064" layer="1"/>
-<wire x1="17.4625" y1="9.8425" x2="17.4625" y2="10.795" width="0.4064" layer="1"/>
+<wire x1="15.89" y1="8.89" x2="17.145" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="17.145" y1="8.89" x2="18.0975" y2="9.8425" width="0.4064" layer="1"/>
+<wire x1="18.0975" y1="9.8425" x2="18.0975" y2="10.795" width="0.4064" layer="1"/>
 <wire x1="16.075" y1="12.9" x2="16.075" y2="11.5475" width="0.4064" layer="1"/>
 <wire x1="16.075" y1="11.5475" x2="16.51" y2="11.1125" width="0.4064" layer="1"/>
-<wire x1="16.51" y1="11.1125" x2="17.145" y2="11.1125" width="0.4064" layer="1"/>
-<wire x1="17.145" y1="11.1125" x2="17.4625" y2="10.795" width="0.4064" layer="1"/>
+<wire x1="16.51" y1="11.1125" x2="17.78" y2="11.1125" width="0.4064" layer="1"/>
+<wire x1="17.78" y1="11.1125" x2="18.0975" y2="10.795" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$8">
 <contactref element="ASDF" pad="3"/>
 <contactref element="R6" pad="1"/>
-<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"/>
+<contactref element="R12" pad="5"/>
+<wire x1="25.41" y1="8.82" x2="25.41" y2="9.935" width="0.4064" layer="1"/>
+<wire x1="25.41" y1="9.935" x2="25.185" y2="10.16" width="0.4064" layer="1"/>
+<wire x1="25.185" y1="10.16" x2="25.185" y2="10.375" width="0.4064" layer="1"/>
+<wire x1="25.185" y1="10.375" x2="23.8125" y2="11.7475" width="0.4064" layer="1"/>
+<via x="23.8125" y="11.7475" extent="1-16" drill="0.254"/>
+<wire x1="23.8125" y1="11.7475" x2="23.495" y2="12.065" width="0.4064" layer="16"/>
+<wire x1="23.495" y1="12.065" x2="7.62" y2="12.065" width="0.4064" layer="16"/>
+<wire x1="7.62" y1="12.065" x2="6.0325" y2="13.6525" width="0.4064" layer="16"/>
+<wire x1="6.0325" y1="13.6525" x2="5.685" y2="13.6525" width="0.4064" layer="16"/>
+<wire x1="5.685" y1="13.6525" x2="5.5525" y2="13.785" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$9">
 <contactref element="ASDF" pad="7"/>
 <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"/>
+<via x="24.4475" y="6.985" extent="1-16" drill="0.254"/>
+<wire x1="25.41" y1="7.22" x2="24.6825" y2="7.22" width="0.4064" layer="1"/>
+<wire x1="24.6825" y1="7.22" x2="24.4475" y2="6.985" width="0.4064" layer="1"/>
+<wire x1="24.4475" y1="6.985" x2="8.5725" y2="6.985" width="0.4064" layer="16"/>
+<wire x1="8.5725" y1="6.985" x2="6.0325" y2="9.525" width="0.4064" layer="16"/>
+<wire x1="6.0325" 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="ASDF" pad="5"/>
 <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"/>
+<via x="24.4475" y="7.9375" extent="1-16" drill="0.254"/>
+<wire x1="25.41" y1="8.02" x2="24.53" y2="8.02" width="0.4064" layer="1"/>
+<wire x1="24.53" y1="8.02" x2="24.4475" y2="7.9375" width="0.4064" layer="1"/>
+<wire x1="24.4475" y1="7.9375" x2="24.13" y2="7.62" width="0.4064" layer="16"/>
+<wire x1="24.13" y1="7.62" x2="9.8425" y2="7.62" width="0.4064" layer="16"/>
+<wire x1="9.8425" y1="7.62" x2="6.0325" y2="11.43" width="0.4064" layer="16"/>
+<wire x1="6.0325" 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"/>
-<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"/>
+<via x="20.32" y="8.5725" extent="1-16" drill="0.254"/>
 <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"/>
+<wire x1="20.32" y1="13.571771875" x2="20.32" y2="8.5725" width="0.4064" layer="1"/>
 <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"/>
+<wire x1="20.32" y1="8.5725" x2="16.165" y2="8.5725" width="0.4064" layer="16"/>
+<wire x1="16.165" y1="8.5725" x2="15.7525" y2="8.985" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$11">
 <contactref element="Q7" pad="3"/>
diff --git a/master/master.sch b/master/master.sch
--- a/master/master.sch
+++ b/master/master.sch
@@ -5835,10 +5835,10 @@ Maybe use bigger R's</text>
 </instance>
 <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="A" x="48.26" y="86.36"/>
 <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"/>
+<instance part="R12" gate="D" x="60.96" y="101.6"/>
 </instances>
 <busses>
 </busses>
@@ -6286,9 +6286,9 @@ Maybe use bigger R's</text>
 <label x="370.84" y="243.84" size="1.778" layer="95"/>
 </segment>
 <segment>
+<label x="38.1" y="101.6" size="1.778" layer="95"/>
+<pinref part="R12" gate="D" pin="1"/>
 <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="R12" gate="A" pin="1"/>
 </segment>
 </net>
 <net name="RESET" class="0">
@@ -7047,10 +7047,10 @@ Maybe use bigger R's</text>
 <wire x1="91.44" y1="101.6" x2="76.2" y2="101.6" width="0.1524" layer="91"/>
 <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"/>
+<pinref part="R12" gate="D" pin="2"/>
+<wire x1="66.04" y1="101.6" x2="76.2" y2="101.6" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="N$9" class="0">
@@ -7074,11 +7074,6 @@ 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="(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"/>