# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2015-02-17 23:35:53
# Node ID 34b14f6c5594861c884eb7bdf3685b89b23b6598
# Parent  5ccc9322c417841d389952cf354226d694de9a76

Routing fix

diff --git a/CAM/hab.GBL b/CAM/hab.GBL
--- a/CAM/hab.GBL
+++ b/CAM/hab.GBL
@@ -11,11 +11,16 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD11R,0.0394X0.0787*%
 %ADD12R,0.0709X0.0276*%
 %ADD13R,0.0709X0.0315*%
-%ADD14R,0.0500X0.1000*%
+%ADD14R,0.1000X0.0500*%
 %ADD15R,0.0320X0.0350*%
-%ADD16C,0.0100*%
-%ADD17C,0.0270*%
-%ADD18C,0.0080*%
+%ADD16R,0.0244X0.0480*%
+%ADD17R,0.0276X0.0354*%
+%ADD18R,0.0787X0.0472*%
+%ADD19R,0.0315X0.0472*%
+%ADD20C,0.0100*%
+%ADD21C,0.0270*%
+%ADD22C,0.0080*%
+%ADD23C,0.0120*%
 D10*
 X009958Y013875D02*
 X013333Y013875D01*
@@ -206,29 +211,97 @@ X013852Y015312D03*
 X013852Y014879D03*
 X013852Y014445D03*
 D14*
-X013833Y010000D03*
-X017583Y010000D03*
+X017302Y011906D03*
+X017302Y010938D03*
 D15*
-X016583Y010250D03*
-X016083Y010250D03*
-X015583Y010250D03*
-X015083Y010250D03*
+X016583Y010000D03*
+X016083Y010000D03*
+X015583Y010000D03*
+X015083Y010000D03*
 D16*
-X015233Y010535D02*
-X015233Y010638D01*
-X015145Y010726D01*
-X015012Y010860D01*
-X014828Y010860D01*
-X014793Y010895D01*
-X014793Y011760D01*
-X014583Y011970D01*
-X013875Y011970D01*
-X013875Y012885D01*
-X015430Y012885D01*
-X015520Y012975D01*
-X015608Y013063D01*
-X015608Y014552D01*
-X015524Y014637D01*
+X015458Y011562D03*
+X015832Y011562D03*
+X016206Y011566D03*
+X016206Y012594D03*
+X015832Y012594D03*
+X015458Y012594D03*
+D17*
+X015265Y010938D03*
+X015777Y010938D03*
+D18*
+X014583Y011433D03*
+X014583Y012692D03*
+D19*
+X015323Y013250D03*
+X016031Y013250D03*
+D20*
+X016031Y013177D01*
+X016208Y013000D01*
+X016206Y012998D01*
+X016206Y012594D01*
+X016438Y012622D02*
+X016949Y012622D01*
+X016932Y012580D02*
+X016932Y012483D01*
+X016969Y012392D01*
+X017038Y012324D01*
+X017128Y012286D01*
+X017226Y012286D01*
+X017316Y012324D01*
+X017385Y012392D01*
+X017422Y012483D01*
+X017422Y012580D01*
+X017385Y012670D01*
+X017337Y012718D01*
+X017337Y012816D01*
+X017243Y012910D01*
+X016743Y013410D01*
+X016299Y013410D01*
+X016961Y013410D01*
+X016863Y013509D02*
+X016299Y013509D01*
+X016299Y013532D02*
+X016234Y013596D01*
+X015828Y013596D01*
+X015764Y013532D01*
+X015764Y012984D01*
+X015691Y012984D01*
+X015652Y012974D01*
+X015619Y012955D01*
+X015620Y012956D01*
+X015630Y012994D01*
+X015630Y013221D01*
+X015351Y013221D01*
+X015351Y013279D01*
+X015294Y013279D01*
+X015294Y013636D01*
+X015171Y013636D01*
+X015171Y015374D01*
+X015284Y015488D01*
+X015366Y015488D01*
+X015456Y015525D01*
+X015501Y015570D01*
+X015546Y015525D01*
+X015636Y015488D01*
+X015717Y015488D01*
+X015902Y015303D01*
+X015820Y015269D01*
+X015751Y015200D01*
+X015713Y015110D01*
+X015713Y015028D01*
+X015710Y015025D01*
+X015655Y015025D01*
+X015597Y015083D01*
+X015507Y015120D01*
+X015410Y015120D01*
+X015320Y015083D01*
+X015251Y015014D01*
+X015213Y014924D01*
+X015213Y014826D01*
+X015251Y014736D01*
+X015320Y014667D01*
+X015410Y014630D01*
+X015507Y014630D01*
 X015597Y014667D01*
 X015655Y014725D01*
 X015834Y014725D01*
@@ -256,293 +329,347 @@ X017496Y012571D01*
 X017438Y012514D01*
 X017401Y012424D01*
 X017401Y012326D01*
-X017438Y012236D01*
-X017507Y012167D01*
-X017597Y012130D01*
-X017695Y012130D01*
-X017777Y012164D01*
-X017777Y012156D01*
-X016870Y011248D01*
-X016870Y011135D01*
-X016812Y011078D01*
-X016775Y010987D01*
-X016775Y010890D01*
-X016812Y010800D01*
-X016881Y010731D01*
-X016971Y010694D01*
-X017068Y010694D01*
-X017158Y010731D01*
-X017227Y010800D01*
-X017265Y010890D01*
-X017265Y010987D01*
-X017227Y011078D01*
-X017175Y011130D01*
-X017933Y011888D01*
-X017933Y011099D01*
-X017882Y011120D01*
-X017785Y011120D01*
-X017695Y011083D01*
-X017626Y011014D01*
-X017588Y010924D01*
-X017588Y010842D01*
-X017558Y010812D01*
-X017558Y010610D01*
-X017288Y010610D01*
-X017223Y010546D01*
-X017223Y010400D01*
-X016853Y010400D01*
-X016853Y010471D01*
-X016789Y010535D01*
-X016378Y010535D01*
-X016362Y010519D01*
-X016335Y010545D01*
-X016301Y010565D01*
-X016263Y010575D01*
-X016113Y010575D01*
-X016113Y010280D01*
-X016053Y010280D01*
-X016053Y010575D01*
-X015904Y010575D01*
-X015865Y010565D01*
-X015831Y010545D01*
-X015805Y010519D01*
-X015789Y010535D01*
-X015378Y010535D01*
-X015333Y010491D01*
-X015289Y010535D01*
-X015233Y010535D01*
-X015233Y010554D02*
-X015846Y010554D01*
-X016053Y010554D02*
-X016113Y010554D01*
-X016113Y010455D02*
-X016053Y010455D01*
-X016053Y010357D02*
-X016113Y010357D01*
-X016113Y010220D02*
-X016113Y009925D01*
-X016263Y009925D01*
-X016301Y009935D01*
-X016335Y009955D01*
-X016362Y009981D01*
-X016378Y009965D01*
-X016789Y009965D01*
-X016853Y010029D01*
-X016853Y010100D01*
-X017223Y010100D01*
-X017223Y009525D01*
-X014233Y009525D01*
-X014233Y009950D01*
-X013883Y009950D01*
-X013883Y010050D01*
-X013783Y010050D01*
-X013783Y010650D01*
-X013564Y010650D01*
-X013525Y010640D01*
-X013491Y010620D01*
-X013483Y010612D01*
-X013483Y011168D01*
-X013540Y011111D01*
-X014308Y011111D01*
-X014308Y010739D01*
-X014612Y010435D01*
-X014612Y010062D01*
-X014612Y009938D01*
-X014673Y009877D01*
-X014761Y009789D01*
-X015334Y009789D01*
-X015422Y009877D01*
-X015510Y009965D01*
-X015789Y009965D01*
-X015805Y009981D01*
-X015831Y009955D01*
-X015865Y009935D01*
-X015904Y009925D01*
-X016053Y009925D01*
-X016053Y010220D01*
-X016113Y010220D01*
-X016113Y010160D02*
-X016053Y010160D01*
-X016053Y010061D02*
-X016113Y010061D01*
+X017426Y012266D01*
+X016757Y012266D01*
+X016692Y012202D01*
+X016692Y012129D01*
+X016236Y012129D01*
+X016142Y012035D01*
+X016046Y011939D01*
+X016046Y011916D01*
+X016039Y011916D01*
+X016017Y011895D01*
+X016000Y011912D01*
+X015665Y011912D01*
+X015645Y011893D01*
+X015626Y011912D01*
+X015291Y011912D01*
+X015226Y011848D01*
+X015226Y011603D01*
+X015087Y011603D01*
+X015087Y011714D01*
+X015023Y011779D01*
+X014144Y011779D01*
+X014080Y011714D01*
+X014080Y011151D01*
+X014144Y011086D01*
+X014977Y011086D01*
+X014977Y010956D01*
+X015246Y010956D01*
+X015246Y010919D01*
+X014977Y010919D01*
+X014977Y010741D01*
+X014987Y010702D01*
+X015007Y010668D01*
+X015035Y010640D01*
+X015069Y010621D01*
+X015107Y010610D01*
+X015246Y010610D01*
+X015246Y010919D01*
+X015284Y010919D01*
+X015284Y010610D01*
+X015422Y010610D01*
+X015461Y010621D01*
+X015495Y010640D01*
+X015523Y010668D01*
+X015542Y010702D01*
+X015593Y010650D01*
+X015960Y010650D01*
+X016025Y010715D01*
+X016025Y011160D01*
+X016002Y011182D01*
+X016002Y011214D01*
+X016021Y011233D01*
+X016039Y011216D01*
+X016374Y011216D01*
+X016438Y011280D01*
+X016438Y011809D01*
+X016692Y011809D01*
+X016692Y011611D01*
+X016757Y011546D01*
+X017777Y011546D01*
+X017777Y011337D01*
+X017352Y011337D01*
+X017352Y010988D01*
+X017252Y010988D01*
+X017252Y011337D01*
+X016782Y011337D01*
+X016744Y011327D01*
+X016710Y011308D01*
+X016682Y011280D01*
+X016662Y011245D01*
+X016652Y011207D01*
+X016652Y010987D01*
+X017252Y010987D01*
+X017252Y010888D01*
+X016652Y010888D01*
+X016652Y010668D01*
+X016662Y010630D01*
+X016682Y010595D01*
+X016710Y010567D01*
+X016744Y010548D01*
+X016782Y010538D01*
+X017252Y010537D01*
+X017252Y010887D01*
+X017352Y010887D01*
+X017352Y010538D01*
+X017594Y010538D01*
+X017427Y010371D01*
+X017346Y010371D01*
+X017256Y010334D01*
+X017187Y010265D01*
+X017150Y010175D01*
+X017150Y010078D01*
+X017171Y010025D01*
+X016853Y010025D01*
+X016853Y010221D01*
+X016789Y010285D01*
+X016378Y010285D01*
+X016362Y010269D01*
+X016335Y010295D01*
+X016301Y010315D01*
+X016263Y010325D01*
+X016113Y010325D01*
+X016113Y010030D01*
+X016053Y010030D01*
+X016053Y010325D01*
+X015904Y010325D01*
+X015865Y010315D01*
+X015831Y010295D01*
+X015805Y010269D01*
+X015789Y010285D01*
+X015378Y010285D01*
+X015333Y010241D01*
+X015289Y010285D01*
+X014878Y010285D01*
+X014813Y010221D01*
+X014813Y010025D01*
+X013900Y010025D01*
+X013875Y010050D01*
+X013875Y012885D01*
+X014080Y012885D01*
+X014080Y012411D01*
+X014144Y012346D01*
+X015023Y012346D01*
+X015087Y012411D01*
+X015087Y012522D01*
+X015226Y012522D01*
+X015226Y012308D01*
+X015291Y012244D01*
+X015608Y012244D01*
+X015618Y012234D01*
+X015652Y012214D01*
+X015691Y012204D01*
+X015821Y012204D01*
+X015821Y012583D01*
+X015843Y012583D01*
+X015843Y012204D01*
+X015974Y012204D01*
+X016012Y012214D01*
+X016046Y012234D01*
+X016057Y012244D01*
+X016374Y012244D01*
+X016438Y012308D01*
+X016438Y012879D01*
+X016374Y012944D01*
+X016368Y012944D01*
+X016368Y013066D01*
+X016345Y013090D01*
+X016611Y013090D01*
+X017000Y012701D01*
+X016969Y012670D01*
+X016932Y012580D01*
+X016932Y012524D02*
+X016438Y012524D01*
+X016438Y012425D02*
+X016956Y012425D01*
+X017035Y012327D02*
+X016438Y012327D01*
+X016302Y011969D02*
+X016206Y011873D01*
+X016206Y011566D01*
+X016438Y011539D02*
+X017777Y011539D01*
+X017777Y011440D02*
+X016438Y011440D01*
+X016438Y011342D02*
+X017777Y011342D01*
+X017352Y011243D02*
+X017252Y011243D01*
+X017252Y011145D02*
+X017352Y011145D01*
+X017352Y011046D02*
+X017252Y011046D01*
+X017252Y010948D02*
+X016025Y010948D01*
+X016025Y011046D02*
+X016652Y011046D01*
+X016652Y011145D02*
+X016025Y011145D01*
+X016025Y010849D02*
+X016652Y010849D01*
+X016652Y010751D02*
+X016025Y010751D01*
+X015962Y010652D02*
+X016656Y010652D01*
+X016734Y010554D02*
+X013875Y010554D01*
+X013875Y010652D02*
+X015023Y010652D01*
+X014977Y010751D02*
+X013875Y010751D01*
+X013875Y010849D02*
+X014977Y010849D01*
+X014977Y011046D02*
+X013875Y011046D01*
+X013875Y010948D02*
+X015246Y010948D01*
+X015246Y010849D02*
+X015284Y010849D01*
+X015284Y010751D02*
+X015246Y010751D01*
+X015246Y010652D02*
+X015284Y010652D01*
+X015507Y010652D02*
+X015592Y010652D01*
+X015351Y010258D02*
+X015316Y010258D01*
+X014851Y010258D02*
+X013875Y010258D01*
+X013875Y010160D02*
+X014813Y010160D01*
+X014813Y010061D02*
+X013875Y010061D01*
+X013875Y010357D02*
+X017310Y010357D01*
+X017184Y010258D02*
+X016816Y010258D01*
+X016853Y010160D02*
+X017150Y010160D01*
+X017156Y010061D02*
+X016853Y010061D01*
+X016799Y009725D02*
+X017770Y009725D01*
+X017800Y009755D01*
+X017882Y009755D01*
+X017933Y009776D01*
+X017933Y009625D01*
+X017930Y009599D01*
+X017903Y009554D01*
+X017858Y009528D01*
+X017832Y009525D01*
+X017832Y009525D01*
+X017770Y009525D01*
+X017770Y009525D01*
+X013583Y009525D01*
+X013557Y009528D01*
+X013513Y009554D01*
+X013487Y009599D01*
+X013483Y009625D01*
+X013483Y009638D01*
+X013582Y009539D01*
+X015334Y009539D01*
+X015422Y009627D01*
+X015510Y009715D01*
+X015789Y009715D01*
+X015805Y009731D01*
+X015831Y009705D01*
+X015865Y009685D01*
+X015904Y009675D01*
+X016053Y009675D01*
+X016053Y009970D01*
+X016113Y009970D01*
+X016113Y009675D01*
+X016263Y009675D01*
+X016301Y009685D01*
+X016335Y009705D01*
+X016362Y009731D01*
+X016378Y009715D01*
+X016789Y009715D01*
+X016799Y009725D01*
+X016113Y009766D02*
+X016053Y009766D01*
+X016053Y009864D02*
+X016113Y009864D01*
 X016113Y009963D02*
 X016053Y009963D01*
-X016343Y009963D02*
-X017223Y009963D01*
-X017223Y010061D02*
-X016853Y010061D01*
-X016853Y010455D02*
-X017223Y010455D01*
-X017231Y010554D02*
-X016321Y010554D01*
-X016792Y010849D02*
-X015023Y010849D01*
-X015121Y010751D02*
-X016861Y010751D01*
-X016775Y010948D02*
-X014793Y010948D01*
-X014793Y011046D02*
-X016799Y011046D01*
-X016870Y011145D02*
-X014793Y011145D01*
-X014793Y011243D02*
-X016870Y011243D01*
-X016963Y011342D02*
-X014793Y011342D01*
-X014793Y011440D02*
-X017061Y011440D01*
-X017160Y011539D02*
-X014793Y011539D01*
-X014793Y011637D02*
-X017258Y011637D01*
-X017357Y011736D02*
-X014793Y011736D01*
-X014719Y011834D02*
-X017455Y011834D01*
-X017554Y011933D02*
-X014620Y011933D01*
-X014459Y011670D02*
-X014493Y011635D01*
-X014493Y011377D01*
-X014459Y011411D01*
-X013691Y011411D01*
-X013691Y011703D01*
-X013724Y011670D01*
-X014459Y011670D01*
-X014492Y011637D02*
-X013691Y011637D01*
-X013691Y011539D02*
-X014493Y011539D01*
-X014493Y011440D02*
-X013691Y011440D01*
-X013507Y011145D02*
-X013483Y011145D01*
-X013483Y011046D02*
-X014308Y011046D01*
-X014308Y010948D02*
-X013483Y010948D01*
-X013483Y010849D02*
-X014308Y010849D01*
-X014308Y010751D02*
-X013483Y010751D01*
-X013483Y010652D02*
-X014395Y010652D01*
-X014494Y010554D02*
-X014224Y010554D01*
-X014223Y010558D02*
-X014203Y010592D01*
-X014175Y010620D01*
-X014141Y010640D01*
-X014103Y010650D01*
-X013883Y010650D01*
-X013883Y010050D01*
-X014233Y010050D01*
-X014233Y010520D01*
-X014223Y010558D01*
-X014233Y010455D02*
-X014592Y010455D01*
-X014612Y010357D02*
-X014233Y010357D01*
-X014233Y010258D02*
-X014612Y010258D01*
-X014612Y010160D02*
-X014233Y010160D01*
-X014233Y010061D02*
-X014612Y010061D01*
-X014612Y009963D02*
-X013883Y009963D01*
-X013883Y010061D02*
-X013783Y010061D01*
-X013783Y010160D02*
-X013883Y010160D01*
-X013883Y010258D02*
-X013783Y010258D01*
-X013783Y010357D02*
-X013883Y010357D01*
-X013883Y010455D02*
-X013783Y010455D01*
-X013783Y010554D02*
-X013883Y010554D01*
-X014233Y009864D02*
-X014686Y009864D01*
-X014233Y009766D02*
-X017223Y009766D01*
-X017223Y009864D02*
-X015409Y009864D01*
-X015422Y009877D02*
-X015422Y009877D01*
-X015508Y009963D02*
-X015824Y009963D01*
-X015220Y010652D02*
-X017558Y010652D01*
-X017558Y010751D02*
-X017178Y010751D01*
-X017248Y010849D02*
-X017588Y010849D01*
-X017598Y010948D02*
-X017265Y010948D01*
-X017240Y011046D02*
-X017658Y011046D01*
-X017933Y011145D02*
-X017190Y011145D01*
-X017288Y011243D02*
-X017933Y011243D01*
-X017933Y011342D02*
-X017387Y011342D01*
-X017485Y011440D02*
-X017933Y011440D01*
-X017933Y011539D02*
-X017584Y011539D01*
-X017682Y011637D02*
-X017933Y011637D01*
-X017933Y011736D02*
-X017781Y011736D01*
-X017879Y011834D02*
-X017933Y011834D01*
-X017652Y012031D02*
-X013875Y012031D01*
-X013875Y012130D02*
-X017751Y012130D01*
-X017446Y012228D02*
-X013875Y012228D01*
-X013875Y012327D02*
-X017401Y012327D01*
-X017401Y012425D02*
-X013875Y012425D01*
-X013875Y012524D02*
-X017448Y012524D01*
-X017496Y012622D02*
-X013875Y012622D01*
-X013875Y012721D02*
-X017496Y012721D01*
-X017496Y012819D02*
-X013875Y012819D01*
-X013483Y013251D02*
+X016053Y010061D02*
+X016113Y010061D01*
+X016113Y010160D02*
+X016053Y010160D01*
+X016053Y010258D02*
+X016113Y010258D01*
+X015462Y009667D02*
+X017933Y009667D01*
+X017933Y009766D02*
+X017907Y009766D01*
+X017912Y009569D02*
+X015364Y009569D01*
+X014086Y011145D02*
+X013875Y011145D01*
+X013875Y011243D02*
+X014080Y011243D01*
+X014080Y011342D02*
+X013875Y011342D01*
+X013875Y011440D02*
+X014080Y011440D01*
+X014080Y011539D02*
+X013875Y011539D01*
+X013875Y011637D02*
+X014080Y011637D01*
+X014101Y011736D02*
+X013875Y011736D01*
+X013875Y011834D02*
+X015226Y011834D01*
+X015226Y011736D02*
+X015066Y011736D01*
+X015087Y011637D02*
+X015226Y011637D01*
+X015226Y012327D02*
+X013875Y012327D01*
+X013875Y012425D02*
+X014080Y012425D01*
+X014080Y012524D02*
+X013875Y012524D01*
+X013875Y012622D02*
+X014080Y012622D01*
+X014080Y012721D02*
+X013875Y012721D01*
+X013875Y012819D02*
+X014080Y012819D01*
+X014167Y013369D02*
 X013601Y013369D01*
-X014167Y013369D01*
-X014137Y013381D01*
-X014068Y013450D01*
-X014031Y013540D01*
-X014031Y013637D01*
-X014068Y013728D01*
+X013483Y013251D01*
+X013483Y013744D01*
+X013833Y013744D01*
+X013833Y014013D01*
+X013871Y014013D01*
+X013871Y013744D01*
 X014085Y013744D01*
-X013871Y013744D01*
-X013871Y014013D01*
-X013833Y014013D01*
-X013833Y013744D01*
-X013483Y013744D01*
-X013483Y013251D01*
+X014068Y013728D01*
+X014031Y013637D01*
+X014031Y013540D01*
+X014068Y013450D01*
+X014137Y013381D01*
+X014167Y013369D01*
+X014108Y013410D02*
+X013483Y013410D01*
 X013483Y013312D02*
 X013544Y013312D01*
-X013483Y013410D02*
-X014108Y013410D01*
-X014044Y013509D02*
-X013483Y013509D01*
-X013483Y013607D02*
-X014031Y013607D01*
-X014059Y013706D02*
-X013483Y013706D01*
-X013407Y014013D02*
+X013483Y013509D02*
+X014044Y013509D01*
+X014031Y013607D02*
+X013483Y013607D01*
+X013483Y013706D02*
+X014059Y013706D01*
+X013871Y013804D02*
+X013833Y013804D01*
+X013833Y013903D02*
+X013871Y013903D01*
+X013871Y014001D02*
+X013833Y014001D01*
+X013833Y014013D02*
+X013407Y014013D01*
 X013395Y014025D01*
 X013333Y014025D01*
 X013333Y014286D01*
@@ -554,47 +681,7 @@ X013348Y014190D01*
 X013348Y014051D01*
 X013833Y014051D01*
 X013833Y014013D01*
-X013407Y014013D01*
-X013348Y014100D02*
-X013333Y014100D01*
-X013333Y014198D02*
-X013350Y014198D01*
-X013333Y014586D02*
-X013333Y014850D01*
-X013395Y014850D01*
-X013453Y014907D01*
-X013823Y014907D01*
-X013823Y014850D01*
-X013348Y014850D01*
-X013348Y014701D01*
-X013358Y014663D01*
-X013378Y014629D01*
-X013388Y014619D01*
-X013388Y014586D01*
-X013333Y014586D01*
-X013333Y014592D02*
-X013388Y014592D01*
-X013351Y014691D02*
-X013333Y014691D01*
-X013333Y014789D02*
-X013348Y014789D01*
-X013433Y014888D02*
-X013823Y014888D01*
-X013881Y014888D02*
-X014359Y014888D01*
-X014339Y014907D02*
-X014558Y014688D01*
-X014558Y014563D01*
-X014646Y014475D01*
-X014808Y014313D01*
-X014808Y013739D01*
-X014472Y013739D01*
-X014415Y013796D01*
-X014341Y013827D01*
-X014346Y013836D01*
-X014356Y013875D01*
-X014356Y014013D01*
-X013871Y014013D01*
+X013871Y014013D02*
 X013871Y014051D01*
 X014356Y014051D01*
 X014356Y014190D01*
@@ -609,73 +696,114 @@ X014356Y014850D01*
 X013881Y014850D01*
 X013881Y014907D01*
 X014339Y014907D01*
-X014356Y014789D02*
-X014457Y014789D01*
-X014556Y014691D02*
-X014353Y014691D01*
-X014316Y014592D02*
-X014558Y014592D01*
-X014628Y014494D02*
-X014316Y014494D01*
-X014316Y014395D02*
-X014726Y014395D01*
-X014808Y014297D02*
-X014316Y014297D01*
-X014354Y014198D02*
-X014808Y014198D01*
-X014808Y014100D02*
-X014356Y014100D01*
+X014433Y014813D01*
+X014433Y013778D01*
+X014415Y013796D01*
+X014341Y013827D01*
+X014346Y013836D01*
+X014356Y013875D01*
+X014356Y014013D01*
+X013871Y014013D01*
+X014316Y014297D02*
+X014433Y014297D01*
+X014433Y014395D02*
+X014316Y014395D01*
+X014316Y014494D02*
+X014433Y014494D01*
+X014433Y014592D02*
+X014316Y014592D01*
+X014353Y014691D02*
+X014433Y014691D01*
+X014433Y014789D02*
+X014356Y014789D01*
+X014359Y014888D02*
+X013881Y014888D01*
+X013823Y014888D02*
+X013433Y014888D01*
+X013453Y014907D02*
+X013395Y014850D01*
+X013333Y014850D01*
+X013333Y014586D01*
+X013388Y014586D01*
+X013388Y014619D01*
+X013378Y014629D01*
+X013358Y014663D01*
+X013348Y014701D01*
+X013348Y014850D01*
+X013823Y014850D01*
+X013823Y014907D01*
+X013453Y014907D01*
+X013348Y014789D02*
+X013333Y014789D01*
+X013333Y014691D02*
+X013351Y014691D01*
+X013333Y014592D02*
+X013388Y014592D01*
+X013350Y014198D02*
+X013333Y014198D01*
+X013333Y014100D02*
+X013348Y014100D01*
+X014356Y014100D02*
+X014433Y014100D01*
+X014433Y014198D02*
+X014354Y014198D01*
 X014356Y014001D02*
-X014808Y014001D01*
-X014808Y013903D02*
+X014433Y014001D01*
+X014433Y013903D02*
 X014356Y013903D01*
 X014396Y013804D02*
-X014808Y013804D01*
-X015608Y013804D02*
+X014433Y013804D01*
+X015171Y013804D02*
 X016621Y013804D01*
 X016621Y013903D02*
-X015608Y013903D01*
-X015608Y014001D02*
+X015171Y013903D01*
+X015171Y014001D02*
 X016621Y014001D01*
 X016621Y014100D02*
-X015608Y014100D01*
-X015608Y014198D02*
+X015171Y014100D01*
+X015171Y014198D02*
 X016621Y014198D01*
 X016621Y014297D02*
 X016601Y014297D01*
 X016315Y014297D02*
-X015608Y014297D01*
-X015608Y014395D02*
+X015171Y014297D01*
+X015171Y014395D02*
 X016237Y014395D01*
 X016213Y014494D02*
-X015608Y014494D01*
-X015568Y014592D02*
+X015171Y014494D01*
+X015171Y014592D02*
 X016231Y014592D01*
 X016302Y014691D02*
 X015620Y014691D01*
 X015898Y014789D02*
 X016137Y014789D01*
-X015608Y013706D02*
-X016666Y013706D01*
-X016764Y013607D02*
-X015608Y013607D01*
-X015608Y013509D02*
-X016863Y013509D01*
-X016961Y013410D02*
-X015608Y013410D01*
-X015608Y013312D02*
-X017060Y013312D01*
-X017158Y013213D02*
-X015608Y013213D01*
-X015608Y013115D02*
-X017257Y013115D01*
-X017355Y013016D02*
-X015561Y013016D01*
-X015463Y012918D02*
-X017454Y012918D01*
-X014627Y015873D02*
-X014316Y015873D01*
-X014316Y015948D02*
+X015713Y015085D02*
+X015593Y015085D01*
+X015744Y015183D02*
+X015171Y015183D01*
+X015171Y015085D02*
+X015324Y015085D01*
+X015239Y014986D02*
+X015171Y014986D01*
+X015171Y014888D02*
+X015213Y014888D01*
+X015229Y014789D02*
+X015171Y014789D01*
+X015171Y014691D02*
+X015296Y014691D01*
+X015171Y015282D02*
+X015850Y015282D01*
+X015825Y015380D02*
+X015177Y015380D01*
+X015275Y015479D02*
+X015726Y015479D01*
+X015021Y016267D02*
+X014316Y016267D01*
+X014316Y016365D02*
+X015120Y016365D01*
+X015133Y016378D02*
+X014316Y015561D01*
+X014316Y015948D01*
 X014303Y015961D01*
 X014316Y015975D01*
 X014316Y016381D01*
@@ -737,18 +865,6 @@ X015240Y016619D01*
 X015171Y016550D01*
 X015133Y016460D01*
 X015133Y016378D01*
-X014316Y015561D01*
-X014316Y015948D01*
-X014313Y015971D02*
-X014726Y015971D01*
-X014824Y016070D02*
-X014316Y016070D01*
-X014316Y016168D02*
-X014923Y016168D01*
-X015021Y016267D02*
-X014316Y016267D01*
-X014316Y016365D02*
-X015120Y016365D01*
 X015135Y016464D02*
 X014316Y016464D01*
 X014316Y016562D02*
@@ -830,34 +946,163 @@ X015202Y017744D02*
 X015349Y017744D01*
 X015484Y017646D02*
 X015160Y017646D01*
+X014923Y016168D02*
+X014316Y016168D01*
+X014316Y016070D02*
+X014824Y016070D01*
+X014726Y015971D02*
+X014313Y015971D01*
+X014316Y015873D02*
+X014627Y015873D01*
 X014529Y015774D02*
 X014316Y015774D01*
 X014316Y015676D02*
 X014430Y015676D01*
 X014332Y015577D02*
 X014316Y015577D01*
-X013871Y014001D02*
-X013833Y014001D01*
-X013833Y013903D02*
-X013871Y013903D01*
-X013871Y013804D02*
-X013833Y013804D01*
-X014233Y009667D02*
-X017223Y009667D01*
-X017223Y009569D02*
-X014233Y009569D01*
-D17*
-X014526Y009999D03*
-X014771Y009631D03*
-X014463Y010365D03*
+X015171Y013706D02*
+X016666Y013706D01*
+X016764Y013607D02*
+X015571Y013607D01*
+X015572Y013606D02*
+X015538Y013626D01*
+X015500Y013636D01*
+X015351Y013636D01*
+X015351Y013279D01*
+X015630Y013279D01*
+X015630Y013506D01*
+X015620Y013544D01*
+X015600Y013578D01*
+X015572Y013606D01*
+X015630Y013509D02*
+X015764Y013509D01*
+X015764Y013410D02*
+X015630Y013410D01*
+X015630Y013312D02*
+X015764Y013312D01*
+X015764Y013213D02*
+X015630Y013213D01*
+X015630Y013115D02*
+X015764Y013115D01*
+X015764Y013016D02*
+X015630Y013016D01*
+X016031Y013250D02*
+X016677Y013250D01*
+X017177Y012750D01*
+X017177Y012531D01*
+X017405Y012622D02*
+X017496Y012622D01*
+X017496Y012721D02*
+X017337Y012721D01*
+X017334Y012819D02*
+X017496Y012819D01*
+X017454Y012918D02*
+X017236Y012918D01*
+X017137Y013016D02*
+X017355Y013016D01*
+X017257Y013115D02*
+X017039Y013115D01*
+X016940Y013213D02*
+X017158Y013213D01*
+X017060Y013312D02*
+X016842Y013312D01*
+X016685Y013016D02*
+X016368Y013016D01*
+X016400Y012918D02*
+X016783Y012918D01*
+X016882Y012819D02*
+X016438Y012819D01*
+X016438Y012721D02*
+X016980Y012721D01*
+X017422Y012524D02*
+X017448Y012524D01*
+X017401Y012425D02*
+X017398Y012425D01*
+X017401Y012327D02*
+X017319Y012327D01*
+X017240Y011969D02*
+X017302Y011906D01*
+X017240Y011969D02*
+X016302Y011969D01*
+X016138Y012031D02*
+X013875Y012031D01*
+X013875Y011933D02*
+X016046Y011933D01*
+X016037Y012228D02*
+X016718Y012228D01*
+X016692Y012130D02*
+X013875Y012130D01*
+X013875Y012228D02*
+X015628Y012228D01*
+X015821Y012228D02*
+X015843Y012228D01*
+X015843Y012327D02*
+X015821Y012327D01*
+X015821Y012425D02*
+X015843Y012425D01*
+X015843Y012524D02*
+X015821Y012524D01*
+X015226Y012425D02*
+X015087Y012425D01*
+X015015Y013039D02*
+X014720Y013039D01*
+X015015Y013334D01*
+X015015Y013279D01*
+X015294Y013279D01*
+X015294Y013221D01*
+X015015Y013221D01*
+X015015Y013039D01*
+X015015Y013115D02*
+X014796Y013115D01*
+X014894Y013213D02*
+X015015Y013213D01*
+X015015Y013312D02*
+X014993Y013312D01*
+X015294Y013312D02*
+X015351Y013312D01*
+X015351Y013410D02*
+X015294Y013410D01*
+X015294Y013509D02*
+X015351Y013509D01*
+X015351Y013607D02*
+X015294Y013607D01*
+X016299Y013532D02*
+X016299Y013410D01*
+X016438Y011736D02*
+X016692Y011736D01*
+X016692Y011637D02*
+X016438Y011637D01*
+X016401Y011243D02*
+X016662Y011243D01*
+X017252Y010849D02*
+X017352Y010849D01*
+X017352Y010751D02*
+X017252Y010751D01*
+X017252Y010652D02*
+X017352Y010652D01*
+X017352Y010554D02*
+X017252Y010554D01*
+X017511Y010455D02*
+X013875Y010455D01*
+X013553Y009569D02*
+X013504Y009569D01*
+D21*
+X014338Y010365D03*
 X014088Y010649D03*
 X014086Y010983D03*
-X014020Y011526D03*
-X014020Y012088D03*
-X014020Y012401D03*
-X014020Y012713D03*
-X014276Y013589D03*
-X013661Y013615D03*
+X014651Y010124D03*
+X016272Y010769D03*
+X016617Y011355D03*
+X016567Y011689D03*
+X016560Y012216D03*
+X017177Y012531D03*
+X017646Y012375D03*
+X016463Y012986D03*
+X015708Y013750D03*
+X016458Y014500D03*
+X016333Y014939D03*
+X015958Y015061D03*
+X015458Y014875D03*
 X014708Y015250D03*
 X015317Y015733D03*
 X015685Y015733D03*
@@ -869,36 +1114,28 @@ X016865Y015500D03*
 X016958Y015875D03*
 X016971Y016468D03*
 X016583Y017375D03*
-X015958Y015061D03*
-X016333Y014939D03*
-X016458Y014500D03*
-X015708Y013750D03*
-X016463Y012986D03*
-X016403Y012123D03*
-X016411Y011689D03*
-X016617Y011386D03*
-X016678Y011019D03*
-X017020Y010939D03*
-X016342Y010773D03*
-X017833Y010875D03*
-X017646Y012375D03*
-X015458Y014875D03*
-D18*
-X015772Y014875D01*
-X015958Y015061D01*
-X016333Y015084D02*
-X015685Y015733D01*
-X015685Y016100D02*
-X015562Y016100D01*
-X015685Y016100D02*
-X016603Y015181D01*
-X016603Y014814D01*
-X016542Y014753D01*
-X016542Y014569D01*
-X016473Y014500D01*
-X016458Y014500D01*
-X016333Y014939D02*
-X016333Y015084D01*
+X014276Y013589D03*
+X013661Y013615D03*
+X013957Y012713D03*
+X013957Y012401D03*
+X013957Y012088D03*
+X017395Y010126D03*
+X017833Y010000D03*
+D22*
+X017708Y009875D01*
+X016708Y009875D01*
+X016583Y010000D01*
+X017395Y010126D02*
+X017927Y010659D01*
+X017927Y012906D01*
+X017083Y013750D01*
+X017083Y014032D01*
+X017592Y014032D01*
+X017592Y014445D02*
+X017083Y014445D01*
+X017083Y014875D01*
+X017083Y015281D01*
+X016865Y015500D01*
 X016771Y015219D02*
 X016208Y015781D01*
 X016208Y016000D01*
@@ -908,105 +1145,93 @@ X017208Y016750D02*
 X016708Y016750D01*
 X016181Y016223D01*
 X015930Y016223D01*
-X016112Y016529D02*
-X015743Y016529D01*
-X016112Y016529D02*
-X016583Y017000D01*
-X017548Y017000D01*
-X017592Y017044D01*
-X017578Y016625D02*
-X017333Y016625D01*
-X017208Y016750D01*
-X017578Y016625D02*
-X017592Y016611D01*
-X016958Y015875D02*
-X017115Y015719D01*
-X017115Y015469D01*
-X017177Y015406D01*
-X017333Y015406D01*
-X017428Y015312D01*
-X017592Y015312D01*
-X017592Y014879D02*
-X017589Y014875D01*
-X017083Y014875D01*
-X017083Y015281D01*
-X016865Y015500D01*
+X015685Y016100D02*
+X016603Y015181D01*
+X016603Y014814D01*
+X016542Y014753D01*
+X016542Y014569D01*
+X016473Y014500D01*
+X016458Y014500D01*
+X016333Y014939D02*
+X016333Y015084D01*
+X015685Y015733D01*
+X015685Y016100D02*
+X015562Y016100D01*
+X015378Y016411D02*
+X014351Y015384D01*
+X014333Y015384D01*
+X014333Y015125D01*
+X014583Y014875D01*
+X014583Y013625D01*
+X014547Y013589D01*
+X014276Y013589D01*
+X014427Y013219D02*
+X014833Y013625D01*
+X014833Y015125D01*
+X014708Y015250D01*
+X015021Y015436D02*
+X015317Y015733D01*
+X015021Y015436D02*
+X015021Y013552D01*
+X014504Y013035D01*
+X013786Y013035D01*
+X013725Y012974D01*
+X013725Y009988D01*
+X013838Y009875D01*
+X014958Y009875D01*
+X015083Y010000D01*
+X015272Y009689D02*
+X013645Y009689D01*
+X013541Y009793D01*
+X013541Y013096D01*
+X013663Y013219D01*
+X014427Y013219D01*
+X013843Y014436D02*
+X013852Y014445D01*
+X013843Y014436D02*
+X012833Y014436D01*
+X015458Y014875D02*
+X015772Y014875D01*
+X015958Y015061D01*
 X016771Y015219D02*
 X016771Y013813D01*
 X017646Y012938D01*
 X017646Y012375D01*
-X017927Y012094D02*
-X017927Y012906D01*
-X017083Y013750D01*
-X017083Y014032D01*
-X017592Y014032D01*
-X017592Y014445D02*
+X017083Y014032D02*
 X017083Y014445D01*
-X017083Y014875D01*
-X017083Y014445D02*
-X017083Y014032D01*
-X015458Y014490D02*
-X015458Y013125D01*
-X015368Y013035D01*
-X013786Y013035D01*
-X013725Y012974D01*
-X013725Y011881D01*
-X013786Y011820D01*
-X014521Y011820D01*
-X014643Y011698D01*
-X014643Y010833D01*
-X014766Y010710D01*
-X014950Y010710D01*
-X015083Y010576D01*
-X015083Y010250D01*
-X015272Y009939D02*
-X014823Y009939D01*
-X014762Y010000D01*
-X014762Y010498D01*
-X014458Y010801D01*
-X014458Y011200D01*
-X014397Y011261D01*
-X013602Y011261D01*
-X013541Y011323D01*
-X013541Y013096D01*
-X013663Y013219D01*
-X015052Y013219D01*
-X015208Y013375D01*
-X015208Y014375D01*
-X014958Y014625D01*
-X014958Y015000D01*
-X014708Y015250D01*
-X014351Y015384D02*
-X015378Y016411D01*
-X015317Y015733D02*
-X015208Y015624D01*
-X015208Y014740D01*
-X015458Y014490D01*
-X014958Y014375D02*
-X014708Y014625D01*
-X014708Y014750D01*
-X014333Y015125D01*
-X014333Y015384D01*
-X014351Y015384D01*
-X013852Y014445D02*
-X013843Y014436D01*
-X012833Y014436D01*
-X014276Y013589D02*
-X014922Y013589D01*
-X014958Y013625D01*
-X014958Y014375D01*
-X017927Y012094D02*
-X017020Y011186D01*
-X017020Y010939D01*
-X017708Y010750D02*
-X017708Y010280D01*
-X017678Y010250D01*
-X017678Y010095D01*
-X017583Y010000D01*
-X017678Y010250D02*
-X016583Y010250D01*
-X015583Y010250D02*
-X015272Y009939D01*
-X017708Y010750D02*
-X017833Y010875D01*
+X017083Y014875D02*
+X017589Y014875D01*
+X017592Y014879D01*
+X017592Y015312D02*
+X017428Y015312D01*
+X017333Y015406D01*
+X017177Y015406D01*
+X017115Y015469D01*
+X017115Y015719D01*
+X016958Y015875D01*
+X017333Y016625D02*
+X017208Y016750D01*
+X017333Y016625D02*
+X017578Y016625D01*
+X017592Y016611D01*
+X017548Y017000D02*
+X017592Y017044D01*
+X017548Y017000D02*
+X016583Y017000D01*
+X016112Y016529D01*
+X015743Y016529D01*
+X015583Y010000D02*
+X015272Y009689D01*
+D23*
+X015777Y010938D02*
+X015832Y011007D01*
+X015832Y011562D01*
+X016081Y011562D01*
+X016206Y011566D01*
+X015458Y011562D02*
+X015333Y011433D01*
+X014583Y011433D01*
+X014583Y012692D02*
+X015333Y012692D01*
+X015458Y012594D01*
 M02*
diff --git a/CAM/hab.GBO b/CAM/hab.GBO
--- a/CAM/hab.GBO
+++ b/CAM/hab.GBO
@@ -8,10 +8,13 @@ G75*
 5,1,8,0,0,1.08239X$1,22.5*
 %
 %ADD10C,0.0000*%
-%ADD11R,0.0591X0.0236*%
-%ADD12C,0.0050*%
+%ADD11C,0.0050*%
+%ADD12R,0.0591X0.0236*%
 %ADD13C,0.0039*%
 %ADD14C,0.0020*%
+%ADD15C,0.0160*%
+%ADD16C,0.0080*%
+%ADD17C,0.0060*%
 D10*
 X009958Y013875D02*
 X013333Y013875D01*
@@ -179,43 +182,6 @@ X015378Y017994D01*
 X015372Y018029D01*
 X015370Y018064D01*
 D11*
-X012101Y014424D03*
-D12*
-X014833Y010500D02*
-X014833Y010000D01*
-X016833Y010000D01*
-X016333Y010000D01*
-X016333Y010500D01*
-X016833Y010500D01*
-X016833Y010000D01*
-X016833Y010500D01*
-X014833Y010500D01*
-X016333Y010459D02*
-X016833Y010459D01*
-X016833Y010410D02*
-X016333Y010410D01*
-X016333Y010362D02*
-X016833Y010362D01*
-X016833Y010313D02*
-X016333Y010313D01*
-X016333Y010265D02*
-X016833Y010265D01*
-X016833Y010216D02*
-X016333Y010216D01*
-X016333Y010168D02*
-X016833Y010168D01*
-X016833Y010119D02*
-X016333Y010119D01*
-X016333Y010071D02*
-X016833Y010071D01*
-X016833Y010022D02*
-X016333Y010022D01*
-X017083Y010250D02*
-X017208Y010125D01*
-X017083Y010250D02*
-X017208Y010375D01*
-X017083Y010250D02*
-X017583Y010250D01*
 X016606Y017280D02*
 X016608Y017305D01*
 X016614Y017329D01*
@@ -257,47 +223,124 @@ X016623Y017208D01*
 X016614Y017231D01*
 X016608Y017255D01*
 X016606Y017280D01*
+X017062Y012559D02*
+X017062Y012514D01*
+X017062Y012424D02*
+X017062Y012244D01*
+X017107Y012244D02*
+X017017Y012244D01*
+X016911Y012244D02*
+X016911Y012424D01*
+X016776Y012424D01*
+X016731Y012379D01*
+X016731Y012244D01*
+X017062Y012424D02*
+X017107Y012424D01*
+X017222Y012424D02*
+X017312Y012244D01*
+X017402Y012424D01*
+X016407Y012283D02*
+X016407Y011869D01*
+X015265Y011869D01*
+X015261Y011869D02*
+X015261Y012015D01*
+X015285Y012019D02*
+X015299Y012021D01*
+X015313Y012025D01*
+X015326Y012033D01*
+X015336Y012043D01*
+X015344Y012056D01*
+X015348Y012070D01*
+X015350Y012084D01*
+X015348Y012098D01*
+X015344Y012112D01*
+X015336Y012125D01*
+X015326Y012135D01*
+X015313Y012143D01*
+X015299Y012147D01*
+X015285Y012149D01*
+X015261Y012149D02*
+X015261Y012287D01*
+X016403Y012287D01*
+X016333Y010250D02*
+X016833Y010250D01*
+X016833Y009750D01*
+X016333Y009750D01*
+X016333Y010250D01*
+X016333Y010216D02*
+X016833Y010216D01*
+X016833Y010250D02*
+X014833Y010250D01*
+X014833Y009750D01*
+X016833Y009750D01*
+X016833Y010250D01*
+X016833Y010168D02*
+X016333Y010168D01*
+X016333Y010119D02*
+X016833Y010119D01*
+X016833Y010071D02*
+X016333Y010071D01*
+X016333Y010022D02*
+X016833Y010022D01*
+X016833Y009974D02*
+X016333Y009974D01*
+X016333Y009925D02*
+X016833Y009925D01*
+X016833Y009877D02*
+X016333Y009877D01*
+X016333Y009828D02*
+X016833Y009828D01*
+X016833Y009780D02*
+X016333Y009780D01*
+X017083Y010000D02*
+X017208Y009875D01*
+X017083Y010000D02*
+X017208Y010125D01*
+X017083Y010000D02*
+X017583Y010000D01*
+D12*
+X012101Y014424D03*
 D13*
-X017632Y017654D02*
-X017632Y017753D01*
-X013813Y017753D01*
-X013813Y017654D01*
 X013813Y013835D02*
 X013813Y013776D01*
 X017632Y013776D01*
 X017632Y013835D01*
+X017632Y017654D02*
+X017632Y017753D01*
+X013813Y017753D01*
+X013813Y017654D01*
 D14*
-X015771Y015181D02*
-X015698Y015255D01*
-X015771Y015328D01*
-X015551Y015328D01*
-X015551Y015402D02*
-X015698Y015402D01*
-X015771Y015476D01*
-X015698Y015549D01*
-X015551Y015549D01*
-X015551Y015623D02*
-X015771Y015770D01*
-X015661Y015844D02*
-X015661Y015991D01*
-X015661Y016065D02*
-X015588Y016065D01*
-X015551Y016102D01*
-X015551Y016175D01*
+X015551Y016175D02*
 X015588Y016212D01*
 X015625Y016212D01*
 X015661Y016175D01*
 X015661Y016065D01*
+X015588Y016065D01*
+X015551Y016102D01*
+X015551Y016175D01*
+X015661Y016065D02*
 X015735Y016139D01*
 X015771Y016212D01*
+X015661Y015991D02*
+X015661Y015844D01*
 X015551Y015770D02*
 X015771Y015623D01*
-X015661Y015549D02*
-X015661Y015402D01*
-X015551Y015181D02*
+X015698Y015549D02*
+X015551Y015549D01*
+X015551Y015623D02*
+X015771Y015770D01*
+X015698Y015549D02*
+X015771Y015476D01*
+X015698Y015402D01*
+X015551Y015402D01*
+X015551Y015328D02*
+X015771Y015328D01*
+X015698Y015255D01*
 X015771Y015181D01*
-X016710Y016239D02*
-X016673Y016276D01*
+X015551Y015181D01*
+X015661Y015402D02*
+X015661Y015549D01*
+X016673Y016276D02*
 X016673Y016386D01*
 X016820Y016386D01*
 X016820Y016460D02*
@@ -325,6 +368,20 @@ X016673Y017049D02*
 X016820Y017196D01*
 X016820Y017049D02*
 X016673Y017196D01*
-X016710Y016239D02*
+X016673Y016276D02*
+X016710Y016239D01*
 X016820Y016239D01*
+D15*
+X015521Y010950D02*
+X015521Y010925D01*
+D16*
+X015095Y011433D02*
+X015095Y012692D01*
+X014072Y012692D02*
+X014072Y011433D01*
+D17*
+X015559Y013014D02*
+X015795Y013014D01*
+X015795Y013486D02*
+X015559Y013486D01*
 M02*
diff --git a/CAM/hab.GBP b/CAM/hab.GBP
--- a/CAM/hab.GBP
+++ b/CAM/hab.GBP
@@ -11,8 +11,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD11R,0.0394X0.0787*%
 %ADD12R,0.0709X0.0276*%
 %ADD13R,0.0709X0.0315*%
-%ADD14R,0.0500X0.1000*%
+%ADD14R,0.1000X0.0500*%
 %ADD15R,0.0320X0.0350*%
+%ADD16R,0.0244X0.0480*%
+%ADD17R,0.0276X0.0354*%
+%ADD18R,0.0787X0.0472*%
+%ADD19R,0.0315X0.0472*%
 D10*
 X009958Y013875D02*
 X013333Y013875D01*
@@ -203,11 +207,27 @@ X013852Y015312D03*
 X013852Y014879D03*
 X013852Y014445D03*
 D14*
-X013833Y010000D03*
-X017583Y010000D03*
+X017302Y011906D03*
+X017302Y010938D03*
 D15*
-X016583Y010250D03*
-X016083Y010250D03*
-X015583Y010250D03*
-X015083Y010250D03*
+X016583Y010000D03*
+X016083Y010000D03*
+X015583Y010000D03*
+X015083Y010000D03*
+D16*
+X015458Y011562D03*
+X015832Y011562D03*
+X016206Y011566D03*
+X016206Y012594D03*
+X015832Y012594D03*
+X015458Y012594D03*
+D17*
+X015265Y010938D03*
+X015777Y010938D03*
+D18*
+X014583Y011433D03*
+X014583Y012692D03*
+D19*
+X015323Y013250D03*
+X016031Y013250D03*
 M02*
diff --git a/CAM/hab.GBS b/CAM/hab.GBS
--- a/CAM/hab.GBS
+++ b/CAM/hab.GBS
@@ -12,8 +12,12 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD12R,0.0434X0.0827*%
 %ADD13R,0.0749X0.0316*%
 %ADD14R,0.0749X0.0355*%
-%ADD15R,0.0540X0.1040*%
+%ADD15R,0.1040X0.0540*%
 %ADD16R,0.0360X0.0390*%
+%ADD17R,0.0284X0.0520*%
+%ADD18R,0.0316X0.0394*%
+%ADD19R,0.0827X0.0512*%
+%ADD20R,0.0355X0.0512*%
 D10*
 X009958Y013875D02*
 X013333Y013875D01*
@@ -206,11 +210,27 @@ X013852Y015312D03*
 X013852Y014879D03*
 X013852Y014445D03*
 D15*
-X013833Y010000D03*
-X017583Y010000D03*
+X017302Y011906D03*
+X017302Y010938D03*
 D16*
-X016583Y010250D03*
-X016083Y010250D03*
-X015583Y010250D03*
-X015083Y010250D03*
+X016583Y010000D03*
+X016083Y010000D03*
+X015583Y010000D03*
+X015083Y010000D03*
+D17*
+X015458Y011562D03*
+X015832Y011562D03*
+X016206Y011566D03*
+X016206Y012594D03*
+X015832Y012594D03*
+X015458Y012594D03*
+D18*
+X015265Y010938D03*
+X015777Y010938D03*
+D19*
+X014583Y011433D03*
+X014583Y012692D03*
+D20*
+X015323Y013250D03*
+X016031Y013250D03*
 M02*
diff --git a/CAM/hab.GTL b/CAM/hab.GTL
--- a/CAM/hab.GTL
+++ b/CAM/hab.GTL
@@ -352,37 +352,53 @@ X016490Y012361D01*
 X016555Y012296D01*
 X016922Y012296D01*
 X016986Y012361D01*
-X016986Y012433D01*
-X017052Y012433D01*
-X017052Y012162D01*
+X016986Y012376D01*
+X017038Y012324D01*
+X017042Y012322D01*
+X017042Y012162D01*
 X017019Y012162D01*
 X016955Y012098D01*
-X016955Y011839D01*
-X016871Y011755D01*
-X016871Y011683D01*
+X016955Y011853D01*
+X016861Y011759D01*
+X016861Y011683D01*
 X016818Y011683D01*
 X016753Y011619D01*
 X016753Y011173D01*
 X016818Y011109D01*
-X016843Y011109D01*
-X016812Y011078D01*
-X016775Y010987D01*
-X016775Y010890D01*
-X016812Y010800D01*
-X016870Y010742D01*
-X016870Y010599D01*
-X016943Y010525D01*
-X017031Y010438D01*
-X017127Y010438D01*
+X017081Y011109D01*
+X017194Y010996D01*
+X017288Y010903D01*
+X017598Y010903D01*
+X017673Y010827D01*
+X017673Y010186D01*
+X017640Y010153D01*
+X017640Y010175D01*
+X017602Y010265D01*
+X017585Y010282D01*
+X017598Y010282D01*
+X017662Y010347D01*
+X017662Y010792D01*
+X017598Y010857D01*
+X017192Y010857D01*
+X017127Y010792D01*
 X017127Y010347D01*
 X017192Y010282D01*
-X017598Y010282D01*
-X017662Y010347D01*
-X017662Y010700D01*
-X017695Y010667D01*
-X017785Y010630D01*
-X017882Y010630D01*
-X017933Y010651D01*
+X017204Y010282D01*
+X017187Y010265D01*
+X017150Y010175D01*
+X017150Y010078D01*
+X017187Y009987D01*
+X017256Y009919D01*
+X017346Y009881D01*
+X017443Y009881D01*
+X017533Y009919D01*
+X017588Y009974D01*
+X017588Y009951D01*
+X017626Y009861D01*
+X017695Y009792D01*
+X017785Y009755D01*
+X017882Y009755D01*
+X017933Y009776D01*
 X017933Y009625D01*
 X017930Y009599D01*
 X017903Y009554D01*
@@ -491,11 +507,9 @@ X016490Y012425D01*
 X016524Y012327D02*
 X016440Y012327D01*
 X016238Y012228D02*
-X017052Y012228D01*
-X017052Y012327D02*
+X017042Y012228D01*
+X017035Y012327D02*
 X016952Y012327D01*
-X016986Y012425D02*
-X017052Y012425D01*
 X016986Y012130D02*
 X015969Y012130D01*
 X015969Y012031D02*
@@ -523,36 +537,138 @@ X016267Y011046D01*
 X016267Y010948D02*
 X016229Y010948D01*
 X016153Y010849D02*
-X016792Y010849D01*
-X016775Y010948D02*
-X016518Y010948D01*
-X016536Y011046D02*
-X016799Y011046D01*
-X016782Y011145D02*
-X016536Y011145D01*
-X016536Y011243D02*
-X016753Y011243D01*
-X016753Y011342D02*
-X016536Y011342D01*
-X016520Y011440D02*
-X016753Y011440D01*
-X016871Y011736D02*
-X016221Y011736D01*
-X016221Y011834D02*
-X016949Y011834D01*
-X016955Y011933D02*
-X016234Y011933D01*
-X016238Y012031D02*
-X016955Y012031D01*
-X017352Y012162D02*
-X017352Y012568D01*
-X017275Y012645D01*
-X017246Y012674D01*
-X017273Y012659D01*
-X017311Y012649D01*
-X017450Y012649D01*
-X017450Y012957D01*
-X017488Y012957D01*
+X017184Y010849D01*
+X017127Y010751D02*
+X016153Y010751D01*
+X016153Y010652D02*
+X017127Y010652D01*
+X017127Y010554D02*
+X016856Y010554D01*
+X016868Y010455D02*
+X017127Y010455D01*
+X017127Y010357D02*
+X016868Y010357D01*
+X016868Y010258D02*
+X017184Y010258D01*
+X017150Y010160D02*
+X016868Y010160D01*
+X016868Y010061D02*
+X017156Y010061D01*
+X017212Y009963D02*
+X016518Y009963D01*
+X016518Y010061D02*
+X016418Y010061D01*
+X016418Y010160D02*
+X016518Y010160D01*
+X016518Y010258D02*
+X016418Y010258D01*
+X016418Y010357D02*
+X016518Y010357D01*
+X016518Y010455D02*
+X016418Y010455D01*
+X016418Y010554D02*
+X016518Y010554D01*
+X016518Y010948D02*
+X017243Y010948D01*
+X017144Y011046D02*
+X016536Y011046D01*
+X016536Y011145D02*
+X016782Y011145D01*
+X016753Y011243D02*
+X016536Y011243D01*
+X016536Y011342D02*
+X016753Y011342D01*
+X016753Y011440D02*
+X016520Y011440D01*
+X016221Y011736D02*
+X016861Y011736D01*
+X016935Y011834D02*
+X016221Y011834D01*
+X016234Y011933D02*
+X016955Y011933D01*
+X016955Y012031D02*
+X016238Y012031D01*
+X016226Y012583D02*
+X015874Y012583D01*
+X015870Y012578D01*
+X015885Y012594D01*
+X015885Y012982D01*
+X015739Y013230D02*
+X015639Y013230D01*
+X015639Y013708D01*
+X015739Y013708D01*
+X016216Y013708D01*
+X016216Y013808D01*
+X015739Y013808D01*
+X015739Y013708D01*
+X015739Y013230D01*
+X015739Y013312D02*
+X015639Y013312D01*
+X015639Y013410D02*
+X015739Y013410D01*
+X015739Y013509D02*
+X015639Y013509D01*
+X015639Y013607D02*
+X015739Y013607D01*
+X015739Y013706D02*
+X015639Y013706D01*
+X015639Y013708D02*
+X015201Y013708D01*
+X015201Y013758D01*
+X014913Y013758D01*
+X014913Y013758D01*
+X014625Y013758D01*
+X014625Y013790D01*
+X014421Y013790D01*
+X014484Y013728D01*
+X014521Y013637D01*
+X014521Y013570D01*
+X014603Y013488D01*
+X014603Y013405D01*
+X014626Y013405D01*
+X014665Y013366D01*
+X014665Y013459D01*
+X014669Y013463D01*
+X014665Y013466D01*
+X014665Y013607D01*
+X014521Y013607D01*
+X014493Y013706D02*
+X014625Y013706D01*
+X014625Y013689D02*
+X014635Y013651D01*
+X014655Y013617D01*
+X014665Y013607D01*
+X014625Y013689D02*
+X014625Y013758D01*
+X014913Y013758D01*
+X014913Y013758D01*
+X015201Y013758D01*
+X015201Y013808D01*
+X015639Y013808D01*
+X015639Y014286D01*
+X015739Y014286D01*
+X015739Y013808D01*
+X015639Y013808D01*
+X015639Y013708D01*
+X015639Y013804D02*
+X015201Y013804D01*
+X015639Y013903D02*
+X015739Y013903D01*
+X015739Y014001D02*
+X015639Y014001D01*
+X015639Y014100D02*
+X015739Y014100D01*
+X015739Y014198D02*
+X015639Y014198D01*
+X015739Y013804D02*
+X016216Y013804D01*
+X016464Y013364D02*
+X016959Y013364D01*
+X016959Y013438D01*
+X017452Y013419D02*
+X017452Y013111D01*
+X017450Y013111D01*
+X017450Y012995D01*
 X017488Y012995D01*
 X017756Y012995D01*
 X017756Y013173D01*
@@ -564,138 +680,76 @@ X017490Y013419D01*
 X017490Y013303D01*
 X017488Y013303D01*
 X017488Y012995D01*
-X017450Y012995D01*
-X017450Y013111D01*
-X017452Y013111D01*
-X017452Y013419D01*
-X017490Y013419D01*
-X017490Y013457D01*
-X017759Y013457D01*
-X017759Y013635D01*
-X017766Y013647D01*
-X017776Y013686D01*
-X017776Y013864D01*
-X017508Y013864D01*
-X017508Y013901D01*
-X017776Y013901D01*
-X017776Y014079D01*
-X017766Y014118D01*
-X017746Y014152D01*
-X017719Y014180D01*
-X017716Y014181D01*
-X017763Y014228D01*
-X017763Y014673D01*
-X017820Y014673D01*
-X017820Y014981D01*
-X017858Y014981D01*
-X017858Y014673D01*
-X017933Y014673D01*
-X017933Y012126D01*
-X017898Y012162D01*
-X017796Y012162D01*
-X017796Y012179D01*
-X017854Y012236D01*
-X017891Y012326D01*
-X017891Y012424D01*
-X017854Y012514D01*
-X017785Y012583D01*
-X017695Y012620D01*
-X017597Y012620D01*
-X017507Y012583D01*
-X017438Y012514D01*
-X017401Y012424D01*
-X017401Y012326D01*
-X017438Y012236D01*
-X017496Y012179D01*
-X017496Y012127D01*
-X017466Y012098D01*
-X017466Y011652D01*
-X017501Y011618D01*
-X017501Y011173D01*
-X017566Y011109D01*
-X017758Y011109D01*
-X017695Y011083D01*
-X017637Y011025D01*
-X017604Y011025D01*
-X017288Y011341D01*
-X017288Y011588D01*
-X017386Y011588D01*
-X017450Y011652D01*
-X017450Y012098D01*
+X017488Y012957D01*
+X017756Y012957D01*
+X017756Y012779D01*
+X017746Y012741D01*
+X017726Y012707D01*
+X017699Y012679D01*
+X017664Y012659D01*
+X017626Y012649D01*
+X017488Y012649D01*
+X017488Y012957D01*
+X017450Y012957D01*
+X017450Y012649D01*
+X017394Y012649D01*
+X017422Y012580D01*
+X017422Y012483D01*
+X017385Y012392D01*
+X017362Y012370D01*
+X017362Y012162D01*
 X017386Y012162D01*
-X017352Y012162D01*
-X017352Y012228D02*
-X017446Y012228D01*
-X017418Y012130D02*
-X017496Y012130D01*
-X017466Y012031D02*
-X017450Y012031D01*
-X017450Y011933D02*
-X017466Y011933D01*
-X017466Y011834D02*
-X017450Y011834D01*
-X017450Y011736D02*
-X017466Y011736D01*
-X017482Y011637D02*
-X017435Y011637D01*
-X017501Y011539D02*
-X017288Y011539D01*
-X017288Y011440D02*
-X017501Y011440D01*
-X017501Y011342D02*
-X017288Y011342D01*
-X017386Y011243D02*
-X017501Y011243D01*
-X017484Y011145D02*
-X017530Y011145D01*
-X017583Y011046D02*
-X017658Y011046D01*
-X017769Y011396D02*
-X017769Y011821D01*
-X017714Y011875D01*
-X017708Y011881D01*
-X017930Y012130D02*
-X017933Y012130D01*
-X017933Y012228D02*
-X017845Y012228D01*
-X017891Y012327D02*
-X017933Y012327D01*
-X017933Y012425D02*
-X017890Y012425D01*
-X017933Y012524D02*
-X017844Y012524D01*
-X017933Y012622D02*
-X017298Y012622D01*
-X017352Y012524D02*
-X017448Y012524D01*
-X017401Y012425D02*
-X017352Y012425D01*
-X017352Y012327D02*
-X017401Y012327D01*
-X017488Y012649D02*
-X017626Y012649D01*
-X017664Y012659D01*
-X017699Y012679D01*
-X017726Y012707D01*
-X017746Y012741D01*
-X017756Y012779D01*
-X017756Y012957D01*
-X017488Y012957D01*
-X017488Y012649D01*
-X017488Y012721D02*
-X017450Y012721D01*
-X017450Y012819D02*
-X017488Y012819D01*
-X017488Y012918D02*
-X017450Y012918D01*
-X017450Y013016D02*
-X017488Y013016D01*
-X017488Y013115D02*
-X017452Y013115D01*
-X017452Y013213D02*
-X017488Y013213D01*
-X017490Y013312D02*
-X017452Y013312D01*
+X017450Y012098D01*
+X017450Y011652D01*
+X017386Y011588D01*
+X017288Y011588D01*
+X017288Y011355D01*
+X017421Y011222D01*
+X017501Y011222D01*
+X017501Y011618D01*
+X017466Y011652D01*
+X017466Y012098D01*
+X017496Y012127D01*
+X017496Y012179D01*
+X017438Y012236D01*
+X017401Y012326D01*
+X017401Y012424D01*
+X017438Y012514D01*
+X017507Y012583D01*
+X017597Y012620D01*
+X017695Y012620D01*
+X017785Y012583D01*
+X017854Y012514D01*
+X017891Y012424D01*
+X017891Y012326D01*
+X017854Y012236D01*
+X017796Y012179D01*
+X017796Y012162D01*
+X017898Y012162D01*
+X017933Y012126D01*
+X017933Y014673D01*
+X017858Y014673D01*
+X017858Y014981D01*
+X017820Y014981D01*
+X017820Y014673D01*
+X017763Y014673D01*
+X017763Y014228D01*
+X017716Y014181D01*
+X017719Y014180D01*
+X017746Y014152D01*
+X017766Y014118D01*
+X017776Y014079D01*
+X017776Y013901D01*
+X017508Y013901D01*
+X017508Y013864D01*
+X017776Y013864D01*
+X017776Y013686D01*
+X017766Y013647D01*
+X017759Y013635D01*
+X017759Y013457D01*
+X017490Y013457D01*
+X017490Y013419D01*
+X017452Y013419D01*
 X017452Y013410D02*
 X017490Y013410D01*
 X017490Y013457D02*
@@ -739,171 +793,102 @@ X017756Y012819D02*
 X017933Y012819D01*
 X017933Y012721D02*
 X017734Y012721D01*
-X016959Y013364D02*
-X016959Y013438D01*
-X016959Y013364D02*
-X016464Y013364D01*
-X016216Y013708D02*
-X016216Y013808D01*
-X015739Y013808D01*
-X015739Y013708D01*
-X016216Y013708D01*
-X016216Y013804D02*
-X015739Y013804D01*
-X015739Y013808D02*
-X015739Y014286D01*
-X015639Y014286D01*
-X015639Y013808D01*
-X015739Y013808D01*
-X015739Y013903D02*
-X015639Y013903D01*
-X015639Y013808D02*
-X015639Y013708D01*
-X015639Y013230D01*
-X015739Y013230D01*
-X015739Y013708D01*
-X015639Y013708D01*
-X015201Y013708D01*
-X015201Y013758D01*
-X014913Y013758D01*
-X014913Y013758D01*
-X014625Y013758D01*
-X014625Y013790D01*
-X014421Y013790D01*
-X014484Y013728D01*
-X014521Y013637D01*
-X014521Y013570D01*
-X014603Y013488D01*
-X014603Y013405D01*
-X014626Y013405D01*
-X014665Y013366D01*
-X014665Y013459D01*
-X014669Y013463D01*
-X014665Y013466D01*
-X014665Y013607D01*
-X014521Y013607D01*
-X014493Y013706D02*
-X014625Y013706D01*
-X014625Y013689D02*
-X014635Y013651D01*
-X014655Y013617D01*
-X014665Y013607D01*
-X014625Y013689D02*
-X014625Y013758D01*
-X014913Y013758D01*
-X014913Y013758D01*
-X015201Y013758D01*
-X015201Y013808D01*
-X015639Y013808D01*
-X015639Y013804D02*
-X015201Y013804D01*
-X015639Y013706D02*
-X015739Y013706D01*
-X015739Y013607D02*
-X015639Y013607D01*
-X015639Y013509D02*
-X015739Y013509D01*
-X015739Y013410D02*
-X015639Y013410D01*
-X015639Y013312D02*
-X015739Y013312D01*
-X015885Y012982D02*
-X015885Y012594D01*
-X015870Y012578D01*
-X015874Y012583D01*
-X016226Y012583D01*
-X015438Y012142D02*
-X015424Y012157D01*
-X015006Y012157D01*
-X014492Y012157D01*
-X014463Y012128D01*
-X014422Y012170D01*
-X014176Y012130D02*
-X013483Y012130D01*
-X013483Y012228D02*
-X014176Y012228D01*
-X014176Y012312D02*
-X014176Y011945D01*
-X014241Y011881D01*
-X014686Y011881D01*
-X014749Y011944D01*
-X014784Y011909D01*
-X015201Y011909D01*
-X015204Y011906D01*
-X015191Y011893D01*
-X014784Y011893D01*
-X014720Y011830D01*
-X014686Y011864D01*
-X014241Y011864D01*
-X014176Y011800D01*
-X014176Y011433D01*
-X014241Y011369D01*
-X014483Y011369D01*
-X014397Y011282D01*
-X014303Y011189D01*
-X014303Y011035D01*
-X014274Y011035D01*
-X014210Y010970D01*
-X014210Y010525D01*
-X014274Y010460D01*
-X014641Y010460D01*
-X014705Y010525D01*
-X014705Y010927D01*
-X014721Y010927D01*
-X014721Y010525D01*
-X014786Y010460D01*
-X014928Y010460D01*
-X014928Y010042D01*
-X015278Y010042D01*
-X015278Y009943D01*
-X014928Y009943D01*
-X014928Y009525D01*
-X013583Y009525D01*
-X013557Y009528D01*
-X013513Y009554D01*
-X013487Y009599D01*
-X013483Y009625D01*
-X013483Y013937D01*
-X013395Y014025D01*
-X013333Y014025D01*
-X013333Y014850D01*
-X013395Y014850D01*
-X013483Y014938D01*
-X013483Y017600D01*
-X015114Y017600D01*
-X015202Y017688D01*
-X015202Y017988D01*
-X015206Y017993D01*
-X015202Y018049D01*
-X015202Y018078D01*
-X015203Y018143D01*
-X015258Y018310D01*
-X015371Y018443D01*
-X015528Y018522D01*
-X015612Y018538D01*
-X015679Y018538D01*
-X015681Y018536D01*
-X015741Y018538D01*
-X015744Y018538D01*
-X015827Y018532D01*
-X015983Y018472D01*
-X015983Y018472D01*
-X016105Y018357D01*
-X016173Y018204D01*
-X016183Y018121D01*
-X016183Y017688D01*
-X016271Y017600D01*
-X017933Y017600D01*
-X017933Y015327D01*
-X017858Y015327D01*
-X017858Y015019D01*
+X017933Y012622D02*
+X017405Y012622D01*
+X017422Y012524D02*
+X017448Y012524D01*
+X017401Y012425D02*
+X017398Y012425D01*
+X017401Y012327D02*
+X017362Y012327D01*
+X017362Y012228D02*
+X017446Y012228D01*
+X017418Y012130D02*
+X017496Y012130D01*
+X017466Y012031D02*
+X017450Y012031D01*
+X017450Y011933D02*
+X017466Y011933D01*
+X017466Y011834D02*
+X017450Y011834D01*
+X017450Y011736D02*
+X017466Y011736D01*
+X017482Y011637D02*
+X017435Y011637D01*
+X017501Y011539D02*
+X017288Y011539D01*
+X017288Y011440D02*
+X017501Y011440D01*
+X017501Y011342D02*
+X017302Y011342D01*
+X017400Y011243D02*
+X017501Y011243D01*
+X017354Y011063D02*
+X017664Y011063D01*
+X017833Y010893D01*
+X017833Y010000D01*
+X017646Y010160D02*
+X017640Y010160D01*
+X017673Y010258D02*
+X017605Y010258D01*
+X017662Y010357D02*
+X017673Y010357D01*
+X017662Y010455D02*
+X017673Y010455D01*
+X017662Y010554D02*
+X017673Y010554D01*
+X017662Y010652D02*
+X017673Y010652D01*
+X017662Y010751D02*
+X017673Y010751D01*
+X017651Y010849D02*
+X017605Y010849D01*
+X017354Y011063D02*
+X017021Y011396D01*
+X017021Y011693D01*
+X017202Y011875D01*
+X017202Y012506D01*
+X017450Y012721D02*
+X017488Y012721D01*
+X017488Y012819D02*
+X017450Y012819D01*
+X017450Y012918D02*
+X017488Y012918D01*
+X017488Y013016D02*
+X017450Y013016D01*
+X017452Y013115D02*
+X017488Y013115D01*
+X017488Y013213D02*
+X017452Y013213D01*
+X017452Y013312D02*
+X017490Y013312D01*
+X017776Y013903D02*
+X017933Y013903D01*
+X017933Y014001D02*
+X017776Y014001D01*
+X017771Y014100D02*
+X017933Y014100D01*
+X017933Y014198D02*
+X017733Y014198D01*
+X017763Y014297D02*
+X017933Y014297D01*
+X017933Y014395D02*
+X017763Y014395D01*
+X017763Y014494D02*
+X017933Y014494D01*
+X017933Y014592D02*
+X017763Y014592D01*
+X017820Y014691D02*
+X017858Y014691D01*
+X017858Y014789D02*
+X017820Y014789D01*
+X017820Y014888D02*
+X017858Y014888D01*
+X017858Y015019D02*
 X017820Y015019D01*
 X017820Y015327D01*
 X017743Y015327D01*
 X017743Y016066D01*
-X017650Y016160D01*
-X017650Y016160D01*
-X017618Y016191D01*
 X017618Y016191D01*
 X017525Y016285D01*
 X017135Y016285D01*
@@ -1070,254 +1055,132 @@ X014182Y012772D01*
 X014182Y012327D01*
 X014187Y012322D01*
 X014176Y012312D01*
-X014182Y012327D02*
-X013483Y012327D01*
-X013483Y012425D02*
-X014182Y012425D01*
-X014182Y012524D02*
-X013483Y012524D01*
-X013483Y012622D02*
-X014182Y012622D01*
-X014182Y012721D02*
-X013483Y012721D01*
-X013483Y012819D02*
-X013703Y012819D01*
-X013644Y012918D02*
-X013483Y012918D01*
-X013483Y013016D02*
-X013643Y013016D01*
-X013483Y013115D02*
-X013912Y013115D01*
-X013912Y013213D02*
-X013950Y013213D01*
-X013950Y013312D02*
-X013912Y013312D01*
-X013912Y013410D02*
-X013950Y013410D01*
-X014044Y013509D02*
-X013483Y013509D01*
-X013483Y013607D02*
-X014031Y013607D01*
-X014059Y013706D02*
-X013483Y013706D01*
-X013483Y013804D02*
-X013751Y013804D01*
-X013700Y013903D02*
-X013483Y013903D01*
-X013419Y014001D02*
-X013700Y014001D01*
-X013700Y014100D02*
-X013333Y014100D01*
-X013333Y014198D02*
-X013700Y014198D01*
-X013700Y014297D02*
-X013333Y014297D01*
-X013333Y014395D02*
-X013998Y014395D01*
-X014097Y014494D02*
-X013333Y014494D01*
-X013333Y014592D02*
-X013551Y014592D01*
-X013553Y014586D02*
-X013573Y014552D01*
-X013600Y014524D01*
-X013635Y014504D01*
-X013673Y014494D01*
-X013837Y014494D01*
-X013837Y014770D01*
-X013543Y014770D01*
-X013543Y014624D01*
-X013553Y014586D01*
-X013543Y014691D02*
-X013333Y014691D01*
-X013333Y014789D02*
-X013837Y014789D01*
-X013837Y014824D02*
-X013543Y014824D01*
-X013543Y014971D01*
-X013553Y015009D01*
-X013573Y015043D01*
-X013600Y015071D01*
-X013635Y015091D01*
-X013673Y015101D01*
-X013837Y015101D01*
-X013837Y014824D01*
-X013837Y014888D02*
-X013891Y014888D01*
-X013891Y014986D02*
-X013837Y014986D01*
-X013837Y015085D02*
-X013891Y015085D01*
-X014103Y015085D02*
-X014527Y015085D01*
-X014471Y015183D02*
-X013483Y015183D01*
-X013483Y015085D02*
-X013624Y015085D01*
-X013547Y014986D02*
-X013483Y014986D01*
-X013433Y014888D02*
-X013543Y014888D01*
-X013837Y014691D02*
-X013891Y014691D01*
-X013891Y014789D02*
-X014118Y014789D01*
-X014276Y014674D02*
-X014276Y014446D01*
-X013948Y014118D01*
-X013948Y014077D01*
-X013891Y014592D02*
-X013837Y014592D01*
-X014276Y014674D02*
-X014399Y014797D01*
-X014463Y015282D02*
-X013483Y015282D01*
-X013483Y015380D02*
-X014497Y015380D01*
-X014620Y015479D02*
-X013483Y015479D01*
-X013483Y015577D02*
-X014607Y015577D01*
-X014607Y015676D02*
-X013483Y015676D01*
-X013483Y015774D02*
-X013556Y015774D01*
-X013553Y015779D02*
-X013573Y015745D01*
-X013600Y015717D01*
-X013635Y015697D01*
-X013673Y015687D01*
-X013837Y015687D01*
-X013837Y015963D01*
-X013543Y015963D01*
-X013543Y015817D01*
-X013553Y015779D01*
-X013543Y015873D02*
-X013483Y015873D01*
-X013483Y015971D02*
-X013837Y015971D01*
-X013837Y016017D02*
-X013543Y016017D01*
-X013543Y016163D01*
-X013553Y016202D01*
-X013573Y016236D01*
-X013600Y016264D01*
-X013635Y016283D01*
-X013673Y016294D01*
-X013837Y016294D01*
-X013837Y016017D01*
-X013837Y016070D02*
-X013891Y016070D01*
-X013891Y016168D02*
-X013837Y016168D01*
-X013837Y016267D02*
-X013891Y016267D01*
-X014122Y016267D02*
-X014248Y016267D01*
-X014248Y016365D02*
-X013483Y016365D01*
-X013483Y016267D02*
-X013605Y016267D01*
-X013544Y016168D02*
-X013483Y016168D01*
-X013483Y016070D02*
-X013543Y016070D01*
-X013837Y015873D02*
-X013891Y015873D01*
-X013891Y015774D02*
-X013837Y015774D01*
-X013483Y016464D02*
-X014305Y016464D01*
-X014572Y016562D02*
-X013483Y016562D01*
-X013483Y016661D02*
-X014574Y016661D01*
-X014607Y016759D02*
-X013483Y016759D01*
-X013483Y016858D02*
-X014607Y016858D01*
-X014690Y016956D02*
-X013483Y016956D01*
-X013483Y017055D02*
-X014922Y017055D01*
-X014922Y017153D02*
-X013483Y017153D01*
-X013483Y017252D02*
-X014985Y017252D01*
-X015160Y017646D02*
-X015484Y017646D01*
-X015421Y017672D02*
-X015591Y017601D01*
-X015775Y017601D01*
-X015945Y017672D01*
-X016075Y017802D01*
-X016146Y017972D01*
-X016146Y018156D01*
-X016075Y018326D01*
-X015945Y018456D01*
-X015775Y018526D01*
-X015591Y018526D01*
-X015421Y018456D01*
-X015291Y018326D01*
-X015221Y018156D01*
-X015221Y017972D01*
-X015291Y017802D01*
-X015421Y017672D01*
-X015349Y017744D02*
-X015202Y017744D01*
-X015202Y017843D02*
-X015274Y017843D01*
-X015234Y017941D02*
-X015202Y017941D01*
-X015203Y018040D02*
-X015221Y018040D01*
-X015221Y018138D02*
-X015203Y018138D01*
-X015234Y018237D02*
-X015254Y018237D01*
-X015279Y018335D02*
-X015301Y018335D01*
-X015363Y018434D02*
-X015399Y018434D01*
-X015581Y018532D02*
-X015820Y018532D01*
-X015968Y018434D02*
-X016023Y018434D01*
-X016066Y018335D02*
-X016114Y018335D01*
-X016112Y018237D02*
-X016158Y018237D01*
-X016146Y018138D02*
-X016181Y018138D01*
-X016183Y018040D02*
-X016146Y018040D01*
-X016133Y017941D02*
-X016183Y017941D01*
-X016183Y017843D02*
-X016092Y017843D01*
-X016018Y017744D02*
-X016183Y017744D01*
-X016226Y017646D02*
-X015882Y017646D01*
-X016378Y017252D02*
-X017933Y017252D01*
-X017933Y017350D02*
-X013483Y017350D01*
-X013483Y017449D02*
-X017933Y017449D01*
-X017933Y017547D02*
-X013483Y017547D01*
-X014855Y016410D02*
-X014858Y016406D01*
-X015072Y016406D01*
-X015133Y016468D01*
-X015133Y016713D01*
-X015195Y016774D01*
-X015991Y016774D01*
-X016355Y016410D01*
-X016509Y016410D01*
-X016674Y016410D01*
-X016958Y016125D01*
+X014176Y011945D01*
+X014241Y011881D01*
+X014686Y011881D01*
+X014749Y011944D01*
+X014784Y011909D01*
+X015201Y011909D01*
+X015204Y011906D01*
+X015191Y011893D01*
+X014784Y011893D01*
+X014720Y011830D01*
+X014686Y011864D01*
+X014241Y011864D01*
+X014176Y011800D01*
+X014176Y011433D01*
+X014241Y011369D01*
+X014483Y011369D01*
+X014397Y011282D01*
+X014303Y011189D01*
+X014303Y011035D01*
+X014274Y011035D01*
+X014210Y010970D01*
+X014210Y010525D01*
+X014274Y010460D01*
+X014641Y010460D01*
+X014705Y010525D01*
+X014705Y010927D01*
+X014721Y010927D01*
+X014721Y010525D01*
+X014786Y010460D01*
+X014928Y010460D01*
+X014928Y010042D01*
+X015278Y010042D01*
+X015278Y009943D01*
+X014928Y009943D01*
+X014928Y009525D01*
+X013583Y009525D01*
+X013557Y009528D01*
+X013513Y009554D01*
+X013487Y009599D01*
+X013483Y009625D01*
+X013483Y013937D01*
+X013395Y014025D01*
+X013333Y014025D01*
+X013333Y014850D01*
+X013395Y014850D01*
+X013483Y014938D01*
+X013483Y017600D01*
+X015114Y017600D01*
+X015202Y017688D01*
+X015202Y017988D01*
+X015206Y017993D01*
+X015202Y018049D01*
+X015202Y018078D01*
+X015203Y018143D01*
+X015258Y018310D01*
+X015371Y018443D01*
+X015528Y018522D01*
+X015612Y018538D01*
+X015679Y018538D01*
+X015681Y018536D01*
+X015741Y018538D01*
+X015744Y018538D01*
+X015827Y018532D01*
+X015983Y018472D01*
+X015983Y018472D01*
+X016105Y018357D01*
+X016173Y018204D01*
+X016183Y018121D01*
+X016183Y017688D01*
+X016271Y017600D01*
+X017933Y017600D01*
+X017933Y015327D01*
+X017858Y015327D01*
+X017858Y015019D01*
+X017858Y015085D02*
+X017820Y015085D01*
+X017820Y015183D02*
+X017858Y015183D01*
+X017858Y015282D02*
+X017820Y015282D01*
+X017743Y015380D02*
+X017933Y015380D01*
+X017933Y015479D02*
+X017743Y015479D01*
+X017743Y015577D02*
+X017933Y015577D01*
+X017933Y015676D02*
+X017743Y015676D01*
+X017743Y015774D02*
+X017933Y015774D01*
+X017933Y015873D02*
+X017743Y015873D01*
+X017743Y015971D02*
+X017933Y015971D01*
+X017933Y016070D02*
+X017740Y016070D01*
+X017642Y016168D02*
+X017933Y016168D01*
+X017933Y016267D02*
+X017543Y016267D01*
+X017535Y016365D02*
+X017933Y016365D01*
+X017933Y016464D02*
+X017634Y016464D01*
+X017732Y016562D02*
+X017933Y016562D01*
+X017933Y016661D02*
+X017733Y016661D01*
+X017833Y016759D02*
+X017933Y016759D01*
+X017933Y016858D02*
+X017833Y016858D01*
+X017833Y016956D02*
+X017933Y016956D01*
+X017933Y017055D02*
+X017833Y017055D01*
+X017833Y017153D02*
+X017933Y017153D01*
+X017933Y017252D02*
+X016378Y017252D01*
+X016441Y017153D02*
+X016826Y017153D01*
+X016826Y017055D02*
+X016441Y017055D01*
+X016674Y016956D02*
+X016826Y016956D01*
 X017124Y016661D02*
 X017407Y016661D01*
 X017338Y016759D02*
@@ -1330,153 +1193,242 @@ X017321Y017055D02*
 X017338Y017055D01*
 X017338Y017153D02*
 X017321Y017153D01*
-X017833Y017153D02*
-X017933Y017153D01*
-X017933Y017055D02*
-X017833Y017055D01*
-X017833Y016956D02*
-X017933Y016956D01*
-X017933Y016858D02*
-X017833Y016858D01*
-X017833Y016759D02*
-X017933Y016759D01*
-X017933Y016661D02*
-X017733Y016661D01*
-X017732Y016562D02*
-X017933Y016562D01*
-X017933Y016464D02*
-X017634Y016464D01*
-X017535Y016365D02*
-X017933Y016365D01*
-X017933Y016267D02*
-X017543Y016267D01*
-X017642Y016168D02*
-X017933Y016168D01*
-X017933Y016070D02*
-X017740Y016070D01*
-X017743Y015971D02*
-X017933Y015971D01*
-X017933Y015873D02*
-X017743Y015873D01*
-X017743Y015774D02*
-X017933Y015774D01*
-X017933Y015676D02*
-X017743Y015676D01*
-X017743Y015577D02*
-X017933Y015577D01*
-X017933Y015479D02*
-X017743Y015479D01*
-X017743Y015380D02*
-X017933Y015380D01*
-X017858Y015282D02*
-X017820Y015282D01*
-X017820Y015183D02*
-X017858Y015183D01*
-X017858Y015085D02*
-X017820Y015085D01*
-X017820Y014888D02*
-X017858Y014888D01*
-X017858Y014789D02*
-X017820Y014789D01*
-X017820Y014691D02*
-X017858Y014691D01*
-X017933Y014592D02*
-X017763Y014592D01*
-X017763Y014494D02*
-X017933Y014494D01*
-X017933Y014395D02*
-X017763Y014395D01*
-X017763Y014297D02*
-X017933Y014297D01*
-X017933Y014198D02*
-X017733Y014198D01*
-X017771Y014100D02*
-X017933Y014100D01*
-X017933Y014001D02*
-X017776Y014001D01*
-X017776Y013903D02*
-X017933Y013903D01*
-X015739Y014001D02*
-X015639Y014001D01*
-X015639Y014100D02*
-X015739Y014100D01*
-X015739Y014198D02*
-X015639Y014198D01*
-X014665Y013509D02*
-X014582Y013509D01*
-X014603Y013410D02*
-X014665Y013410D01*
-X014443Y013422D02*
+X017933Y017350D02*
+X013483Y017350D01*
+X013483Y017252D02*
+X014985Y017252D01*
+X014922Y017153D02*
+X013483Y017153D01*
+X013483Y017055D02*
+X014922Y017055D01*
+X014690Y016956D02*
+X013483Y016956D01*
+X013483Y016858D02*
+X014607Y016858D01*
+X014607Y016759D02*
+X013483Y016759D01*
+X013483Y016661D02*
+X014574Y016661D01*
+X014572Y016562D02*
+X013483Y016562D01*
+X013483Y016464D02*
+X014305Y016464D01*
+X014248Y016365D02*
+X013483Y016365D01*
+X013483Y016267D02*
+X013605Y016267D01*
+X013600Y016264D02*
+X013573Y016236D01*
+X013553Y016202D01*
+X013543Y016163D01*
+X013543Y016017D01*
+X013837Y016017D01*
+X013837Y016294D01*
+X013673Y016294D01*
+X013635Y016283D01*
+X013600Y016264D01*
+X013544Y016168D02*
+X013483Y016168D01*
+X013483Y016070D02*
+X013543Y016070D01*
+X013543Y015963D02*
+X013543Y015817D01*
+X013553Y015779D01*
+X013573Y015745D01*
+X013600Y015717D01*
+X013635Y015697D01*
+X013673Y015687D01*
+X013837Y015687D01*
+X013837Y015963D01*
+X013543Y015963D01*
+X013483Y015971D02*
+X013837Y015971D01*
+X013837Y015873D02*
+X013891Y015873D01*
+X013891Y015774D02*
+X013837Y015774D01*
+X013556Y015774D02*
+X013483Y015774D01*
+X013483Y015676D02*
+X014607Y015676D01*
+X014607Y015577D02*
+X013483Y015577D01*
+X013483Y015479D02*
+X014620Y015479D01*
+X014497Y015380D02*
+X013483Y015380D01*
+X013483Y015282D02*
+X014463Y015282D01*
+X014471Y015183D02*
+X013483Y015183D01*
+X013483Y015085D02*
+X013624Y015085D01*
+X013635Y015091D02*
+X013600Y015071D01*
+X013573Y015043D01*
+X013553Y015009D01*
+X013543Y014971D01*
+X013543Y014824D01*
+X013837Y014824D01*
+X013837Y015101D01*
+X013673Y015101D01*
+X013635Y015091D01*
+X013547Y014986D02*
+X013483Y014986D01*
+X013433Y014888D02*
+X013543Y014888D01*
+X013543Y014770D02*
+X013543Y014624D01*
+X013553Y014586D01*
+X013573Y014552D01*
+X013600Y014524D01*
+X013635Y014504D01*
+X013673Y014494D01*
+X013837Y014494D01*
+X013837Y014770D01*
+X013543Y014770D01*
+X013543Y014691D02*
+X013333Y014691D01*
+X013333Y014789D02*
+X013837Y014789D01*
+X013891Y014789D02*
+X014118Y014789D01*
+X014276Y014674D02*
+X014276Y014446D01*
+X013948Y014118D01*
+X013948Y014077D01*
+X013998Y014395D02*
+X013333Y014395D01*
+X013333Y014297D02*
+X013700Y014297D01*
+X013700Y014198D02*
+X013333Y014198D01*
+X013333Y014100D02*
+X013700Y014100D01*
+X013700Y014001D02*
+X013419Y014001D01*
+X013483Y013903D02*
+X013700Y013903D01*
+X013751Y013804D02*
+X013483Y013804D01*
+X013483Y013706D02*
+X014059Y013706D01*
+X014031Y013607D02*
+X013483Y013607D01*
+X013483Y013509D02*
+X014044Y013509D01*
+X013950Y013410D02*
+X013912Y013410D01*
+X013912Y013312D02*
+X013950Y013312D01*
+X013950Y013213D02*
+X013912Y013213D01*
+X013912Y013115D02*
+X013483Y013115D01*
+X013483Y013213D02*
+X013643Y013213D01*
+X013643Y013312D02*
+X013483Y013312D01*
+X013483Y013410D02*
+X013696Y013410D01*
+X013643Y013016D02*
+X013483Y013016D01*
+X013483Y012918D02*
+X013644Y012918D01*
+X013703Y012819D02*
+X013483Y012819D01*
+X013483Y012721D02*
+X014182Y012721D01*
+X014182Y012622D02*
+X013483Y012622D01*
+X013483Y012524D02*
+X014182Y012524D01*
+X014182Y012425D02*
+X013483Y012425D01*
+X013483Y012327D02*
+X014182Y012327D01*
+X014176Y012228D02*
+X013483Y012228D01*
+X013483Y012130D02*
+X014176Y012130D01*
+X014176Y012031D02*
+X013483Y012031D01*
+X013483Y011933D02*
+X014189Y011933D01*
+X014210Y011834D02*
+X013483Y011834D01*
+X013483Y011736D02*
+X014176Y011736D01*
+X014176Y011637D02*
+X013483Y011637D01*
+X013483Y011539D02*
+X014176Y011539D01*
+X014176Y011440D02*
+X013483Y011440D01*
+X013483Y011342D02*
+X014456Y011342D01*
+X014358Y011243D02*
+X013483Y011243D01*
+X013483Y011145D02*
+X014303Y011145D01*
+X014303Y011046D02*
+X013483Y011046D01*
+X013483Y010948D02*
+X014210Y010948D01*
+X014210Y010849D02*
+X013483Y010849D01*
+X013483Y010751D02*
+X014210Y010751D01*
+X014210Y010652D02*
+X013483Y010652D01*
+X013483Y010554D02*
+X014210Y010554D01*
+X014457Y010748D02*
+X014463Y010753D01*
+X014463Y011123D01*
+X014555Y011214D01*
+X014847Y011214D01*
+X014847Y011220D01*
+X014877Y011250D01*
+X014938Y011250D01*
+X014938Y011577D01*
+X015006Y011645D01*
+X014978Y011617D01*
+X014463Y011617D01*
+X014716Y011834D02*
+X014725Y011834D01*
+X014738Y011933D02*
+X014761Y011933D01*
+X015006Y012157D02*
+X014492Y012157D01*
+X014463Y012128D01*
+X014422Y012170D01*
+X014942Y012550D02*
+X015329Y012550D01*
+X015358Y012578D01*
+X015295Y012982D02*
+X014578Y012982D01*
 X014443Y013118D01*
-X014578Y012982D01*
-X015295Y012982D01*
-X015358Y012578D02*
-X015329Y012550D01*
-X014942Y012550D01*
-X014761Y011933D02*
-X014738Y011933D01*
-X014725Y011834D02*
-X014716Y011834D01*
-X014463Y011617D02*
-X014978Y011617D01*
-X015006Y011645D01*
-X014938Y011577D01*
-X014938Y011250D01*
-X014877Y011250D01*
-X014847Y011220D01*
-X014847Y011214D01*
-X014555Y011214D01*
-X014463Y011123D01*
-X014463Y010753D01*
-X014457Y010748D01*
-X014210Y010751D02*
-X013483Y010751D01*
-X013483Y010849D02*
-X014210Y010849D01*
-X014210Y010948D02*
-X013483Y010948D01*
-X013483Y011046D02*
-X014303Y011046D01*
-X014303Y011145D02*
-X013483Y011145D01*
-X013483Y011243D02*
-X014358Y011243D01*
-X014456Y011342D02*
-X013483Y011342D01*
-X013483Y011440D02*
-X014176Y011440D01*
-X014176Y011539D02*
-X013483Y011539D01*
-X013483Y011637D02*
-X014176Y011637D01*
-X014176Y011736D02*
-X013483Y011736D01*
-X013483Y011834D02*
-X014210Y011834D01*
-X014189Y011933D02*
-X013483Y011933D01*
-X013483Y012031D02*
-X014176Y012031D01*
-X014158Y012819D02*
-X014228Y012819D01*
+X014443Y013422D01*
+X014276Y013589D01*
+X014582Y013509D02*
+X014665Y013509D01*
+X014665Y013410D02*
+X014603Y013410D01*
+X014228Y012819D02*
+X014158Y012819D01*
 X013950Y012819D02*
 X013912Y012819D01*
 X013912Y012918D02*
 X013950Y012918D01*
 X013950Y013016D02*
 X013912Y013016D01*
-X013643Y013213D02*
-X013483Y013213D01*
-X013483Y013312D02*
-X013643Y013312D01*
-X013696Y013410D02*
-X013483Y013410D01*
-X014276Y013589D02*
-X014443Y013422D01*
-X015014Y011653D02*
+X015006Y012157D02*
+X015424Y012157D01*
+X015438Y012142D01*
+X015421Y011653D02*
+X015014Y011653D01*
 X015006Y011645D01*
-X015014Y011653D02*
-X015421Y011653D01*
 X015359Y011214D02*
 X015359Y010780D01*
 X015394Y010745D01*
@@ -1510,68 +1462,139 @@ X014928Y009667D02*
 X013483Y009667D01*
 X013504Y009569D02*
 X014928Y009569D01*
-X014210Y010554D02*
-X013483Y010554D01*
-X013483Y010652D02*
-X014210Y010652D01*
-X015359Y011214D02*
-X015717Y011214D01*
-X015736Y011195D01*
-X015905Y010745D02*
+X015900Y009998D02*
 X015900Y010739D01*
-X015900Y009998D01*
-X016418Y010061D02*
-X016518Y010061D01*
-X016518Y009963D02*
-X017933Y009963D01*
-X017933Y010061D02*
-X016868Y010061D01*
-X016868Y010160D02*
-X017933Y010160D01*
-X017933Y010258D02*
-X016868Y010258D01*
-X016868Y010357D02*
-X017127Y010357D01*
-X017014Y010455D02*
-X016868Y010455D01*
-X016856Y010554D02*
-X016915Y010554D01*
-X016870Y010652D02*
-X016153Y010652D01*
-X016153Y010751D02*
-X016861Y010751D01*
-X016518Y010554D02*
-X016418Y010554D01*
-X016418Y010455D02*
-X016518Y010455D01*
-X016518Y010357D02*
-X016418Y010357D01*
-X016418Y010258D02*
-X016518Y010258D01*
-X016518Y010160D02*
-X016418Y010160D01*
+X015905Y010745D01*
+X015736Y011195D02*
+X015717Y011214D01*
+X015359Y011214D01*
 X016868Y009864D02*
-X017933Y009864D01*
-X017933Y009766D02*
+X017624Y009864D01*
+X017588Y009963D02*
+X017577Y009963D01*
+X017395Y010126D02*
+X017395Y010558D01*
+X017389Y010564D01*
+X017769Y011396D02*
+X017769Y011821D01*
+X017714Y011875D01*
+X017708Y011881D01*
+X017930Y012130D02*
+X017933Y012130D01*
+X017933Y012228D02*
+X017845Y012228D01*
+X017891Y012327D02*
+X017933Y012327D01*
+X017933Y012425D02*
+X017890Y012425D01*
+X017933Y012524D02*
+X017844Y012524D01*
+X017907Y009766D02*
+X017933Y009766D01*
+X017933Y009667D02*
+X016868Y009667D01*
+X016868Y009569D02*
+X017912Y009569D01*
+X017759Y009766D02*
 X016868Y009766D01*
-X016868Y009667D02*
-X017933Y009667D01*
-X017912Y009569D02*
-X016868Y009569D01*
-X017662Y010357D02*
-X017933Y010357D01*
-X017933Y010455D02*
-X017662Y010455D01*
-X017662Y010554D02*
-X017933Y010554D01*
-X017731Y010652D02*
-X017662Y010652D01*
-X016826Y016956D02*
-X016674Y016956D01*
-X016826Y017055D02*
-X016441Y017055D01*
-X016441Y017153D02*
-X016826Y017153D01*
+X014097Y014494D02*
+X013333Y014494D01*
+X013333Y014592D02*
+X013551Y014592D01*
+X013837Y014592D02*
+X013891Y014592D01*
+X013891Y014691D02*
+X013837Y014691D01*
+X013837Y014888D02*
+X013891Y014888D01*
+X013891Y014986D02*
+X013837Y014986D01*
+X013837Y015085D02*
+X013891Y015085D01*
+X014103Y015085D02*
+X014527Y015085D01*
+X014399Y014797D02*
+X014276Y014674D01*
+X013543Y015873D02*
+X013483Y015873D01*
+X013837Y016070D02*
+X013891Y016070D01*
+X013891Y016168D02*
+X013837Y016168D01*
+X013837Y016267D02*
+X013891Y016267D01*
+X014122Y016267D02*
+X014248Y016267D01*
+X014855Y016410D02*
+X014858Y016406D01*
+X015072Y016406D01*
+X015133Y016468D01*
+X015133Y016713D01*
+X015195Y016774D01*
+X015991Y016774D01*
+X016355Y016410D01*
+X016509Y016410D01*
+X016674Y016410D01*
+X016958Y016125D01*
+X017933Y017449D02*
+X013483Y017449D01*
+X013483Y017547D02*
+X017933Y017547D01*
+X016226Y017646D02*
+X015882Y017646D01*
+X015945Y017672D02*
+X016075Y017802D01*
+X016146Y017972D01*
+X016146Y018156D01*
+X016075Y018326D01*
+X015945Y018456D01*
+X015775Y018526D01*
+X015591Y018526D01*
+X015421Y018456D01*
+X015291Y018326D01*
+X015221Y018156D01*
+X015221Y017972D01*
+X015291Y017802D01*
+X015421Y017672D01*
+X015591Y017601D01*
+X015775Y017601D01*
+X015945Y017672D01*
+X016018Y017744D02*
+X016183Y017744D01*
+X016183Y017843D02*
+X016092Y017843D01*
+X016133Y017941D02*
+X016183Y017941D01*
+X016183Y018040D02*
+X016146Y018040D01*
+X016146Y018138D02*
+X016181Y018138D01*
+X016158Y018237D02*
+X016112Y018237D01*
+X016114Y018335D02*
+X016066Y018335D01*
+X016023Y018434D02*
+X015968Y018434D01*
+X015820Y018532D02*
+X015581Y018532D01*
+X015399Y018434D02*
+X015363Y018434D01*
+X015301Y018335D02*
+X015279Y018335D01*
+X015254Y018237D02*
+X015234Y018237D01*
+X015221Y018138D02*
+X015203Y018138D01*
+X015203Y018040D02*
+X015221Y018040D01*
+X015234Y017941D02*
+X015202Y017941D01*
+X015202Y017843D02*
+X015274Y017843D01*
+X015202Y017744D02*
+X015349Y017744D01*
+X015484Y017646D02*
+X015160Y017646D01*
 D21*
 X015492Y013955D02*
 X015689Y013758D01*
@@ -1594,30 +1617,34 @@ X016971Y016468D03*
 X016583Y017375D03*
 X014276Y013589D03*
 X013661Y013615D03*
-X014020Y012713D03*
-X014020Y012401D03*
-X014020Y012088D03*
-X014020Y011526D03*
+X013957Y012713D03*
+X013957Y012401D03*
+X013957Y012088D03*
 X014086Y010983D03*
 X014088Y010649D03*
-X014463Y010365D03*
-X014526Y009999D03*
-X014771Y009631D03*
-X016342Y010773D03*
-X016678Y011019D03*
-X017020Y010939D03*
-X016617Y011386D03*
-X016411Y011689D03*
-X016403Y012123D03*
+X014338Y010365D03*
+X014651Y010124D03*
+X016272Y010769D03*
+X016617Y011355D03*
+X016567Y011689D03*
+X016560Y012216D03*
+X017177Y012531D03*
+X017646Y012375D03*
 X016463Y012986D03*
-X017646Y012375D03*
-X017833Y010875D03*
+X017395Y010126D03*
+X017833Y010000D03*
 D23*
-X017542Y010875D01*
-X017021Y011396D01*
-X017021Y011693D01*
-X017202Y011875D01*
-X017202Y012506D01*
+X017208Y010000D02*
+X017201Y009993D01*
+X016468Y009993D01*
+X017315Y010588D02*
+X017333Y010569D01*
+X017395Y010569D01*
+X017389Y010564D01*
+X017646Y011881D02*
+X017646Y012375D01*
+X017202Y012506D02*
+X017177Y012531D01*
 X017125Y012583D01*
 X016738Y012583D01*
 X016726Y012596D01*
@@ -1724,18 +1751,6 @@ X015333Y012500D01*
 X014430Y012550D02*
 X014430Y012162D01*
 X014463Y012128D01*
-X016468Y009993D02*
-X017201Y009993D01*
-X017208Y010000D01*
-X017333Y010569D02*
-X017395Y010569D01*
-X017333Y010569D02*
-X017315Y010588D01*
-X017093Y010588D01*
-X017020Y010661D01*
-X017020Y010939D01*
-X017646Y011881D02*
-X017646Y012375D01*
 X017646Y011881D02*
 X017708Y011881D01*
 M02*
diff --git a/CAM/hab.TXT b/CAM/hab.TXT
--- a/CAM/hab.TXT
+++ b/CAM/hab.TXT
@@ -7,21 +7,19 @@ T02C0.0625
 T01
 X13661Y13615
 X14276Y13589
-X14020Y12713
-X14020Y12401
-X14020Y12088
-X14020Y11526
+X13957Y12713
+X13957Y12401
+X13957Y12088
 X14086Y10983
 X14088Y10649
-X14463Y10365
-X14526Y9999
-X14771Y9631
-X16342Y10773
-X16678Y11019
-X17020Y10939
-X16617Y11386
-X16411Y11689
-X16403Y12123
+X14338Y10365
+X14651Y10124
+X16272Y10769
+X16617Y11355
+X16567Y11689
+X16560Y12216
+X17177Y12531
+X17646Y12375
 X16463Y12986
 X15708Y13750
 X16458Y14500
@@ -39,8 +37,8 @@ X16865Y15500
 X16958Y15875
 X16971Y16468
 X16583Y17375
-X17646Y12375
-X17833Y10875
+X17395Y10126
+X17833Y10000
 T02
 X15683Y18064
 M30
diff --git a/CAM/hab.dri b/CAM/hab.dri
--- a/CAM/hab.dri
+++ b/CAM/hab.dri
@@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0
 
 Drill Station Info File: /home/ethanzonca/Projects/featherhab/CAM/hab.dri
 
- Date              : 16 Feb 2015 22:51:45
+ Date              : 17 Feb 2015 23:12:15
  Drills            : generated
  Device            : Excellon drill station
 
@@ -27,10 +27,10 @@ Drills used:
 
  Code  Size       used
 
- T01   0.0150inch    36
+ T01   0.0150inch    34
  T02   0.0625inch     1
 
-Total number of drills: 37
+Total number of drills: 35
 
 Plotfiles:
 
diff --git a/CAM/hab.gpi b/CAM/hab.gpi
--- a/CAM/hab.gpi
+++ b/CAM/hab.gpi
@@ -2,7 +2,7 @@ Generated by EAGLE CAM Processor 6.5.0
 
 Photoplotter Info File: /home/ethanzonca/Projects/featherhab/CAM/hab.gpi
 
- Date              : 16 Feb 2015 22:51:45
+ Date              : 17 Feb 2015 23:12:16
  Plotfile          : /home/ethanzonca/Projects/featherhab/CAM/hab.GTL
  Apertures         : generated: 
  Device            : Gerber RS-274-X photoplotter, coordinate format 2.4 inch
@@ -43,8 +43,8 @@ Apertures used:
  D17      rectangle 0.0500inch x 0.1000inch     3
  D18      rectangle 0.0315inch x 0.0354inch     3
  D19      draw      0.0118inch              28
- D20      draw      0.0100inch             925
+ D20      draw      0.0100inch             946
  D21      draw      0.0160inch               1
- D22      round     0.0270inch              36
- D23      draw      0.0080inch              92
+ D22      round     0.0270inch              34
+ D23      draw      0.0080inch              86
 
diff --git a/hab.brd b/hab.brd
--- a/hab.brd
+++ b/hab.brd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE eagle SYSTEM "eagle.dtd">
-<eagle version="7.2.0">
+<eagle version="6.5.0">
 <drawing>
 <settings>
 <setting alwaysvectorfont="no"/>
@@ -178,7 +178,9 @@
 </layers>
 <board>
 <plain>
-<wire x1="15.875" y1="26.035" x2="15.875" y2="19.05" width="0" layer="20"/>
+<wire x1="20.240625" y1="26.035" x2="16.51" y2="26.035" width="0" layer="20"/>
+<wire x1="16.51" y1="26.035" x2="15.875" y2="25.4" width="0" layer="20" curve="90"/>
+<wire x1="15.875" y1="25.4" x2="15.875" y2="19.05" width="0" layer="20"/>
 <wire x1="15.875" y1="19.05" x2="7.3025" y2="19.05" width="0" layer="20"/>
 <wire x1="7.3025" y1="19.05" x2="6.6675" y2="18.415" width="0" layer="20" curve="90"/>
 <wire x1="6.6675" y1="18.415" x2="6.6675" y2="16.8275" width="0" layer="20"/>
@@ -188,18 +190,18 @@
 <wire x1="15.875" y1="5.3975" x2="16.51" y2="4.7625" width="0" layer="20" curve="90"/>
 <wire x1="16.51" y1="4.7625" x2="27.300184375" y2="4.7625" width="0" layer="20"/>
 <wire x1="27.300184375" y1="4.7625" x2="27.94" y2="5.394721875" width="0" layer="20" curve="89.749333"/>
-<wire x1="27.94" y1="5.394721875" x2="27.94" y2="26.035" width="0" layer="20"/>
-<wire x1="27.94" y1="26.035" x2="23.495" y2="26.035" width="0" layer="20"/>
+<wire x1="27.94" y1="5.394721875" x2="27.94" y2="25.4" width="0" layer="20"/>
+<wire x1="27.94" y1="25.4" x2="27.305" y2="26.035" width="0" layer="20" curve="90"/>
+<wire x1="27.305" y1="26.035" x2="23.495" y2="26.035" width="0" layer="20"/>
 <wire x1="23.495" y1="26.035" x2="23.495" y2="26.9857" width="0" layer="20"/>
 <wire x1="23.495" y1="26.9857" x2="21.985075" y2="28.41625" width="0" layer="20" curve="90"/>
 <wire x1="21.985075" y1="28.41625" x2="21.63885625" y2="28.41625" width="0" layer="20"/>
 <wire x1="21.63885625" y1="28.41625" x2="20.240625" y2="26.77989375" width="0" layer="20" curve="90"/>
 <wire x1="20.240625" y1="26.77989375" x2="20.240625" y2="26.035" width="0" layer="20"/>
-<wire x1="20.240625" y1="26.035" x2="15.875" y2="26.035" width="0" layer="20"/>
 <dimension x1="28.2575" y1="4.7625" x2="28.575" y2="26.035" x3="3.81" y3="15.39875" textsize="1.778" layer="108" dtype="vertical" unit="inch"/>
 <dimension x1="15.875" y1="26.67" x2="27.94" y2="26.67" x3="21.9075" y3="-1.905" textsize="1.778" layer="108" dtype="horizontal" unit="inch"/>
 <hole x="21.844" y="26.831925" drill="1.5875"/>
-<text x="26.908125" y="9.445625" size="0.8128" layer="22" font="vector" ratio="16" rot="MR0">vin</text>
+<text x="26.273125" y="11.985625" size="0.8128" layer="22" font="vector" ratio="16" rot="MR0">vin</text>
 </plain>
 <libraries>
 <library name="SparkFun">
@@ -699,9 +701,6 @@ design rules under a new name.</descript
 <autorouter>
 <pass name="Default">
 <param name="RoutingGrid" value="50mil"/>
-<param name="AutoGrid" value="1"/>
-<param name="Efforts" value="0"/>
-<param name="TopRouterVariant" value="1"/>
 <param name="tpViaShape" value="round"/>
 <param name="PrefDir.1" value="|"/>
 <param name="PrefDir.2" value="0"/>
@@ -864,12 +863,12 @@ design rules under a new name.</descript
 <element name="CM1" library="SparkFun" package="0402-CAP" value="1.8pF" x="19.3802" y="8.24865" rot="R180"/>
 <element name="CM4" library="SparkFun" package="0402-CAP" value="4.7pF" x="18.7452" y="11.10615" rot="R90"/>
 <element name="CM5" library="SparkFun" package="0402-CAP" value="470pF" x="21.758275" y="8.2423" rot="R180"/>
-<element name="PAD4" library="wirepad" package="SMD1,27-2,54" value="" x="25.955625" y="9.68375" rot="MR90"/>
+<element name="PAD4" library="wirepad" package="SMD1,27-2,54" value="" x="25.955625" y="8.73125" rot="MR90"/>
 <element name="PAD5" library="wirepad" package="SMD1,27-2,54" value="" x="25.955625" y="11.191875" rot="MR90"/>
 <element name="U$7" library="Protofusion" package="POGOPROG-CONN-4-ALLSMT" value="POGOPIN-CONN-4" x="22.86" y="6.35" rot="MR90"/>
-<element name="U4" library="Protofusion" package="TSOT23-6" value="LTC3531-3.3" x="22.225" y="11.668125" rot="MR180"/>
+<element name="U4" library="Protofusion" package="TSOT23-6" value="LTC3531-3.3" x="22.5425" y="11.668125" rot="MR180"/>
 <element name="C6" library="SparkFun" package="0402-CAP" value="2.2uF" x="21.43125" y="8.73125" rot="MR0"/>
-<element name="L1" library="SparkFun-Passives" package="1210" value="LQH32CN100K33L" x="19.129375" y="11.58875" rot="MR270"/>
+<element name="L1" library="SparkFun-Passives" package="1210" value="LQH32CN100K33L" x="19.05" y="11.58875" rot="MR270"/>
 <element name="C9" library="SparkFun" package="0805" value="47uF" x="21.828125" y="14.605" rot="MR0"/>
 </elements>
 <signals>
@@ -905,8 +904,8 @@ design rules under a new name.</descript
 <contactref element="U$5" pad="12_GND"/>
 <contactref element="U$5" pad="10_GND"/>
 <contactref element="U$5" pad="1_GND"/>
-<via x="23.69185" y="10.639425" extent="1-16" drill="0.381"/>
-<via x="23.83155" y="11.979275" extent="1-16" drill="0.381"/>
+<via x="24.088725" y="10.639425" extent="1-16" drill="0.381"/>
+<via x="24.069675" y="11.979275" extent="1-16" drill="0.381"/>
 <via x="18.4277" y="7.2771" extent="1-16" drill="0.381"/>
 <via x="17.78635" y="8.84555" extent="1-16" drill="0.381"/>
 <via x="17.7927" y="7.997825" extent="1-16" drill="0.381"/>
@@ -918,9 +917,9 @@ design rules under a new name.</descript
 <wire x1="23.8379" y1="6.33095" x2="25.69845" y2="6.33095" width="0.2032" layer="1"/>
 <wire x1="25.69845" y1="6.33095" x2="25.7175" y2="6.35" width="0.2032" layer="1"/>
 <via x="16.70685" y="15.5321" extent="1-16" drill="0.381"/>
-<via x="17.5387" y="11.65225" extent="1-16" drill="0.381"/>
-<via x="17.5387" y="12.449175" extent="1-16" drill="0.381"/>
-<via x="17.5387" y="13.23975" extent="1-16" drill="0.381"/>
+<via x="17.459325" y="11.65225" extent="1-16" drill="0.381"/>
+<via x="17.459325" y="12.449175" extent="1-16" drill="0.381"/>
+<via x="17.459325" y="13.23975" extent="1-16" drill="0.381"/>
 <via x="19.22145" y="6.664325" extent="1-16" drill="0.381"/>
 <via x="23.339425" y="8.302625" extent="1-16" drill="0.381"/>
 <via x="24.215725" y="9.7917" extent="1-16" drill="0.381"/>
@@ -999,11 +998,8 @@ design rules under a new name.</descript
 <wire x1="25.7025" y1="12.715" x2="25.7025" y2="11.1125" width="0.254" layer="1"/>
 <contactref element="U4" pad="3"/>
 <contactref element="C9" pad="1"/>
-<wire x1="22.728125" y1="14.605" x2="22.728125" y2="13.065" width="0.3048" layer="16"/>
-<wire x1="22.728125" y1="13.065" x2="22.855" y2="12.938125" width="0.3048" layer="16"/>
 <via x="25.638125" y="12.779375" extent="1-16" drill="0.381"/>
 <wire x1="25.638125" y1="12.779375" x2="25.505775" y2="12.911725" width="0.2032" layer="1"/>
-<wire x1="24.13" y1="6.35" x2="27.305" y2="6.35" width="0.2032" layer="16"/>
 <wire x1="22.728125" y1="14.605" x2="24.368125" y2="14.605" width="0.254" layer="16"/>
 <wire x1="24.368125" y1="14.605" x2="25.638125" y2="13.335" width="0.254" layer="16"/>
 <wire x1="25.638125" y1="12.779375" x2="25.638125" y2="13.335" width="0.254" layer="16"/>
@@ -1011,6 +1007,13 @@ design rules under a new name.</descript
 <wire x1="26.088175" y1="9.04875" x2="26.875246875" y2="9.04875" width="0.254" layer="1"/>
 <wire x1="26.875246875" y1="9.04875" x2="27.305" y2="8.618996875" width="0.254" layer="1"/>
 <wire x1="27.305" y1="8.618996875" x2="27.305" y2="6.35" width="0.254" layer="1"/>
+<wire x1="23.1725" y1="12.938125" x2="23.1725" y2="13.965" width="0.254" layer="16"/>
+<wire x1="23.1725" y1="13.965" x2="23.1775" y2="13.97" width="0.254" layer="16"/>
+<wire x1="23.1775" y1="13.97" x2="22.728125" y2="14.419375" width="0.254" layer="16"/>
+<wire x1="22.728125" y1="14.419375" x2="22.728125" y2="14.605" width="0.254" layer="16"/>
+<wire x1="27.305" y1="6.35" x2="26.9875" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="26.9875" y1="6.0325" x2="24.4475" y2="6.0325" width="0.2032" layer="16"/>
+<wire x1="24.4475" y1="6.0325" x2="24.13" y2="6.35" width="0.2032" layer="16"/>
 </signal>
 <signal name="RADIO-GPIO1">
 <contactref element="U$1" pad="10"/>
@@ -1025,9 +1028,9 @@ design rules under a new name.</descript
 <wire x1="19.74" y1="21.130575" x2="20.2003" y2="21.130575" width="0.2032" layer="1"/>
 <wire x1="20.2003" y1="21.130575" x2="20.913725" y2="21.844" width="0.2032" layer="1"/>
 <wire x1="23.8125" y1="17.78" x2="23.8506" y2="17.78" width="0.2032" layer="16"/>
-<wire x1="23.8506" y1="17.78" x2="24.025225" y2="17.954625" width="0.2032" layer="16"/>
-<wire x1="24.025225" y1="17.954625" x2="24.025225" y2="18.42135" width="0.2032" layer="16"/>
-<wire x1="24.025225" y1="18.42135" x2="24.1808" y2="18.576925" width="0.2032" layer="16"/>
+<wire x1="23.8506" y1="17.78" x2="24.183975" y2="18.113375" width="0.2032" layer="16"/>
+<wire x1="24.183975" y1="18.113375" x2="24.183975" y2="18.5801" width="0.2032" layer="16"/>
+<wire x1="24.183975" y1="18.5801" x2="24.1808" y2="18.576925" width="0.2032" layer="16"/>
 <wire x1="24.1808" y1="18.576925" x2="24.1808" y2="19.510375" width="0.2032" layer="16"/>
 <wire x1="21.536025" y1="21.844" x2="21.847175" y2="21.844" width="0.2032" layer="16"/>
 <wire x1="21.847175" y1="21.844" x2="24.1808" y2="19.510375" width="0.2032" layer="16"/>
@@ -1039,14 +1042,14 @@ design rules under a new name.</descript
 <contactref element="U$6" pad="19"/>
 <wire x1="20.8575" y1="13.925" x2="19.03635" y2="13.925" width="0.254" layer="1"/>
 <wire x1="19.03635" y1="13.925" x2="18.6925" y2="14.26885" width="0.254" layer="1"/>
-<wire x1="18.6925" y1="14.26885" x2="18.6925" y2="15.041875" width="0.254" layer="1"/>
-<wire x1="18.6925" y1="15.041875" x2="18.26895" y2="15.465425" width="0.254" layer="1"/>
-<via x="18.26895" y="15.465425" extent="1-16" drill="0.381"/>
+<wire x1="18.6925" y1="14.26885" x2="18.6925" y2="14.883125" width="0.254" layer="1"/>
+<wire x1="18.6925" y1="14.883125" x2="18.26895" y2="15.306675" width="0.254" layer="1"/>
+<via x="18.26895" y="15.306675" extent="1-16" drill="0.381"/>
 <via x="21.0693" y="22.634575" extent="1-16" drill="0.381"/>
 <wire x1="19.74" y1="21.630575" x2="20.0653" y2="21.630575" width="0.2032" layer="1"/>
 <wire x1="20.0653" y1="21.630575" x2="21.0693" y2="22.634575" width="0.2032" layer="1"/>
-<wire x1="18.26895" y1="15.465425" x2="18.957925" y2="15.465425" width="0.2032" layer="16"/>
-<wire x1="18.957925" y1="15.465425" x2="19.05" y2="15.5575" width="0.2032" layer="16"/>
+<wire x1="18.26895" y1="15.306675" x2="18.799175" y2="15.306675" width="0.2032" layer="16"/>
+<wire x1="18.799175" y1="15.306675" x2="19.05" y2="15.5575" width="0.2032" layer="16"/>
 <wire x1="19.05" y1="15.5575" x2="19.05" y2="18.7325" width="0.2032" layer="16"/>
 <wire x1="19.05" y1="18.7325" x2="18.415" y2="19.3675" width="0.2032" layer="16"/>
 <wire x1="18.415" y1="19.3675" x2="18.415" y2="20.024725" width="0.2032" layer="16"/>
@@ -1139,8 +1142,8 @@ design rules under a new name.</descript
 <contactref element="U$5" pad="8_VCC"/>
 <contactref element="U$5" pad="7_VCC_IO"/>
 <contactref element="C7" pad="1"/>
-<via x="25.238075" y="8.258175" extent="1-16" drill="0.381"/>
-<wire x1="27.543125" y1="8.5397875" x2="27.543125" y2="13.731875" width="0.2032" layer="16"/>
+<via x="26.190575" y="6.670675" extent="1-16" drill="0.381"/>
+<wire x1="27.543125" y1="8.023225" x2="27.543125" y2="13.731875" width="0.2032" layer="16"/>
 <wire x1="27.543125" y1="13.731875" x2="25.4" y2="15.875" width="0.2032" layer="16"/>
 <wire x1="25.4" y1="15.875" x2="25.4" y2="16.5915" width="0.2032" layer="16"/>
 <wire x1="25.4" y1="16.5915" x2="25.4" y2="17.6415" width="0.2032" layer="16"/>
@@ -1158,10 +1161,9 @@ design rules under a new name.</descript
 <wire x1="25.9891" y1="7.84225" x2="26.035" y2="7.79635" width="0.2032" layer="1"/>
 <wire x1="26.035" y1="7.79635" x2="26.190575" y2="7.79635" width="0.2032" layer="1"/>
 <wire x1="26.17615" y1="7.781925" x2="26.190575" y2="7.79635" width="0.2032" layer="1"/>
-<wire x1="27.2615125" y1="8.258175" x2="25.238075" y2="8.258175" width="0.2032" layer="16"/>
-<wire x1="27.543125" y1="8.5397875" x2="27.2615125" y2="8.258175" width="0.2032" layer="16"/>
-<wire x1="26.17615" y1="7.781925" x2="25.6999" y2="8.258175" width="0.2032" layer="1"/>
-<wire x1="25.6999" y1="8.258175" x2="25.238075" y2="8.258175" width="0.2032" layer="1"/>
+<wire x1="26.17615" y1="7.781925" x2="26.190575" y2="7.7675" width="0.254" layer="1"/>
+<wire x1="26.190575" y1="7.7675" x2="26.190575" y2="6.670675" width="0.254" layer="1"/>
+<wire x1="27.543125" y1="8.023225" x2="26.190575" y2="6.670675" width="0.2032" layer="16"/>
 </signal>
 <signal name="N$6">
 <contactref element="Q1" pad="1"/>
@@ -1318,28 +1320,29 @@ design rules under a new name.</descript
 <signal name="N$3">
 <contactref element="U4" pad="1"/>
 <contactref element="L1" pad="1"/>
-<wire x1="20.955" y1="12.938125" x2="20.955" y2="13.18875" width="0.3048" layer="16"/>
-<wire x1="20.955" y1="13.18875" x2="19.129375" y2="13.18875" width="0.3048" layer="16"/>
+<wire x1="19.05" y1="13.18875" x2="21.021875" y2="13.18875" width="0.254" layer="16"/>
+<wire x1="21.021875" y1="13.18875" x2="21.2725" y2="12.938125" width="0.254" layer="16"/>
 </signal>
 <signal name="N$5">
 <contactref element="L1" pad="2"/>
 <contactref element="U4" pad="6"/>
-<wire x1="20.955" y1="10.318125" x2="20.955" y2="9.98875" width="0.3048" layer="16"/>
-<wire x1="20.955" y1="9.98875" x2="19.129375" y2="9.98875" width="0.3048" layer="16"/>
+<wire x1="19.05" y1="9.98875" x2="21.2725" y2="9.98875" width="0.254" layer="16"/>
+<wire x1="21.2725" y1="9.98875" x2="21.2725" y2="10.318125" width="0.254" layer="16"/>
 </signal>
 <signal name="N$8">
 <contactref element="U4" pad="5"/>
 <contactref element="C6" pad="1"/>
 <contactref element="U4" pad="4"/>
-<wire x1="22.855" y1="10.328125" x2="22.855" y2="10.318125" width="0.3048" layer="16"/>
-<wire x1="22.855" y1="10.318125" x2="21.905" y2="10.318125" width="0.3048" layer="16"/>
 <contactref element="PAD5" pad="1"/>
-<wire x1="21.905" y1="10.318125" x2="21.905" y2="8.9075" width="0.3048" layer="16"/>
-<wire x1="21.905" y1="8.9075" x2="22.08125" y2="8.73125" width="0.3048" layer="16"/>
-<wire x1="22.855" y1="10.328125" x2="22.855" y2="11.1075" width="0.254" layer="16"/>
-<wire x1="22.855" y1="11.1075" x2="23.098125" y2="11.350625" width="0.254" layer="16"/>
-<wire x1="23.098125" y1="11.350625" x2="25.796875" y2="11.350625" width="0.254" layer="16"/>
+<wire x1="22.2225" y1="10.318125" x2="22.2225" y2="8.9075" width="0.3048" layer="16"/>
+<wire x1="23.1725" y1="10.328125" x2="23.1725" y2="11.1075" width="0.254" layer="16"/>
+<wire x1="23.1725" y1="11.1075" x2="23.415625" y2="11.350625" width="0.254" layer="16"/>
+<wire x1="23.415625" y1="11.350625" x2="25.796875" y2="11.350625" width="0.254" layer="16"/>
 <wire x1="25.796875" y1="11.350625" x2="25.955625" y2="11.191875" width="0.254" layer="16"/>
+<wire x1="22.2225" y1="8.9075" x2="22.08125" y2="8.9075" width="0.254" layer="16"/>
+<wire x1="22.08125" y1="8.9075" x2="22.08125" y2="8.73125" width="0.254" layer="16"/>
+<wire x1="22.2225" y1="10.318125" x2="23.1725" y2="10.318125" width="0.3048" layer="16"/>
+<wire x1="23.1725" y1="10.318125" x2="23.1725" y2="10.328125" width="0.3048" layer="16"/>
 </signal>
 </signals>
 </board>