diff --git a/master/master.brd b/master/master.brd
--- a/master/master.brd
+++ b/master/master.brd
@@ -9,7 +9,7 @@
 <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="no" active="yes"/>
+<layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
@@ -134,7 +134,7 @@
 <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"/>
+<hole x="49.8475" y="3.175" drill="3.2"/>
 <circle x="46.99" y="31.115" radius="0.127" width="0.4064" layer="21"/>
 <circle x="24.4475" y="39.0525" radius="0.127" width="0.4064" layer="21"/>
 <text x="10.16" y="59.69" size="1.778" layer="21">TODO: USE NICK"S THING</text>
@@ -553,43 +553,41 @@ Based on the following sources:&lt;p&gt;
 </library>
 <library name="con-coax">
 <packages>
-<package name="BU-SMA-H">
-<description>FEMALE &lt;b&gt;SMA CONNECTOR&lt;/b&gt;&lt;p&gt;
-Radiall&lt;p&gt;</description>
-<wire x1="-1.1" y1="3.2" x2="1.1" y2="3.2" width="0.2032" layer="21"/>
-<wire x1="3.2" y1="1.1" x2="3.2" y2="-1.1" width="0.2032" layer="21"/>
-<wire x1="1.1" y1="-3.2" x2="-1.1" y2="-3.2" width="0.2032" layer="21"/>
-<wire x1="-3.2" y1="-1.1" x2="-3.2" y2="1.1" width="0.2032" layer="21"/>
-<wire x1="-3.1999" y1="3.1999" x2="3.2" y2="3.2" width="0.2032" layer="51"/>
-<wire x1="3.2" y1="3.2" x2="3.2" y2="2.9" width="0.2032" layer="51"/>
-<wire x1="3.2" y1="2.9" x2="3.2" y2="-2.9" width="0.2032" layer="51"/>
-<wire x1="3.2" y1="-2.9" x2="3.1999" y2="-3.1999" width="0.2032" layer="51"/>
-<wire x1="3.1999" y1="-3.1999" x2="-3.2" y2="-3.2" width="0.2032" layer="51"/>
-<wire x1="-3.2" y1="-3.2" x2="-3.1999" y2="3.1999" width="0.2032" layer="51"/>
-<wire x1="3.2" y1="2.9" x2="4.3" y2="2.9" width="0.2032" layer="51"/>
-<wire x1="4.3" y1="2.9" x2="8.3" y2="2.9" width="0.2032" layer="21"/>
-<wire x1="8.3" y1="2.9" x2="8.6" y2="3.4" width="0.2032" layer="21"/>
-<wire x1="10.7" y1="3.4" x2="11" y2="2.9" width="0.2032" layer="21"/>
-<wire x1="11" y1="2.9" x2="11.6" y2="2.9" width="0.2032" layer="21"/>
-<wire x1="11.6" y1="-2.9" x2="11.6" y2="2.9" width="0.2032" layer="21"/>
-<wire x1="8.6" y1="3.4" x2="10.7" y2="3.4" width="0.2032" layer="21"/>
-<wire x1="3.2" y1="-2.9" x2="4.3" y2="-2.9" width="0.2032" layer="51"/>
-<wire x1="4.3" y1="-2.9" x2="8.3" y2="-2.9" width="0.2032" layer="21"/>
-<wire x1="8.3" y1="-2.9" x2="8.6" y2="-3.4" width="0.2032" layer="21"/>
-<wire x1="10.7" y1="-3.4" x2="11" y2="-2.9" width="0.2032" layer="21"/>
-<wire x1="11" y1="-2.9" x2="11.6" y2="-2.9" width="0.2032" layer="21"/>
-<wire x1="8.6" y1="-3.4" x2="10.7" y2="-3.4" width="0.2032" layer="21"/>
-<wire x1="11" y1="-2.9" x2="11" y2="2.9" width="0.2032" layer="21"/>
-<wire x1="8.3" y1="-2.9" x2="8.3" y2="2.9" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="3.1999" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.7" width="0.2032" layer="21"/>
-<pad name="1" x="0" y="0" drill="1.27"/>
-<pad name="2" x="-2.5499" y="2.5499" drill="1.778"/>
-<pad name="3" x="2.5499" y="2.5499" drill="1.778"/>
-<pad name="4" x="2.5499" y="-2.5499" drill="1.778"/>
-<pad name="5" x="-2.5499" y="-2.5499" drill="1.778"/>
-<text x="-2.54" y="4.445" size="1.27" layer="25">&gt;NAME</text>
-<text x="-3.175" y="-5.715" size="1.27" layer="27">&gt;VALUE</text>
+<package name="J502-ND-142-0711-821/826">
+<description>&lt;b&gt;SMA 50 Ohm&lt;/b&gt; Board Thickness &lt;b&gt;0.062&lt;/b&gt; Inch, End Launch Jack Receptacle&lt;p&gt;
+Johnson Components&lt;br&gt;
+Source: www.johnsoncomponents.com .. J502-ND.pdf</description>
+<wire x1="0" y1="5.588" x2="0" y2="-5.588" width="0" layer="20"/>
+<wire x1="-1.55" y1="-4.65" x2="-1.55" y2="-2" width="0.2032" layer="21"/>
+<wire x1="-1.55" y1="-2" x2="-3.7" y2="-2" width="0.2032" layer="21"/>
+<wire x1="-3.7" y1="-2" x2="-4.45" y2="-2.75" width="0.2032" layer="21"/>
+<wire x1="-4.45" y1="-2.75" x2="-8.25" y2="-2.75" width="0.2032" layer="21"/>
+<wire x1="-8.25" y1="-2.75" x2="-8.25" y2="-1.9" width="0.2032" layer="21"/>
+<wire x1="-8.25" y1="-1.9" x2="-9.425" y2="-1.9" width="0.2032" layer="21"/>
+<wire x1="-9.425" y1="-1.9" x2="-9.425" y2="1.9" width="0.2032" layer="21"/>
+<wire x1="-9.425" y1="1.9" x2="-8.25" y2="1.9" width="0.2032" layer="21"/>
+<wire x1="-8.25" y1="1.9" x2="-8.25" y2="2.75" width="0.2032" layer="21"/>
+<wire x1="-8.25" y1="2.75" x2="-4.45" y2="2.75" width="0.2032" layer="21"/>
+<wire x1="-4.45" y1="2.75" x2="-3.7" y2="2" width="0.2032" layer="21"/>
+<wire x1="-3.7" y1="2" x2="-1.55" y2="2" width="0.2032" layer="21"/>
+<wire x1="-1.55" y1="2" x2="-1.55" y2="4.65" width="0.2032" layer="21"/>
+<wire x1="-1.55" y1="4.65" x2="4.1" y2="4.65" width="0.2032" layer="51"/>
+<wire x1="4.1" y1="-4.65" x2="-1.55" y2="-4.65" width="0.2032" layer="51"/>
+<wire x1="4.1" y1="-4.65" x2="4.1" y2="-3.85" width="0.2032" layer="51"/>
+<wire x1="4.1" y1="-3.85" x2="-0.1" y2="-3.85" width="0.2032" layer="51"/>
+<wire x1="-0.1" y1="-3.85" x2="-0.1" y2="3.85" width="0.2032" layer="21"/>
+<wire x1="-0.1" y1="3.85" x2="4.1" y2="3.85" width="0.2032" layer="51"/>
+<wire x1="4.1" y1="3.85" x2="4.1" y2="4.65" width="0.2032" layer="51"/>
+<wire x1="-1.55" y1="4.65" x2="-0.1" y2="4.65" width="0.2032" layer="21"/>
+<wire x1="-0.1" y1="-4.65" x2="-1.55" y2="-4.65" width="0.2032" layer="21"/>
+<smd name="1" x="2.1154" y="0" dx="4.191" dy="1.778" layer="1"/>
+<smd name="G@1" x="2.1154" y="3.4946" dx="4.191" dy="2.667" layer="1"/>
+<smd name="G@2" x="2.1154" y="-3.4946" dx="4.191" dy="2.667" layer="1"/>
+<smd name="G@4" x="2.1154" y="-3.4946" dx="4.191" dy="2.667" layer="16"/>
+<smd name="G@3" x="2.1154" y="3.4946" dx="4.191" dy="2.667" layer="16"/>
+<text x="0.635" y="6.35" size="1.778" layer="25">&gt;NAME</text>
+<text x="1.27" y="-8.89" size="1.778" layer="27">&gt;VALUE</text>
+<rectangle x1="-0.025" y1="-0.5" x2="4.05" y2="0.5" layer="51"/>
 </package>
 </packages>
 </library>
@@ -926,12 +924,12 @@ www.irf.com&lt;p&gt;
 <variantdefs>
 </variantdefs>
 <classes>
-<class number="0" name="default" width="0.2032" drill="0.3048">
+<class number="0" name="default" width="0.2032" drill="0">
 <clearance class="0" value="0.2032"/>
 </class>
 <class number="1" name="power" width="0.508" drill="0">
 </class>
-<class number="2" name="20" width="0.508" drill="0">
+<class number="2" name="whatisthis" width="0.508" drill="0">
 </class>
 </classes>
 <designrules name="LaenPCBOrder *">
@@ -1159,24 +1157,12 @@ Please make sure your boards conform to 
 <element name="C21" library="SparkFun" package="0603-CAP" value="0.1uF" x="21.59" y="35.2425" rot="R90"/>
 <element name="C20" library="SparkFun" package="0603-CAP" value="10uF" x="26.9875" y="39.6875" rot="R180"/>
 <element name="U3" library="Seeed" package="NEO-5Q" value="NEO-5Q" x="3.175" y="12.7" rot="R90"/>
-<element name="R23" library="SparkFun" package="0603-RES" value="10R" x="6.985" y="26.9875"/>
-<element name="L5" library="SparkFun" package="C0402" value="27nH" x="6.985" y="28.575"/>
+<element name="R23" library="SparkFun" package="0603-RES" value="10R" x="7.3025" y="26.67"/>
+<element name="L5" library="SparkFun" package="C0402" value="27nH" x="7.46125" y="28.2575"/>
 <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="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"/>
-<attribute name="MF" value="" x="4.445" y="33.655" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="OC_FARNELL" value="unknown" x="4.445" y="33.655" size="1.778" layer="27" rot="R180" display="off"/>
-</element>
-<element name="X2" library="con-coax" package="BU-SMA-H" value="BU-SMA-H" x="4.445" y="44.45" rot="R180">
-<attribute name="OC_NEWARK" value="unknown" x="4.445" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<attribute name="MPN" value="" x="4.445" y="44.45" size="1.778" layer="27" rot="R180" display="off"/>
-<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="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"/>
@@ -1202,6 +1188,18 @@ Please make sure your boards conform to 
 <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="26.035" y="10.16"/>
 <element name="R12" library="SparkFun" package="0603-ARV" value="4.7k" x="26.035" y="7.62" rot="R90"/>
+<element name="X1" library="con-coax" package="J502-ND-142-0711-821/826" value="SMA-142-0711-821/826" x="0" y="42.545">
+<attribute name="OC_NEWARK" value="16F3627" x="0" y="42.545" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="142-0711-821" x="0" y="42.545" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="JOHNSON COMPONENTS" x="0" y="42.545" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="1019328" x="0" y="42.545" size="1.778" layer="27" display="off"/>
+</element>
+<element name="X3" library="con-coax" package="J502-ND-142-0711-821/826" value="SMA-142-0711-821/826" x="0" y="32.385">
+<attribute name="OC_NEWARK" value="16F3627" x="0" y="32.385" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="142-0711-821" x="0" y="32.385" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="JOHNSON COMPONENTS" x="0" y="32.385" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="1019328" x="0" y="32.385" size="1.778" layer="27" display="off"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
@@ -1257,16 +1255,6 @@ Please make sure your boards conform to 
 <contactref element="U7" pad="2"/>
 <contactref element="U7" pad="5"/>
 <contactref element="U$7" pad="V-"/>
-<contactref element="X5" pad="2"/>
-<contactref element="X5" pad="4"/>
-<contactref element="X5" pad="3"/>
-<contactref element="X5" pad="5"/>
-<contactref element="X5" pad="2"/>
-<contactref element="X2" pad="2"/>
-<contactref element="X2" pad="4"/>
-<contactref element="X2" pad="3"/>
-<contactref element="X2" pad="5"/>
-<contactref element="X2" pad="2"/>
 <contactref element="AUX0" pad="C"/>
 <wire x1="40.25" y1="38.735" x2="43.815" y2="38.735" width="0.8128" layer="1"/>
 <wire x1="43.815" y1="38.735" x2="44.45" y2="38.1" width="0.8128" layer="1"/>
@@ -1276,20 +1264,17 @@ Please make sure your boards conform to 
 <contactref element="AUX2" pad="C"/>
 <contactref element="AUX3" pad="C"/>
 <wire x1="2.59" y1="9.6" x2="2.55" y2="9.64" width="0.4064" layer="1"/>
-<wire x1="10.795" y1="9.175" x2="11.745" y2="8.225" width="0.4064" layer="1"/>
 <wire x1="11.775" y1="8.255" x2="11.745" y2="8.225" width="0.4064" layer="1"/>
 <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="38.735" y1="25.4" x2="37.68" y2="25.4" 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"/>
 <contactref element="IC3" pad="3"/>
 <contactref element="IC3" pad="1"/>
 <contactref element="IC3" pad="3"/>
-<wire x1="3.175" y1="12.9" x2="3.175" y2="9.64" width="0.4064" layer="1"/>
-<wire x1="3.175" y1="9.64" x2="2.55" y2="9.64" width="0.4064" layer="1"/>
-<wire x1="3.175" y1="9.64" x2="10.795" y2="9.64" width="0.4064" layer="1"/>
+<wire x1="2.55" 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="28.0425" y2="16.51" width="0.4064" layer="1"/>
@@ -1297,7 +1282,7 @@ Please make sure your boards conform to 
 <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"/>
-<polygon width="0.4064" layer="1">
+<polygon width="0.4064" layer="1" isolate="0.254">
 <vertex x="-2.54" y="57.15"/>
 <vertex x="20.32" y="57.15"/>
 <vertex x="20.32" y="5.08"/>
@@ -1321,7 +1306,6 @@ Please make sure your boards conform to 
 <via x="14.2875" y="6.35" 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.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"/>
@@ -1393,8 +1377,8 @@ Please make sure your boards conform to 
 <via x="22.225" y="37.7825" extent="1-16" drill="0.254"/>
 <wire x1="31.43" y1="43.35" x2="33.3375" y2="43.35" width="0.4064" layer="1"/>
 <wire x1="33.3375" y1="43.35" x2="33.3375" y2="43.4975" width="0.4064" layer="1"/>
-<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"/>
+<via x="38.735" y="28.8925" extent="1-16" drill="0.254"/>
+<wire x1="38.735" y1="28.8925" 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="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"/>
@@ -1440,17 +1424,10 @@ 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"/>
-<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="3.01625" y="26.67" extent="1-16" drill="0.254"/>
+<via x="9.04875" y="28.2575" 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="2.06375" y="26.67" 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"/>
@@ -1482,6 +1459,25 @@ Please make sure your boards conform to 
 <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"/>
+<contactref element="X1" pad="G@1"/>
+<contactref element="X1" pad="G@2"/>
+<contactref element="X1" pad="G@3"/>
+<contactref element="X1" pad="G@4"/>
+<contactref element="X3" pad="G@1"/>
+<contactref element="X3" pad="G@2"/>
+<contactref element="X3" pad="G@3"/>
+<contactref element="X3" pad="G@4"/>
+<contactref element="X1" pad="G@1"/>
+<contactref element="X3" pad="G@1"/>
+<via x="4.92125" y="28.8925" extent="1-16" drill="0.254"/>
+<via x="4.92125" y="29.845" extent="1-16" drill="0.254"/>
+<via x="4.92125" y="30.7975" extent="1-16" drill="0.254"/>
+<via x="6.985" y="29.68625" extent="1-16" drill="0.254"/>
+<via x="6.985" y="30.63875" extent="1-16" drill="0.254"/>
+<via x="6.985" y="31.75" extent="1-16" drill="0.254"/>
+<via x="6.19125" y="32.86125" extent="1-16" drill="0.254"/>
+<via x="5.23875" y="33.49625" extent="1-16" drill="0.254"/>
+<via x="7.9375" y="29.68625" 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"/>
@@ -1704,24 +1700,17 @@ Please make sure your boards conform to 
 </signal>
 <signal name="RFOUT" class="2">
 <contactref element="M2" pad="RFOUT"/>
-<contactref element="X2" pad="1"/>
-<wire x1="16.51" y1="50.8" x2="16.51" y2="46.99" width="0.8128" layer="16"/>
-<wire x1="16.51" y1="46.99" x2="13.97" y2="44.45" width="0.8128" layer="16"/>
-<wire x1="13.97" y1="44.45" x2="4.445" y2="44.45" width="0.8128" layer="16"/>
+<contactref element="X1" pad="1"/>
+<wire x1="2.1154" y1="42.545" x2="9.2075" y2="42.545" width="0.8128" layer="1"/>
+<wire x1="9.2075" y1="42.545" x2="16.51" y2="49.8475" width="0.8128" layer="1"/>
+<wire x1="16.51" y1="49.8475" x2="16.51" y2="50.8" width="0.8128" layer="1"/>
 </signal>
 <signal name="HX1_EN">
 <contactref element="IC2" pad="2"/>
 <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="47.3075" y="52.07" extent="1-16" drill="0.254"/>
 <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="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"/>
@@ -1731,6 +1720,13 @@ Please make sure your boards conform to 
 <contactref element="IC1" pad="32"/>
 <wire x1="33.63" y1="22.31" x2="33.63" y2="30.505" width="0.4064" layer="1"/>
 <wire x1="33.63" y1="30.505" x2="32.7025" y2="31.4325" width="0.4064" layer="1"/>
+<wire x1="34.29" y1="49.2125" x2="35.2425" y2="49.2125" width="0.4064" layer="16"/>
+<wire x1="35.2425" y1="49.2125" x2="35.56" y2="49.53" width="0.4064" layer="16"/>
+<wire x1="35.56" y1="49.53" x2="35.56" y2="51.7525" width="0.4064" layer="16"/>
+<wire x1="35.56" y1="51.7525" x2="35.8775" y2="52.07" width="0.4064" layer="16"/>
+<wire x1="35.8775" y1="52.07" x2="47.3075" y2="52.07" width="0.4064" layer="16"/>
+<wire x1="46.0375" y1="51.65" x2="46.775" y2="51.65" width="0.4064" layer="1"/>
+<wire x1="46.775" y1="51.65" x2="47.3075" y2="52.07" width="0.4064" layer="1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="C8" pad="1"/>
@@ -1782,8 +1778,6 @@ Please make sure your boards conform to 
 <contactref element="R6" pad="2"/>
 <contactref element="R5" pad="2"/>
 <wire x1="14.59" y1="8.89" x2="13.97" y2="8.89" width="0.4064" layer="1"/>
-<wire x1="16.39" y1="10.16" x2="15.86" y2="10.16" width="0.4064" layer="1"/>
-<wire x1="15.86" y1="10.16" x2="14.59" y2="8.89" width="0.4064" layer="1"/>
 <wire x1="9.845" y1="8.225" x2="9.845" y2="7.935" width="0.4064" layer="1"/>
 <wire x1="9.845" y1="7.935" x2="11.43" y2="6.35" width="0.4064" layer="1"/>
 <wire x1="11.43" y1="6.35" x2="12.7" y2="6.35" width="0.4064" layer="1"/>
@@ -1887,6 +1881,9 @@ Please make sure your boards conform to 
 <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"/>
+<wire x1="14.59" y1="8.89" x2="14.59" y2="9.1925" width="0.4064" layer="1"/>
+<wire x1="14.59" y1="9.1925" x2="15.5575" y2="10.16" width="0.4064" layer="1"/>
+<wire x1="15.5575" y1="10.16" x2="16.39" y2="10.16" width="0.4064" layer="1"/>
 </signal>
 <signal name="HX1_EN_5V">
 <contactref element="M2" pad="EN"/>
@@ -1939,11 +1936,13 @@ Please make sure your boards conform to 
 <vertex x="47.3075" y="42.8625"/>
 <vertex x="45.72" y="42.8625"/>
 </polygon>
-<wire x1="46.0375" y1="44.1325" x2="43.4975" y2="44.1325" width="0.8128" layer="16"/>
-<wire x1="43.4975" y1="44.1325" x2="36.83" y2="50.8" width="0.8128" layer="16"/>
+<wire x1="46.0375" y1="44.1325" x2="40.3225" y2="44.1325" width="0.8128" layer="16"/>
+<wire x1="40.3225" y1="44.1325" x2="36.83" y2="47.625" width="0.8128" layer="16"/>
+<wire x1="36.83" y1="47.625" x2="36.83" y2="48.26" width="0.8128" layer="16"/>
 <via x="22.5425" y="33.02" extent="1-16" drill="0.254"/>
 <via x="23.495" y="33.02" extent="1-16" drill="0.254"/>
 <via x="24.4475" y="33.02" extent="1-16" drill="0.254"/>
+<wire x1="36.83" y1="48.26" x2="36.83" y2="50.8" width="0.8128" layer="16"/>
 <wire x1="24.4475" y1="33.02" x2="44.45" y2="33.02" width="0.8128" layer="16"/>
 <wire x1="44.45" y1="33.02" x2="46.99" y2="35.56" width="0.8128" layer="16"/>
 <wire x1="46.99" y1="35.56" x2="46.99" y2="43.18" width="0.8128" layer="16"/>
@@ -1957,8 +1956,7 @@ Please make sure your boards conform to 
 <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"/>
+<wire x1="33.3375" y1="48.26" x2="36.83" y2="48.26" width="0.4064" layer="16"/>
 </signal>
 <signal name="HX1_TX_5V">
 <contactref element="M2" pad="TXD"/>
@@ -2006,10 +2004,10 @@ Please make sure your boards conform to 
 <signal name="BUZZ">
 <contactref element="IC1" pad="30"/>
 <contactref element="R22" pad="1"/>
-<via x="27.94" y="43.18" extent="1-16" drill="0.254"/>
+<via x="28.2575" y="42.8625" extent="1-16" drill="0.254"/>
 <wire x1="26.67" y1="43.6" x2="27.52" y2="43.6" width="0.4064" layer="1"/>
-<wire x1="27.52" y1="43.6" x2="27.94" y2="43.18" width="0.4064" layer="1"/>
-<wire x1="27.94" y1="43.18" x2="33.655" y2="37.465" width="0.4064" layer="16"/>
+<wire x1="27.52" y1="43.6" x2="28.2575" y2="42.8625" width="0.4064" layer="1"/>
+<wire x1="28.2575" y1="42.8625" x2="33.655" y2="37.465" width="0.4064" layer="16"/>
 <via x="33.655" y="37.465" extent="1-16" drill="0.254"/>
 <wire x1="33.655" y1="37.465" x2="33.655" y2="31.4325" width="0.4064" layer="1"/>
 <wire x1="33.655" y1="31.4325" x2="34.29" y2="30.7975" width="0.4064" layer="1"/>
@@ -2087,12 +2085,6 @@ Please make sure your boards conform to 
 <vertex x="23.495" y="41.5925"/>
 </polygon>
 <via x="25.0825" y="43.18" extent="1-16" drill="0.254"/>
-<wire x1="30.71" y1="48.875" x2="30.71" y2="50.57" width="0.8128" layer="16"/>
-<wire x1="30.71" y1="50.57" x2="29.21" y2="52.07" width="0.8128" layer="16"/>
-<wire x1="29.21" y1="52.07" x2="27.94" y2="52.07" width="0.8128" layer="16"/>
-<wire x1="27.94" y1="52.07" x2="26.67" y2="50.8" width="0.8128" layer="16"/>
-<wire x1="26.67" y1="50.8" x2="26.67" y2="44.7675" width="0.8128" layer="16"/>
-<wire x1="26.67" y1="44.7675" x2="25.0825" y2="43.18" width="0.8128" layer="16"/>
 <wire x1="25.4" y1="41.91" x2="33.3375" y2="41.91" width="0.8128" layer="1"/>
 <wire x1="33.3375" y1="41.91" x2="34.6075" y2="40.64" width="0.8128" layer="1"/>
 <wire x1="34.6075" y1="40.64" x2="34.6075" y2="36.83" width="0.8128" layer="1"/>
@@ -2111,6 +2103,14 @@ Please make sure your boards conform to 
 <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"/>
+<wire x1="30.71" y1="48.875" x2="30.71" y2="47.22" width="0.8128" layer="16"/>
+<wire x1="30.71" y1="47.22" x2="26.67" y2="43.18" width="0.8128" layer="16"/>
+<wire x1="26.67" y1="43.18" x2="25.0825" y2="43.18" width="0.8128" layer="16"/>
+<wire x1="25.0825" y1="43.18" x2="25.0825" y2="41.91" width="0.8128" layer="16"/>
+<wire x1="25.0825" y1="41.91" x2="23.8125" y2="41.91" width="0.8128" layer="16"/>
+<wire x1="25.0825" y1="43.18" x2="23.8125" y2="43.18" width="0.8128" layer="16"/>
+<wire x1="23.8125" y1="43.18" x2="23.8125" y2="41.91" width="0.8128" layer="16"/>
+<wire x1="23.8125" y1="41.91" x2="25.0825" y2="43.18" width="0.8128" layer="16"/>
 </signal>
 <signal name="N$4">
 <contactref element="5V_SWITCHING" pad="3"/>
@@ -2149,23 +2149,27 @@ Please make sure your boards conform to 
 <contactref element="U3" pad="8"/>
 <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="26.6925" x2="6.4525" y2="26.67" width="0.4064" layer="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"/>
 <contactref element="R23" pad="2"/>
-<wire x1="7.635" y1="28.575" x2="7.635" y2="27.1875" width="0.4064" layer="1"/>
-<wire x1="7.635" y1="27.1875" x2="7.835" y2="26.9875" width="0.4064" layer="1"/>
+<wire x1="8.11125" y1="28.2575" x2="8.11125" y2="27.02875" width="0.4064" layer="1"/>
+<wire x1="8.11125" y1="27.02875" x2="8.1525" y2="26.67" width="0.4064" layer="1"/>
 </signal>
 <signal name="N$31">
 <contactref element="U3" pad="11"/>
 <contactref element="L5" pad="1"/>
-<contactref element="X5" pad="1"/>
-<wire x1="4.445" y1="33.655" x2="4.445" y2="28.575" width="0.4064" layer="1"/>
-<wire x1="4.445" y1="28.575" x2="4.445" y2="24.87" width="0.4064" layer="1"/>
 <wire x1="4.445" y1="24.87" x2="4.275" y2="24.7" width="0.4064" layer="1"/>
-<wire x1="6.335" y1="28.575" x2="4.445" y2="28.575" width="0.4064" layer="1"/>
+<contactref element="X3" pad="1"/>
+<wire x1="2.1154" y1="32.385" x2="5.08" y2="32.385" width="0.6096" layer="1"/>
+<wire x1="5.08" y1="32.385" x2="6.0325" y2="31.4325" width="0.6096" layer="1"/>
+<wire x1="6.0325" y1="31.4325" x2="6.0325" y2="28.2575" width="0.6096" layer="1"/>
+<wire x1="4.28625" y1="24.765" x2="4.28625" y2="26.51125" width="0.6096" layer="1"/>
+<wire x1="4.28625" y1="26.51125" x2="6.0325" y2="28.2575" width="0.6096" layer="1"/>
+<wire x1="6.0325" y1="28.2575" x2="6.81125" y2="28.2575" width="0.6096" layer="1"/>
+<wire x1="4.28625" y1="24.765" x2="4.275" y2="24.7" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="UBX_SCL">
 <contactref element="U3" pad="19"/>
@@ -2185,10 +2189,6 @@ Please make sure your boards conform to 
 <contactref element="U3" pad="22"/>
 <contactref element="R3" pad="1"/>
 <contactref element="D2" pad="1"/>
-<wire x1="14.09" y1="10.16" x2="14.9225" y2="10.16" width="0.4064" layer="1"/>
-<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.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"/>
@@ -2198,14 +2198,16 @@ Please make sure your boards conform to 
 <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"/>
+<wire x1="14.975" y1="12.9" x2="14.975" y2="11.045" width="0.4064" layer="1"/>
+<wire x1="14.975" y1="11.045" x2="14.09" y2="10.16" width="0.4064" layer="1"/>
 </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="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="19.05" y1="8.04" x2="19.05" y2="6.35" width="0.4064" layer="1"/>
+<wire x1="19.05" y1="6.35" x2="18.415" y2="5.715" width="0.4064" layer="1"/>
+<wire x1="18.415" 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">
@@ -2272,11 +2274,11 @@ Please make sure your boards conform to 
 <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"/>
+<wire x1="9.525" y1="31.75" x2="9.525" y2="28.8925" width="0.4064" layer="16"/>
+<wire x1="9.525" y1="28.8925" x2="10.16" y2="28.2575" width="0.4064" layer="16"/>
+<wire x1="10.16" y1="28.2575" x2="26.035" y2="28.2575" width="0.4064" layer="16"/>
+<wire x1="26.035" y1="28.2575" x2="30.48" y2="23.8125" width="0.4064" layer="16"/>
+<wire x1="30.48" y1="23.8125" x2="34.29" y2="23.8125" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$36">
 <contactref element="Q9" pad="C"/>
@@ -2293,10 +2295,12 @@ Please make sure your boards conform to 
 <signal name="N$38">
 <contactref element="Q9" pad="B"/>
 <contactref element="10K" pad="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"/>
+<wire x1="10.4775" y1="40.22" x2="10.4775" y2="41.5925" width="0.4064" layer="1"/>
+<wire x1="10.4775" y1="41.5925" x2="10.795" y2="41.91" width="0.4064" layer="1"/>
+<wire x1="10.795" y1="41.91" x2="13.6525" y2="41.91" width="0.4064" layer="1"/>
+<wire x1="13.6525" y1="41.91" x2="13.97" y2="41.5925" width="0.4064" layer="1"/>
+<wire x1="13.97" y1="41.5925" x2="13.97" y2="40.4725" width="0.4064" layer="1"/>
+<wire x1="13.97" y1="40.4725" x2="13.9675" y2="40.47" width="0.4064" layer="1"/>
 </signal>
 <signal name="ASSOCLED">
 <contactref element="U$2" pad="15"/>
@@ -2319,9 +2323,9 @@ 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="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="15.89" y1="8.89" x2="17.78" y2="8.89" width="0.4064" layer="1"/>
+<wire x1="17.78" y1="8.89" x2="18.0975" y2="9.2075" width="0.4064" layer="1"/>
+<wire x1="18.0975" y1="9.2075" 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.78" y2="11.1125" width="0.4064" layer="1"/>