diff --git a/hardware/lollipop/lollipop-cache.lib b/hardware/lollipop/lollipop-cache.lib
index f53f7e42..7060e510 100644
--- a/hardware/lollipop/lollipop-cache.lib
+++ b/hardware/lollipop/lollipop-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon Jun 18 21:32:45 2012
+EESchema-LIBRARY Version 2.3  Date: Tue Jun 19 23:51:04 2012
 #encoding utf-8
 #
 # BALUN
diff --git a/hardware/lollipop/lollipop.brd b/hardware/lollipop/lollipop.brd
index 2ae03acf..9e8241f2 100644
--- a/hardware/lollipop/lollipop.brd
+++ b/hardware/lollipop/lollipop.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Tue Jun 19 12:23:02 2012
+PCBNEW-BOARD Version 1 date Wed Jun 20 00:07:24 2012
 
 # Created by Pcbnew(2011-06-30 BZR 3033)-stable
 
@@ -8,10 +8,10 @@ LayerCount 4
 Ly 1FFF8007
 EnabledLayers 1FFF8007
 Links 382
-NoConn 57
+NoConn 52
 Di 20440 8924 38560 29076
 Ndraw 12
-Ntrack 1404
+Ntrack 1399
 Nzone 0
 BoardThickness 630
 Nmodule 130
@@ -21,7 +21,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet User 6000 4000
 Title ""
-Date "19 jun 2012"
+Date "20 jun 2012"
 Rev ""
 Comp ""
 Comment1 ""
@@ -661,7 +661,7 @@ $PAD
 Sh "2" O 335 110 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 16 "/SWRXA2"
+Ne 15 "/SWRXA1"
 Po -679 -394
 Le 33
 $EndPAD
@@ -685,7 +685,7 @@ $PAD
 Sh "5" O 335 110 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 15 "/SWRXA1"
+Ne 16 "/SWRXA2"
 Po -679 197
 Le -1
 $EndPAD
@@ -709,7 +709,7 @@ $PAD
 Sh "9" O 335 110 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 22 "/SWTXA2"
+Ne 21 "/SWTXA1"
 Po 679 394
 Le 72
 $EndPAD
@@ -733,7 +733,7 @@ $PAD
 Sh "12" O 335 110 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 21 "/SWTXA1"
+Ne 22 "/SWTXA2"
 Po 679 -197
 Le 19817752
 $EndPAD
@@ -6956,12 +6956,10 @@ Po 3 32370 15550 32370 15550 250 -1
 De 15 1 3 0 0
 Po 0 32370 15550 31280 16640 60 -1
 De 0 0 3 0 0
-Po 0 31280 16640 31280 16670 60 -1
+Po 0 31280 16640 31280 19550 60 -1
 De 0 0 3 0 0
 Po 0 31000 28000 31490 27510 60 -1
 De 0 0 3 0 400000
-Po 0 31280 19550 31280 16670 60 -1
-De 0 0 3 0 0
 Po 0 31490 19760 31280 19550 60 -1
 De 0 0 3 0 0
 Po 0 31490 27510 31490 19760 60 -1
@@ -7058,8 +7056,6 @@ Po 0 31260 28644 27644 28644 60 -1
 De 0 0 7 0 0
 Po 0 34100 17700 33545 18255 60 -1
 De 0 0 7 0 0
-Po 0 33545 18255 33540 18260 60 -1
-De 0 0 7 0 0
 Po 0 31940 15300 33067 15300 60 -1
 De 0 0 8 0 0
 Po 0 31940 15300 31036 16204 60 -1
@@ -7222,14 +7218,12 @@ Po 0 34175 17965 33689 17965 60 -1
 De 15 0 12 0 800000
 Po 0 25821 24500 25640 24500 60 -1
 De 15 0 13 0 400000
-Po 0 25540 24600 25540 24750 60 -1
+Po 0 25540 24600 25540 26540 60 -1
 De 15 0 13 0 0
 Po 0 25640 24500 25540 24600 60 -1
 De 15 0 13 0 0
 Po 0 25540 26540 26000 27000 60 -1
 De 15 0 13 0 800000
-Po 0 25540 24750 25540 26540 60 -1
-De 15 0 13 0 0
 Po 0 24200 18000 24200 18110 60 -1
 De 0 0 13 0 0
 Po 0 23740 24740 26000 27000 60 -1
@@ -7322,35 +7316,29 @@ Po 0 24238 17362 24600 17000 60 -1
 De 15 0 14 0 0
 Po 0 24238 17362 24191 17362 60 -1
 De 15 0 14 0 800000
-Po 0 30179 24303 30407 24303 60 -1
+Po 0 30179 24894 30424 24894 60 -1
 De 15 0 15 0 400000
-Po 0 26332 25872 25310 24850 60 -1
-De 0 0 15 0 0
-Po 3 25310 24850 25310 24850 250 -1
-De 15 1 15 0 0
-Po 0 25310 24850 24980 24520 60 -1
-De 15 0 15 0 0
-Po 0 29690 25872 26472 25872 60 -1
-De 0 0 15 0 0
-Po 0 30074 26256 29690 25872 60 -1
+Po 0 29690 25872 26332 25872 60 -1
 De 0 0 15 0 0
 Po 0 30248 26256 30074 26256 60 -1
 De 0 0 15 0 0
-Po 0 30478 26026 30248 26256 60 -1
+Po 0 30074 26256 29690 25872 60 -1
 De 0 0 15 0 0
-Po 0 30478 25750 30478 26026 60 -1
-De 0 0 15 0 0
-Po 0 30350 25622 30478 25750 60 -1
-De 0 0 15 0 0
-Po 0 26472 25872 26332 25872 60 -1
-De 0 0 15 0 0
-Po 0 30350 24360 30350 25622 60 -1
-De 0 0 15 0 0
-Po 0 30560 24150 30350 24360 60 -1
-De 0 0 15 0 0
-Po 3 30560 24150 30560 24150 250 -1
+Po 0 25310 24850 24980 24520 60 -1
+De 15 0 15 0 0
+Po 3 25310 24850 25310 24850 250 -1
 De 15 1 15 0 0
-Po 0 30407 24303 30560 24150 60 -1
+Po 0 26332 25872 25310 24850 60 -1
+De 0 0 15 0 0
+Po 0 30540 25964 30248 26256 60 -1
+De 0 0 15 0 0
+Po 0 30540 25030 30540 25964 60 -1
+De 0 0 15 0 0
+Po 0 30550 25020 30540 25030 60 -1
+De 0 0 15 0 0
+Po 3 30550 25020 30550 25020 250 -1
+De 15 1 15 0 0
+Po 0 30424 24894 30550 25020 60 -1
 De 15 0 15 0 0
 Po 0 24900 23950 24900 24440 60 -1
 De 15 0 15 0 0
@@ -7412,35 +7400,29 @@ Po 0 24500 27250 24500 25000 60 -1
 De 15 0 15 0 0
 Po 0 24750 27500 24500 27250 60 -1
 De 15 0 15 0 0
-Po 0 25750 27500 24750 27500 60 -1
+Po 0 26500 27500 24750 27500 60 -1
 De 15 0 15 0 0
-Po 0 26500 27500 25750 27500 60 -1
-De 15 0 15 0 0
-Po 0 25140 24070 25140 23610 60 -1
+Po 0 29662 21576 29662 21672 60 -1
 De 0 0 16 0 0
-Po 3 30600 25010 30600 25010 310 160
-De 15 1 16 0 0
-Po 0 30600 25010 30484 24894 60 -1
+Po 0 30387 24303 30179 24303 60 -1
+De 15 0 16 0 800000
+Po 0 30560 24130 30387 24303 60 -1
 De 15 0 16 0 0
-Po 0 30179 24894 30484 24894 60 -1
-De 15 0 16 0 400000
-Po 0 25140 25290 26228 26378 60 -1
-De 0 0 16 0 0
-Po 0 26228 26378 30298 26378 60 -1
-De 0 0 16 0 0
-Po 0 30298 26378 30600 26076 60 -1
-De 0 0 16 0 0
-Po 0 24970 25120 25140 25290 60 -1
-De 0 0 16 0 0
-Po 0 24970 24240 24970 25120 60 -1
-De 0 0 16 0 0
-Po 0 25140 24070 24970 24240 60 -1
-De 0 0 16 0 0
-Po 0 30600 26076 30600 25010 60 -1
-De 0 0 16 0 0
-Po 0 25460 23290 25980 23290 60 -1
-De 0 0 16 0 0
-Po 0 25140 23610 25460 23290 60 -1
+Po 0 30560 23480 30560 24130 60 -1
+De 15 0 16 0 0
+Po 0 29310 22230 30560 23480 60 -1
+De 15 0 16 0 0
+Po 0 29310 21890 29310 22230 60 -1
+De 15 0 16 0 0
+Po 0 29440 21760 29310 21890 60 -1
+De 15 0 16 0 0
+Po 0 29630 21760 29440 21760 60 -1
+De 15 0 16 0 0
+Po 0 29690 21700 29630 21760 60 -1
+De 15 0 16 0 0
+Po 3 29690 21700 29690 21700 250 -1
+De 15 1 16 0 0
+Po 0 29662 21672 29690 21700 60 -1
 De 0 0 16 0 0
 Po 3 25980 23290 25980 23290 250 -1
 De 15 1 16 0 0
@@ -7518,11 +7500,11 @@ Po 0 27420 23410 27360 23350 60 -1
 De 15 0 17 0 0
 Po 3 27420 23410 27420 23410 250 -1
 De 15 1 17 0 0
-Po 0 27520 23510 27420 23410 60 -1
+Po 0 27400 23390 27420 23410 60 -1
 De 0 0 17 0 0
-Po 0 27520 24160 27520 23510 60 -1
+Po 0 27400 24040 27400 23390 60 -1
 De 0 0 17 0 0
-Po 0 27690 24330 27520 24160 60 -1
+Po 0 27690 24330 27400 24040 60 -1
 De 0 0 17 0 0
 Po 0 27690 24480 27690 24570 60 -1
 De 0 0 17 0 0
@@ -7548,10 +7530,6 @@ Po 0 27690 24570 27980 24860 60 -1
 De 0 0 17 0 0
 Po 0 30180 25800 30179 25800 60 -1
 De 15 0 17 0 0
-Po 0 30179 25800 30180 25800 60 -1
-De 15 0 17 0 0
-Po 0 30180 25800 30179 25800 60 -1
-De 15 0 17 0 0
 Po 0 24301 18579 24300 18580 60 -1
 De 15 0 17 0 0
 Po 0 24565 18579 24301 18579 60 -1
@@ -7566,9 +7544,7 @@ Po 0 24300 18580 24300 18830 60 -1
 De 0 0 17 0 0
 Po 3 24300 18580 24300 18580 250 -1
 De 15 1 17 0 0
-Po 0 30179 25800 30179 25840 60 -1
-De 15 0 17 0 0
-Po 0 30179 25840 30179 26821 60 -1
+Po 0 30179 25800 30179 26821 60 -1
 De 15 0 17 0 0
 Po 0 30179 26821 30000 27000 60 -1
 De 15 0 17 0 800000
@@ -7666,7 +7642,7 @@ Po 0 34170 20150 34140 20150 60 -1
 De 15 0 18 0 0
 Po 0 34391 19929 34391 19838 60 -1
 De 15 0 18 0 800000
-Po 0 30150 23080 30180 23080 60 -1
+Po 0 29160 23080 30180 23080 60 -1
 De 0 0 19 0 0
 Po 3 30670 24640 30670 24640 310 160
 De 15 1 19 0 0
@@ -7702,8 +7678,6 @@ Po 0 29160 23080 28712 23080 60 -1
 De 15 0 19 0 0
 Po 0 28712 23080 27716 22084 60 -1
 De 15 0 19 0 0
-Po 0 29160 23080 30150 23080 60 -1
-De 0 0 19 0 0
 Po 0 25946 20132 25946 21274 60 -1
 De 0 0 19 0 0
 Po 0 25402 19588 25946 20132 60 -1
@@ -7752,7 +7726,7 @@ Po 0 28180 22376 28180 22230 60 -1
 De 15 0 20 0 0
 Po 3 28180 22230 28180 22230 250 -1
 De 15 1 20 0 0
-Po 0 29280 22860 28664 22860 60 -1
+Po 0 29600 22860 28664 22860 60 -1
 De 15 0 20 0 0
 Po 0 27820 21550 28180 21910 60 -1
 De 0 0 20 0 0
@@ -7764,11 +7738,53 @@ Po 0 26748 21756 27244 21756 60 -1
 De 0 0 20 0 0
 Po 0 26410 21418 26748 21756 60 -1
 De 0 0 20 0 0
-Po 0 29600 22860 29280 22860 60 -1
-De 15 0 20 0 0
 Po 0 30179 23439 29600 22860 60 -1
 De 15 0 20 0 0
-Po 0 28260 24920 28260 25890 60 -1
+Po 0 27179 24303 27335 24303 60 -1
+De 15 0 21 0 400000
+Po 0 28030 23770 28030 23560 60 -1
+De 15 0 21 0 0
+Po 0 27860 23940 28030 23770 60 -1
+De 15 0 21 0 0
+Po 0 27860 24068 27860 23940 60 -1
+De 15 0 21 0 0
+Po 0 27790 24138 27860 24068 60 -1
+De 15 0 21 0 0
+Po 0 27500 24138 27790 24138 60 -1
+De 15 0 21 0 0
+Po 0 27335 24303 27500 24138 60 -1
+De 15 0 21 0 0
+Po 0 29080 26150 29080 26170 60 -1
+De 0 0 21 0 0
+Po 0 27410 22350 27760 22700 60 -1
+De 15 0 21 0 0
+Po 0 26900 22350 27410 22350 60 -1
+De 15 0 21 0 0
+Po 0 26810 22440 26900 22350 60 -1
+De 15 0 21 0 0
+Po 3 26810 22440 26810 22440 250 -1
+De 15 1 21 0 0
+Po 0 26324 22926 26810 22440 60 -1
+De 0 0 21 0 0
+Po 0 25002 22926 26324 22926 60 -1
+De 0 0 21 0 0
+Po 0 24650 23278 25002 22926 60 -1
+De 0 0 21 0 0
+Po 0 24650 24690 24650 23278 60 -1
+De 0 0 21 0 0
+Po 0 26338 26378 24650 24690 60 -1
+De 0 0 21 0 0
+Po 0 28872 26378 26338 26378 60 -1
+De 0 0 21 0 0
+Po 0 29080 26170 28872 26378 60 -1
+De 0 0 21 0 0
+Po 0 27760 23560 28030 23560 60 -1
+De 15 0 21 0 0
+Po 0 28030 23560 28460 23560 60 -1
+De 15 0 21 0 0
+Po 0 28821 23921 28821 24106 60 -1
+De 15 0 21 0 800000
+Po 0 28460 23560 28821 23921 60 -1
 De 15 0 21 0 0
 Po 0 29000 26230 29000 27000 60 -1
 De 15 0 21 0 800000
@@ -7776,58 +7792,22 @@ Po 0 29080 26150 29000 26230 60 -1
 De 15 0 21 0 0
 Po 3 29080 26150 29080 26150 250 -1
 De 15 1 21 0 0
-Po 0 28520 26150 29080 26150 60 -1
-De 0 0 21 0 0
-Po 0 28480 26110 28520 26150 60 -1
-De 0 0 21 0 0
-Po 3 28480 26110 28480 26110 250 -1
-De 15 1 21 0 0
-Po 0 28260 25890 28480 26110 60 -1
-De 15 0 21 0 0
-Po 0 28821 24697 28593 24697 60 -1
-De 15 0 21 0 400000
-Po 0 27760 24160 27760 24030 60 -1
-De 0 0 21 0 0
-Po 0 28050 24450 27760 24160 60 -1
-De 0 0 21 0 0
-Po 0 28050 24710 28050 24450 60 -1
-De 0 0 21 0 0
-Po 0 28260 24920 28050 24710 60 -1
-De 0 0 21 0 0
-Po 3 28260 24920 28260 24920 250 -1
-De 15 1 21 0 0
-Po 0 28370 24920 28260 24920 60 -1
-De 15 0 21 0 0
-Po 0 28593 24697 28370 24920 60 -1
-De 15 0 21 0 0
-Po 0 27179 24303 27307 24303 60 -1
-De 15 0 21 0 400000
-Po 3 27760 24030 27760 24030 250 -1
-De 15 1 21 0 0
-Po 0 27580 24030 27760 24030 60 -1
-De 15 0 21 0 0
-Po 0 27307 24303 27580 24030 60 -1
-De 15 0 21 0 0
 Po 0 29296 21426 29296 17676 60 -1
 De 0 0 21 0 0
-Po 0 29296 21426 28022 22700 60 -1
-De 0 0 21 0 0
-Po 0 28022 22700 27760 22700 60 -1
-De 0 0 21 0 0
-Po 3 27760 22700 27760 22700 250 -1
-De 15 1 21 0 0
-Po 0 27760 22700 27760 23560 60 -1
-De 15 0 21 0 0
-Po 0 27760 24030 27760 23560 60 -1
-De 0 0 21 0 0
-Po 3 27760 23560 27760 23560 250 -1
-De 15 1 21 0 0
-Po 0 28940 16060 29925 15075 60 -1
-De 0 0 21 0 0
-Po 0 28940 17320 28940 16060 60 -1
-De 0 0 21 0 0
 Po 0 29296 17676 28940 17320 60 -1
 De 0 0 21 0 0
+Po 0 28940 17320 28940 16060 60 -1
+De 0 0 21 0 0
+Po 0 28940 16060 29925 15075 60 -1
+De 0 0 21 0 0
+Po 3 27760 22700 27760 22700 250 -1
+De 15 1 21 0 0
+Po 0 28022 22700 27760 22700 60 -1
+De 0 0 21 0 0
+Po 0 29296 21426 28022 22700 60 -1
+De 0 0 21 0 0
+Po 0 27760 22700 27760 23560 60 -1
+De 15 0 21 0 0
 Po 0 30270 15550 30270 15420 60 -1
 De 0 0 21 0 0
 Po 0 30270 15420 29925 15075 60 -1
@@ -7854,15 +7834,29 @@ Po 0 30270 15580 30270 15550 60 -1
 De 15 0 21 0 0
 Po 0 30091 15759 30270 15580 60 -1
 De 15 0 21 0 0
-Po 0 28821 24106 28726 24106 60 -1
+Po 0 27179 24106 27354 24106 60 -1
 De 15 0 22 0 400000
-Po 0 27294 24106 27179 24106 60 -1
+Po 0 28693 24697 28821 24697 60 -1
 De 15 0 22 0 800000
-Po 0 27590 23810 27294 24106 60 -1
+Po 0 28580 24810 28693 24697 60 -1
 De 15 0 22 0 0
-Po 0 28430 23810 27590 23810 60 -1
+Po 0 28460 24810 28580 24810 60 -1
 De 15 0 22 0 0
-Po 0 28726 24106 28430 23810 60 -1
+Po 0 28300 24970 28460 24810 60 -1
+De 15 0 22 0 0
+Po 3 28300 24970 28300 24970 250 -1
+De 15 1 22 0 0
+Po 0 28120 24790 28300 24970 60 -1
+De 0 0 22 0 0
+Po 0 28120 24400 28120 24790 60 -1
+De 0 0 22 0 0
+Po 0 27630 23910 28120 24400 60 -1
+De 0 0 22 0 0
+Po 3 27630 23910 27630 23910 250 -1
+De 15 1 22 0 0
+Po 0 27550 23910 27630 23910 60 -1
+De 15 0 22 0 0
+Po 0 27354 24106 27550 23910 60 -1
 De 15 0 22 0 0
 Po 0 27179 24106 27179 23199 60 -1
 De 15 0 22 0 400000
@@ -7880,8 +7874,6 @@ Po 0 29950 16110 30100 16260 60 -1
 De 0 0 22 0 0
 Po 0 29418 21476 29418 17812 60 -1
 De 0 0 22 0 0
-Po 0 26800 22820 26795 22825 60 -1
-De 15 0 22 0 0
 Po 3 26800 22820 26800 22820 250 -1
 De 15 1 22 0 0
 Po 0 26906 22926 26800 22820 60 -1
@@ -8090,16 +8082,12 @@ Po 0 26694 21530 26990 21530 60 -1
 De 0 0 25 0 0
 Po 3 26990 21530 26990 21530 250 -1
 De 15 1 25 0 0
-Po 0 26990 21530 27630 22170 60 -1
-De 15 0 25 0 0
 Po 0 24979 15939 24979 15685 60 -1
 De 15 0 25 0 800000
 Po 3 25060 16020 25060 16020 250 -1
 De 15 1 25 0 0
 Po 0 24979 15939 25060 16020 60 -1
 De 15 0 25 0 0
-Po 0 27630 22170 28821 23361 60 -1
-De 15 0 25 0 0
 Po 0 25646 19488 26190 20032 60 -1
 De 0 0 25 0 0
 Po 0 25646 19024 25646 19488 60 -1
@@ -8112,7 +8100,7 @@ Po 0 26050 17010 25060 16020 60 -1
 De 0 0 25 0 0
 Po 0 26050 18620 25646 19024 60 -1
 De 0 0 25 0 0
-Po 0 29205 23745 28821 23361 60 -1
+Po 0 29205 23745 26990 21530 60 -1
 De 15 0 25 0 0
 Po 0 28821 24500 28610 24500 60 -1
 De 15 0 26 0 400000
@@ -8146,18 +8134,16 @@ Po 0 28023 24697 27760 24960 60 -1
 De 15 0 26 0 0
 Po 3 27760 24960 27760 24960 250 -1
 De 15 1 26 0 0
-Po 0 27760 24960 27370 24570 60 -1
+Po 0 27760 24960 27250 24450 60 -1
 De 0 0 26 0 0
-Po 0 27370 24570 27370 23910 60 -1
+Po 0 27250 24450 27250 23680 60 -1
 De 0 0 26 0 0
-Po 0 27370 23800 26960 23390 60 -1
+Po 0 27250 23680 26960 23390 60 -1
 De 0 0 26 0 0
 Po 3 26960 23390 26960 23390 250 -1
 De 15 1 26 0 0
 Po 0 26960 23390 26540 22970 60 -1
 De 15 0 26 0 0
-Po 0 27370 23910 27370 23800 60 -1
-De 0 0 26 0 0
 Po 0 28413 24697 28023 24697 60 -1
 De 15 0 26 0 0
 Po 0 28610 24500 28413 24697 60 -1
@@ -8274,6 +8260,10 @@ Po 3 34050 21100 34050 21100 250 -1
 De 15 1 27 0 0
 Po 0 34226 20650 34226 20924 60 -1
 De 15 0 27 0 400000
+Po 0 34226 20650 34200 20650 60 -1
+De 15 0 27 0 C00000
+Po 0 34072 20650 34200 20650 60 -1
+De 15 0 27 0 C00000
 Po 3 34100 22250 34100 22250 370 180
 De 15 1 27 0 0
 Po 0 34050 22200 34100 22250 200 -1
@@ -8808,10 +8798,14 @@ Po 0 34900 14340 35110 14550 60 -1
 De 15 0 27 0 800000
 Po 0 29800 15000 29800 14600 60 -1
 De 15 0 27 0 400000
+Po 0 29800 15000 29672 15000 60 -1
+De 15 0 27 0 C00000
 Po 3 29800 14600 29800 14600 250 -1
 De 15 1 27 0 0
 Po 0 29900 15900 29900 16150 60 -1
 De 15 0 27 0 400000
+Po 0 29900 15900 29772 15900 60 -1
+De 15 0 27 0 C00000
 Po 3 29770 16280 29770 16280 250 -1
 De 15 1 27 0 0
 Po 0 29900 16150 29770 16280 60 -1
@@ -8828,6 +8822,8 @@ Po 3 29400 17450 29400 17450 250 -1
 De 15 1 27 0 0
 Po 0 29900 18100 29900 17750 60 -1
 De 15 0 27 0 400000
+Po 0 29900 18100 29772 18100 60 -1
+De 15 0 27 0 C00000
 Po 3 29900 17750 29900 17750 250 -1
 De 15 1 27 0 0
 Po 0 26236 17818 26236 18036 200 -1
@@ -8848,6 +8844,8 @@ Po 3 28800 18550 28800 18550 250 -1
 De 15 1 27 0 0
 Po 0 30200 19000 30200 19390 60 -1
 De 15 0 27 0 400000
+Po 0 30200 19000 30072 19000 60 -1
+De 15 0 27 0 C00000
 Po 3 30210 19400 30210 19400 250 -1
 De 15 1 27 0 0
 Po 0 30200 19390 30210 19400 60 -1
@@ -8886,6 +8884,8 @@ Po 0 23600 17500 23500 17400 60 -1
 De 15 0 27 0 0
 Po 0 24000 17500 24000 17850 60 -1
 De 15 0 27 0 400000
+Po 0 24000 17500 23872 17500 60 -1
+De 15 0 27 0 C00000
 Po 3 23880 17970 23880 17970 250 -1
 De 15 1 27 0 0
 Po 0 24000 17850 23880 17970 60 -1
@@ -8942,8 +8942,6 @@ Po 0 35110 13500 35400 13500 60 -1
 De 15 0 27 0 400000
 Po 3 35400 13500 35400 13500 250 -1
 De 15 1 27 0 0
-Po 0 35110 14550 35110 14460 60 -1
-De 15 0 27 0 400000
 Po 0 35160 20350 35160 20140 60 -1
 De 15 0 27 0 400000
 Po 3 35250 20050 35250 20050 250 -1
@@ -9092,6 +9090,8 @@ Po 0 28305 15455 28305 14900 90 -1
 De 15 0 39 0 800000
 Po 0 28890 15650 28500 15650 60 -1
 De 15 0 39 0 0
+Po 0 28890 15650 28890 15670 60 -1
+De 15 0 39 0 800000
 Po 0 28500 15650 28305 15455 60 -1
 De 15 0 39 0 0
 Po 0 25860 15800 25860 15993 200 -1
@@ -9272,8 +9272,6 @@ Po 0 31360 18100 31560 17900 90 -1
 De 15 0 67 0 0
 Po 0 31848 17492 32035 17492 90 -1
 De 15 0 67 0 800000
-Po 0 31848 17492 32035 17492 60 -1
-De 15 0 67 0 800000
 Po 0 33410 20550 33515 20550 90 -1
 De 15 0 68 0 400000
 Po 0 34009 20513 34009 20512 90 -1
@@ -9334,12 +9332,10 @@ Po 0 35310 19500 35553 19743 90 -1
 De 15 0 76 0 400000
 Po 0 35553 19743 35553 20333 90 -1
 De 15 0 76 0 800000
-Po 0 34391 19700 34650 19700 90 -1
+Po 0 34391 19700 34690 19700 90 -1
 De 15 0 77 0 400000
 Po 0 34690 19700 34890 19500 90 -1
 De 15 0 77 0 800000
-Po 0 34650 19700 34690 19700 90 -1
-De 15 0 77 0 0
 Po 0 35160 20650 35177 20667 90 -1
 De 15 0 78 0 400000
 Po 0 35177 20667 35553 20667 90 -1
@@ -9368,9 +9364,7 @@ Po 0 33290 19550 33360 19620 90 -1
 De 15 0 82 0 400000
 Po 0 33907 19460 34009 19562 90 -1
 De 15 0 82 0 800000
-Po 0 33850 19460 33907 19460 90 -1
-De 15 0 82 0 0
-Po 0 33660 19460 33850 19460 90 -1
+Po 0 33660 19460 33907 19460 90 -1
 De 15 0 82 0 0
 Po 0 33500 19620 33660 19460 90 -1
 De 15 0 82 0 0
@@ -9414,8 +9408,6 @@ Po 0 24565 18765 24500 18830 90 -1
 De 15 0 88 0 0
 Po 0 24500 19490 24500 18830 200 -1
 De 15 0 88 0 400000
-Po 0 24500 18830 24545 18785 200 -1
-De 15 0 88 0 0
 Po 0 25744 17542 25358 17542 200 -1
 De 15 0 89 0 400000
 Po 0 25358 17542 25350 17550 200 -1
@@ -9560,12 +9552,10 @@ Po 0 34400 16300 34690 16300 60 -1
 De 15 0 106 0 800000
 Po 0 34192 16508 34400 16300 60 -1
 De 15 0 106 0 0
-Po 0 32660 18900 32660 19900 90 -1
+Po 0 32660 18900 32660 20220 90 -1
 De 15 0 107 0 400000
 Po 0 32660 20220 32990 20550 90 -1
 De 15 0 107 0 800000
-Po 0 32660 19900 32660 20220 90 -1
-De 15 0 107 0 0
 Po 0 32660 18900 32660 18670 90 -1
 De 15 0 107 0 400000
 Po 0 32660 18670 32590 18600 90 -1
@@ -10941,11 +10931,7 @@ $POLYSCORNERS
 31000 24706 0 0
 31000 24575 0 0
 30950 24454 0 0
-30857 24361 0 0
-30797 24335 0 0
-30813 24320 0 0
-30859 24210 0 0
-30859 24091 0 0
+30859 24363 0 0
 30859 19430 0 0
 30859 19311 0 0
 30814 19201 0 0
@@ -11087,34 +11073,28 @@ $POLYSCORNERS
 30729 19624 0 0
 30813 19540 0 0
 30859 19430 0 0
-30859 24091 0 0
-30814 23981 0 0
-30730 23897 0 0
-30620 23851 0 0
-30501 23851 0 0
-30391 23896 0 0
-30307 23980 0 0
-30261 24090 0 0
-30261 24209 0 0
-30306 24319 0 0
-30390 24403 0 0
-30425 24418 0 0
+30859 24363 0 0
+30857 24361 0 0
+30736 24310 0 0
+30605 24310 0 0
+30484 24360 0 0
 30391 24453 0 0
 30340 24574 0 0
 30340 24705 0 0
-30368 24775 0 0
-30321 24823 0 0
-30270 24944 0 0
-30270 25075 0 0
-30320 25196 0 0
-30413 25289 0 0
-30534 25340 0 0
-30665 25340 0 0
-30786 25290 0 0
-30879 25197 0 0
-30930 25076 0 0
-30930 24945 0 0
-30901 24874 0 0
+30369 24777 0 0
+30297 24850 0 0
+30251 24960 0 0
+30251 25079 0 0
+30296 25189 0 0
+30380 25273 0 0
+30490 25319 0 0
+30609 25319 0 0
+30719 25274 0 0
+30803 25190 0 0
+30849 25080 0 0
+30849 24961 0 0
+30835 24928 0 0
+30856 24920 0 0
 30949 24827 0 0
 31000 24706 0 0
 31000 25211 0 0
@@ -11174,16 +11154,15 @@ $POLYSCORNERS
 29989 25568 0 0
 29989 24719 0 0
 29989 24315 0 0
-29974 24204 0 0
-29961 24172 0 0
-29907 24164 0 0
-29859 24212 0 0
-29859 22060 0 0
-29859 21941 0 0
-29814 21831 0 0
-29730 21747 0 0
-29620 21701 0 0
-29501 21701 0 0
+29989 21760 0 0
+29989 21641 0 0
+29944 21531 0 0
+29860 21447 0 0
+29750 21401 0 0
+29631 21401 0 0
+29521 21446 0 0
+29437 21530 0 0
+29391 21640 0 0
 29391 21746 0 0
 29307 21830 0 0
 29261 21940 0 0
@@ -11195,7 +11174,13 @@ $POLYSCORNERS
 29729 22254 0 0
 29813 22170 0 0
 29859 22060 0 0
-29859 24212 0 0
+29859 21954 0 0
+29943 21870 0 0
+29989 21760 0 0
+29989 24315 0 0
+29974 24204 0 0
+29961 24172 0 0
+29907 24164 0 0
 29836 24235 0 0
 29836 24093 0 0
 29828 24039 0 0
@@ -11409,10 +11394,10 @@ $POLYSCORNERS
 28814 25001 0 0
 28730 24917 0 0
 28620 24871 0 0
-28559 24871 0 0
-28559 24861 0 0
-28514 24751 0 0
-28475 24712 0 0
+28582 24871 0 0
+28554 24801 0 0
+28470 24717 0 0
+28466 24715 0 0
 28519 24694 0 0
 28603 24610 0 0
 28649 24500 0 0
@@ -11517,15 +11502,15 @@ $POLYSCORNERS
 28250 23777 0 0
 28140 23731 0 0
 28021 23731 0 0
-28005 23737 0 0
-28013 23730 0 0
-28059 23620 0 0
-28059 23501 0 0
-28014 23391 0 0
-27930 23307 0 0
-27820 23261 0 0
-27701 23261 0 0
-27684 23267 0 0
+27911 23776 0 0
+27902 23785 0 0
+27884 23741 0 0
+27800 23657 0 0
+27690 23611 0 0
+27642 23611 0 0
+27673 23580 0 0
+27719 23470 0 0
+27719 23351 0 0
 27674 23241 0 0
 27590 23157 0 0
 27480 23111 0 0
@@ -11886,15 +11871,14 @@ $POLYSCORNERS
 27420 22341 0 0
 27301 22341 0 0
 27191 22386 0 0
-27107 22470 0 0
-27061 22580 0 0
-27061 22668 0 0
-27054 22651 0 0
-26970 22567 0 0
-26860 22521 0 0
-26741 22521 0 0
-26631 22566 0 0
-26579 22618 0 0
+27109 22468 0 0
+27109 22381 0 0
+27064 22271 0 0
+26980 22187 0 0
+26870 22141 0 0
+26751 22141 0 0
+26641 22186 0 0
+26579 22248 0 0
 26579 21840 0 0
 26579 21721 0 0
 26534 21611 0 0
@@ -11991,7 +11975,12 @@ $POLYSCORNERS
 26449 22034 0 0
 26533 21950 0 0
 26579 21840 0 0
-26579 22618 0 0
+26579 22248 0 0
+26557 22270 0 0
+26511 22380 0 0
+26511 22499 0 0
+26556 22609 0 0
+26572 22625 0 0
 26547 22650 0 0
 26501 22760 0 0
 26501 22879 0 0
@@ -12011,15 +12000,13 @@ $POLYSCORNERS
 27180 23593 0 0
 27250 23663 0 0
 27360 23709 0 0
-27479 23709 0 0
-27495 23702 0 0
-27506 23729 0 0
-27572 23795 0 0
-27507 23860 0 0
-27461 23970 0 0
-27461 24089 0 0
-27506 24199 0 0
-27529 24222 0 0
+27408 23709 0 0
+27377 23740 0 0
+27331 23850 0 0
+27331 23969 0 0
+27376 24079 0 0
+27460 24163 0 0
+27566 24207 0 0
 27521 24226 0 0
 27437 24310 0 0
 27391 24420 0 0
@@ -12036,11 +12023,11 @@ $POLYSCORNERS
 27819 25259 0 0
 27929 25214 0 0
 28013 25130 0 0
-28023 25106 0 0
-28090 25173 0 0
-28200 25219 0 0
-28261 25219 0 0
-28261 25229 0 0
+28027 25094 0 0
+28046 25139 0 0
+28130 25223 0 0
+28240 25269 0 0
+28277 25269 0 0
 28306 25339 0 0
 28390 25423 0 0
 28500 25469 0 0
@@ -12113,25 +12100,6 @@ $POLYSCORNERS
 29269 26598 0 0
 29095 26525 0 0
 28906 26525 0 0
-28779 26577 0 0
-28779 26170 0 0
-28779 26051 0 0
-28734 25941 0 0
-28650 25857 0 0
-28540 25811 0 0
-28421 25811 0 0
-28311 25856 0 0
-28227 25940 0 0
-28181 26050 0 0
-28181 26169 0 0
-28226 26279 0 0
-28310 26363 0 0
-28420 26409 0 0
-28539 26409 0 0
-28649 26364 0 0
-28733 26280 0 0
-28779 26170 0 0
-28779 26577 0 0
 28731 26597 0 0
 28598 26731 0 0
 28525 26905 0 0
@@ -14735,11 +14703,7 @@ $POLYSCORNERS
 30815 17184 0 0
 30870 17052 0 0
 30870 24374 0 0
-30857 24361 0 0
-30797 24335 0 0
-30813 24320 0 0
-30859 24210 0 0
-30859 24091 0 0
+30859 24363 0 0
 30859 19430 0 0
 30859 19311 0 0
 30814 19201 0 0
@@ -14796,8 +14760,9 @@ $POLYSCORNERS
 30729 19624 0 0
 30813 19540 0 0
 30859 19430 0 0
-30859 24091 0 0
-30849 24066 0 0
+30859 24363 0 0
+30857 24361 0 0
+30849 24357 0 0
 30849 20470 0 0
 30849 20351 0 0
 30804 20241 0 0
@@ -14815,13 +14780,12 @@ $POLYSCORNERS
 30719 20664 0 0
 30803 20580 0 0
 30849 20470 0 0
-30849 24066 0 0
-30814 23981 0 0
-30730 23897 0 0
-30620 23851 0 0
-30501 23851 0 0
-30391 23896 0 0
-30360 23927 0 0
+30849 24357 0 0
+30736 24310 0 0
+30605 24310 0 0
+30484 24360 0 0
+30391 24453 0 0
+30360 24526 0 0
 30360 21522 0 0
 30360 21379 0 0
 30305 21247 0 0
@@ -14831,37 +14795,84 @@ $POLYSCORNERS
 29797 21145 0 0
 29695 21246 0 0
 29640 21378 0 0
-29640 21521 0 0
-29695 21653 0 0
-29796 21755 0 0
-29928 21810 0 0
+29640 21401 0 0
+29631 21401 0 0
+29521 21446 0 0
+29437 21530 0 0
+29391 21640 0 0
+29391 21746 0 0
+29310 21827 0 0
+29310 20272 0 0
+29310 20129 0 0
+29255 19997 0 0
+29154 19895 0 0
+29099 19872 0 0
+29099 18610 0 0
+29099 18491 0 0
+29054 18381 0 0
+28970 18297 0 0
+28860 18251 0 0
+28741 18251 0 0
+28631 18296 0 0
+28547 18380 0 0
+28501 18490 0 0
+28501 18609 0 0
+28546 18719 0 0
+28630 18803 0 0
+28740 18849 0 0
+28859 18849 0 0
+28969 18804 0 0
+29053 18720 0 0
+29099 18610 0 0
+29099 19872 0 0
+29022 19840 0 0
+28879 19840 0 0
+28747 19895 0 0
+28645 19996 0 0
+28590 20128 0 0
+28590 20271 0 0
+28645 20403 0 0
+28746 20505 0 0
+28878 20560 0 0
+29021 20560 0 0
+29153 20505 0 0
+29255 20404 0 0
+29310 20272 0 0
+29310 21827 0 0
+29307 21830 0 0
+29261 21940 0 0
+29261 22059 0 0
+29306 22169 0 0
+29390 22253 0 0
+29500 22299 0 0
+29619 22299 0 0
+29729 22254 0 0
+29813 22170 0 0
+29859 22060 0 0
+29859 21954 0 0
+29943 21870 0 0
+29968 21810 0 0
 30071 21810 0 0
 30203 21755 0 0
 30305 21654 0 0
 30360 21522 0 0
-30360 23927 0 0
-30307 23980 0 0
-30261 24090 0 0
-30261 24209 0 0
-30306 24319 0 0
-30390 24403 0 0
-30425 24418 0 0
-30391 24453 0 0
+30360 24526 0 0
 30340 24574 0 0
 30340 24705 0 0
-30368 24775 0 0
-30321 24823 0 0
-30270 24944 0 0
-30270 25075 0 0
-30320 25196 0 0
-30413 25289 0 0
-30534 25340 0 0
-30665 25340 0 0
-30786 25290 0 0
-30879 25197 0 0
-30930 25076 0 0
-30930 24945 0 0
-30901 24874 0 0
+30369 24777 0 0
+30297 24850 0 0
+30251 24960 0 0
+30251 25079 0 0
+30296 25189 0 0
+30380 25273 0 0
+30490 25319 0 0
+30609 25319 0 0
+30719 25274 0 0
+30803 25190 0 0
+30849 25080 0 0
+30849 24961 0 0
+30835 24928 0 0
+30856 24920 0 0
 30949 24827 0 0
 31000 24706 0 0
 31000 25211 0 0
@@ -14922,63 +14933,6 @@ $POLYSCORNERS
 30095 23317 0 0
 29994 23215 0 0
 29862 23160 0 0
-29859 23160 0 0
-29859 22060 0 0
-29859 21941 0 0
-29814 21831 0 0
-29730 21747 0 0
-29620 21701 0 0
-29501 21701 0 0
-29391 21746 0 0
-29310 21827 0 0
-29310 20272 0 0
-29310 20129 0 0
-29255 19997 0 0
-29154 19895 0 0
-29099 19872 0 0
-29099 18610 0 0
-29099 18491 0 0
-29054 18381 0 0
-28970 18297 0 0
-28860 18251 0 0
-28741 18251 0 0
-28631 18296 0 0
-28547 18380 0 0
-28501 18490 0 0
-28501 18609 0 0
-28546 18719 0 0
-28630 18803 0 0
-28740 18849 0 0
-28859 18849 0 0
-28969 18804 0 0
-29053 18720 0 0
-29099 18610 0 0
-29099 19872 0 0
-29022 19840 0 0
-28879 19840 0 0
-28747 19895 0 0
-28645 19996 0 0
-28590 20128 0 0
-28590 20271 0 0
-28645 20403 0 0
-28746 20505 0 0
-28878 20560 0 0
-29021 20560 0 0
-29153 20505 0 0
-29255 20404 0 0
-29310 20272 0 0
-29310 21827 0 0
-29307 21830 0 0
-29261 21940 0 0
-29261 22059 0 0
-29306 22169 0 0
-29390 22253 0 0
-29500 22299 0 0
-29619 22299 0 0
-29729 22254 0 0
-29813 22170 0 0
-29859 22060 0 0
-29859 23160 0 0
 29719 23160 0 0
 29587 23215 0 0
 29485 23316 0 0
@@ -15364,10 +15318,10 @@ $POLYSCORNERS
 28814 25001 0 0
 28730 24917 0 0
 28620 24871 0 0
-28559 24871 0 0
-28559 24861 0 0
-28514 24751 0 0
-28475 24712 0 0
+28582 24871 0 0
+28554 24801 0 0
+28470 24717 0 0
+28466 24715 0 0
 28519 24694 0 0
 28603 24610 0 0
 28649 24500 0 0
@@ -15384,15 +15338,15 @@ $POLYSCORNERS
 28250 23777 0 0
 28140 23731 0 0
 28021 23731 0 0
-28005 23737 0 0
-28013 23730 0 0
-28059 23620 0 0
-28059 23501 0 0
-28014 23391 0 0
-27930 23307 0 0
-27820 23261 0 0
-27701 23261 0 0
-27684 23267 0 0
+27911 23776 0 0
+27902 23785 0 0
+27884 23741 0 0
+27800 23657 0 0
+27690 23611 0 0
+27642 23611 0 0
+27673 23580 0 0
+27719 23470 0 0
+27719 23351 0 0
 27674 23241 0 0
 27590 23157 0 0
 27480 23111 0 0
@@ -15861,15 +15815,14 @@ $POLYSCORNERS
 27420 22341 0 0
 27301 22341 0 0
 27191 22386 0 0
-27107 22470 0 0
-27061 22580 0 0
-27061 22668 0 0
-27054 22651 0 0
-26970 22567 0 0
-26860 22521 0 0
-26741 22521 0 0
-26631 22566 0 0
-26579 22618 0 0
+27109 22468 0 0
+27109 22381 0 0
+27064 22271 0 0
+26980 22187 0 0
+26870 22141 0 0
+26751 22141 0 0
+26641 22186 0 0
+26579 22248 0 0
 26579 21840 0 0
 26579 21721 0 0
 26534 21611 0 0
@@ -15887,7 +15840,12 @@ $POLYSCORNERS
 26449 22034 0 0
 26533 21950 0 0
 26579 21840 0 0
-26579 22618 0 0
+26579 22248 0 0
+26557 22270 0 0
+26511 22380 0 0
+26511 22499 0 0
+26556 22609 0 0
+26572 22625 0 0
 26547 22650 0 0
 26501 22760 0 0
 26501 22879 0 0
@@ -16172,15 +16130,13 @@ $POLYSCORNERS
 27180 23593 0 0
 27250 23663 0 0
 27360 23709 0 0
-27479 23709 0 0
-27495 23702 0 0
-27506 23729 0 0
-27572 23795 0 0
-27507 23860 0 0
-27461 23970 0 0
-27461 24089 0 0
-27506 24199 0 0
-27529 24222 0 0
+27408 23709 0 0
+27377 23740 0 0
+27331 23850 0 0
+27331 23969 0 0
+27376 24079 0 0
+27460 24163 0 0
+27566 24207 0 0
 27521 24226 0 0
 27437 24310 0 0
 27391 24420 0 0
@@ -16197,11 +16153,11 @@ $POLYSCORNERS
 27819 25259 0 0
 27929 25214 0 0
 28013 25130 0 0
-28023 25106 0 0
-28090 25173 0 0
-28200 25219 0 0
-28261 25219 0 0
-28261 25229 0 0
+28027 25094 0 0
+28046 25139 0 0
+28130 25223 0 0
+28240 25269 0 0
+28277 25269 0 0
 28306 25339 0 0
 28390 25423 0 0
 28500 25469 0 0
@@ -16264,25 +16220,6 @@ $POLYSCORNERS
 29269 26598 0 0
 29095 26525 0 0
 28906 26525 0 0
-28779 26577 0 0
-28779 26170 0 0
-28779 26051 0 0
-28734 25941 0 0
-28650 25857 0 0
-28540 25811 0 0
-28421 25811 0 0
-28311 25856 0 0
-28227 25940 0 0
-28181 26050 0 0
-28181 26169 0 0
-28226 26279 0 0
-28310 26363 0 0
-28420 26409 0 0
-28539 26409 0 0
-28649 26364 0 0
-28733 26280 0 0
-28779 26170 0 0
-28779 26577 0 0
 28731 26597 0 0
 28598 26731 0 0
 28525 26905 0 0
@@ -17066,7 +17003,10 @@ $POLYSCORNERS
 25485 16735 0 0
 25845 17095 0 0
 25845 18251 1 0
-26086 26525 0 0
+26457 26583 0 0
+26355 26684 0 0
+26269 26598 0 0
+26095 26525 0 0
 25906 26525 0 0
 25841 26551 0 0
 23945 24655 0 0
@@ -17076,43 +17016,23 @@ $POLYSCORNERS
 25327 22460 0 0
 25281 22570 0 0
 25281 22689 0 0
-25326 22799 0 0
-25370 22843 0 0
-25052 22843 0 0
-24974 22859 0 0
-24907 22903 0 0
-24906 22903 0 0
-24906 22904 0 0
-24755 23055 0 0
-24711 23122 0 0
-24695 23200 0 0
-24695 23732 0 0
-24647 23780 0 0
-24601 23890 0 0
-24601 24009 0 0
-24646 24119 0 0
-24730 24203 0 0
-24769 24219 0 0
-24765 24240 0 0
-24765 25120 0 0
-24781 25198 0 0
-24825 25265 0 0
-24995 25435 0 0
-26081 26520 0 0
-26083 26523 0 0
-26086 26525 1 0
-28182 26173 0 0
-26312 26173 0 0
-25288 25149 0 0
-25319 25149 0 0
-26187 26017 0 0
-26253 26061 0 0
-26254 26061 0 0
-26332 26077 0 0
-26472 26077 0 0
-28181 26077 0 0
-28181 26169 0 0
-28182 26173 1 0
+25294 22721 0 0
+25002 22721 0 0
+24924 22737 0 0
+24857 22781 0 0
+24856 22781 0 0
+24856 22782 0 0
+24505 23133 0 0
+24461 23200 0 0
+24445 23278 0 0
+24445 24690 0 0
+24461 24768 0 0
+24505 24835 0 0
+26193 26523 0 0
+26259 26567 0 0
+26260 26567 0 0
+26338 26583 0 0
+26457 26583 1 0
 28397 25667 0 0
 26989 25667 0 0
 26989 24719 0 0
@@ -17293,8 +17213,16 @@ $POLYSCORNERS
 25480 24597 0 0
 25370 24551 0 0
 25251 24551 0 0
-25175 24582 0 0
-25175 24348 0 0
+25141 24596 0 0
+25057 24680 0 0
+25019 24769 0 0
+24855 24605 0 0
+24855 24249 0 0
+24959 24249 0 0
+25069 24204 0 0
+25121 24152 0 0
+25121 24229 0 0
+25166 24339 0 0
 25250 24423 0 0
 25360 24469 0 0
 25479 24469 0 0
@@ -17309,8 +17237,19 @@ $POLYSCORNERS
 25709 23740 0 0
 25709 23621 0 0
 25664 23511 0 0
-25648 23495 0 0
-25762 23495 0 0
+25580 23427 0 0
+25470 23381 0 0
+25351 23381 0 0
+25241 23426 0 0
+25157 23510 0 0
+25111 23620 0 0
+25111 23738 0 0
+25105 23732 0 0
+25105 23285 0 0
+25137 23253 0 0
+25681 23253 0 0
+25681 23349 0 0
+25726 23459 0 0
 25810 23543 0 0
 25920 23589 0 0
 26039 23589 0 0
@@ -17323,11 +17262,10 @@ $POLYSCORNERS
 26790 23643 0 0
 26900 23689 0 0
 26969 23689 0 0
-27165 23885 0 0
-27165 23910 0 0
-27165 24570 0 0
-27181 24648 0 0
-27225 24715 0 0
+27045 23765 0 0
+27045 24450 0 0
+27061 24528 0 0
+27105 24595 0 0
 27461 24951 0 0
 27461 25019 0 0
 27506 25129 0 0
@@ -17337,12 +17275,13 @@ $POLYSCORNERS
 27929 25214 0 0
 27936 25206 0 0
 28397 25667 1 0
-29701 26173 0 0
-29379 26173 0 0
-29379 26091 0 0
-29373 26077 0 0
-29605 26077 0 0
-29701 26173 1 0
+28786 26077 0 0
+28781 26090 0 0
+28781 26173 0 0
+26423 26173 0 0
+26325 26075 0 0
+26332 26077 0 0
+28786 26077 1 0
 29801 16269 0 0
 29785 16285 0 0
 29741 16352 0 0
@@ -17358,6 +17297,13 @@ $POLYSCORNERS
 29761 16188 0 0
 29801 16248 0 0
 29801 16269 1 0
+29823 26295 0 0
+29343 26295 0 0
+29379 26210 0 0
+29379 26091 0 0
+29373 26077 0 0
+29605 26077 0 0
+29823 26295 1 0
 30587 17564 0 0
 30520 17497 0 0
 30410 17451 0 0
@@ -17385,17 +17331,20 @@ $POLYSCORNERS
 30501 16860 0 0
 30587 16824 0 0
 30587 17564 1 0
-30645 23861 0 0
-30620 23851 0 0
-30501 23851 0 0
-30391 23896 0 0
-30307 23980 0 0
-30261 24090 0 0
-30261 24159 0 0
-30205 24215 0 0
-30161 24282 0 0
-30145 24360 0 0
-30145 25501 0 0
+30645 24310 0 0
+30605 24310 0 0
+30484 24360 0 0
+30391 24453 0 0
+30340 24574 0 0
+30340 24705 0 0
+30369 24777 0 0
+30297 24850 0 0
+30251 24960 0 0
+30251 25079 0 0
+30296 25189 0 0
+30335 25228 0 0
+30335 25540 0 0
+30240 25501 0 0
 30121 25501 0 0
 30013 25545 0 0
 29989 25545 0 0
@@ -17604,14 +17553,11 @@ $POLYSCORNERS
 29378 23285 0 0
 30095 23285 0 0
 30645 23835 0 0
-30645 23861 1 0
+30645 24310 1 0
 30797 20813 0 0
-29796 21813 0 0
-29755 21772 0 0
-29807 21721 0 0
-29851 21655 0 0
-29851 21654 0 0
-29867 21576 0 0
+29983 21626 0 0
+29944 21531 0 0
+29867 21454 0 0
 29867 19313 0 0
 30040 19140 0 0
 30261 19361 0 0
@@ -17995,8 +17941,7 @@ $POLYSCORNERS
 33603 18670 0 0
 33649 18560 0 0
 33649 18441 0 0
-33645 18431 0 0
-33685 18405 0 0
+33644 18429 0 0
 33690 18400 0 0
 33713 18376 0 0
 33780 18443 0 0
diff --git a/hardware/lollipop/lollipop.net b/hardware/lollipop/lollipop.net
index f7f25b87..8147ba37 100644
--- a/hardware/lollipop/lollipop.net
+++ b/hardware/lollipop/lollipop.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Tue Jun 19 10:24:29 2012
+# EESchema Netlist Version 1.1 created  Tue Jun 19 23:54:02 2012
 (
  ( /4FC55556 $noname  T6 RX_LOWPASS_BALUN {Lib=BALUN-RFXF9503}
   (    1 N-000050 )
@@ -207,17 +207,17 @@
  ( /4FB2F209 $noname  U19 GSG-74HC08 {Lib=GSG-74HC08}
   (    0 GND )
   (    1 /SWRXB2 )
-  (    2 /SWRXA2 )
+  (    2 /SWRXA1 )
   (    3 /SWRXV2 )
   (    4 /SWRXB2 )
-  (    5 /SWRXA1 )
+  (    5 /SWRXA2 )
   (    6 /SWRXV3 )
   (    7 GND )
   (    8 /SWTXV1 )
-  (    9 /SWTXA2 )
+  (    9 /SWTXA1 )
   (   10 /SWTXB1 )
   (   11 /SWTXV2 )
-  (   12 /SWTXA1 )
+  (   12 /SWTXA2 )
   (   13 /SWTXB1 )
   (   14 VCC )
  )
@@ -1138,166 +1138,166 @@ Net 2 "" ""
  C30 2
  R3 1
 Net 3 "GND" "GND"
+ C7 2
+ T5 2
+ C13 2
+ P3 3
+ P3 2
+ U11 4
+ U15 0
+ U1 0
+ P3 5
+ U3 0
+ T3 3
+ T6 3
+ U5 3
+ U5 4
+ U8 2
+ P2 5
+ U8 4
+ U13 3
+ U13 4
+ U11 2
+ P3 4
+ P2 2
+ P2 3
+ P2 4
+ U4 2
  U16 2
- U17 0
  C69 2
+ U17 0
  U2 2
  U12 2
  U14 2
  U19 7
+ U18 2
+ T7 2
+ P1 4
+ P1 5
+ T1 2
+ U10 2
+ T1 5
+ T2 5
+ U6 2
+ T4 2
+ T4 5
+ T2 2
+ U9 2
+ P4 9
+ P1 3
+ C1 2
  P5 2
  P5 3
  P5 4
  P5 5
  P1 2
  C6 2
- U4 2
- D1 1
- U19 0
- P6 1
- U7 2
- C27 2
+ T8 2
+ T8 5
+ C60 2
+ C68 2
  C38 2
- U18 2
- P4 9
- C50 2
- C58 2
- U17 7
- U11 2
- P3 4
- U11 4
- P2 2
- P2 3
- P2 4
- P2 5
- P3 2
- P3 3
- C13 2
- T5 2
- C7 2
- U1 0
- P3 5
- U3 0
- T3 3
- T7 5
- T6 3
- U5 3
- U5 4
- T7 2
- U8 2
- U8 4
- T5 5
- U13 3
- U13 4
- T2 2
- U1 12
- T1 5
- U10 2
- T2 5
- T4 2
- U6 2
- T4 5
- T1 2
- U9 2
- P1 3
- C1 2
- U15 0
- P1 4
- P1 5
- R4 1
- C26 2
- C21 2
- C20 2
- C70 2
- C75 2
- C48 2
- C41 2
- C62 2
- C22 2
- C18 2
- C32 2
- C19 2
- C17 2
- P4 10
- C16 2
- C39 2
- C57 2
- C56 2
- C55 2
- C54 2
- C15 2
  C42 2
  C49 2
- C29 2
- C28 2
- P7 13
- P7 14
+ C15 2
+ C26 2
+ C27 2
+ C70 2
+ C75 2
+ U1 12
+ T5 5
+ T7 5
+ U7 2
+ C58 2
+ C50 2
+ C39 2
+ P4 10
+ C48 2
+ C41 2
  C76 2
+ P7 13
  P8 1
  P8 3
  P8 5
- C14 2
- C61 2
+ C32 2
+ C56 2
+ C55 2
+ C54 2
+ C29 2
+ C28 2
+ C57 2
+ C62 2
+ C22 2
+ C18 2
+ C19 2
+ C17 2
+ C16 2
+ R4 1
+ C21 2
+ C20 2
  C77 2
+ U17 7
+ D1 1
+ C14 2
+ U19 0
+ C61 2
+ P7 14
+ P6 1
  D2 1
- C68 2
- C60 2
- T8 5
- T8 2
 Net 4 "VCC" "VCC"
- U1 22
- U1 5
- P8 2
- L5 2
- L4 2
- L1 1
- P8 6
- P8 4
- C76 1
- C61 1
- U17 14
- U19 14
- R6 1
- C22 1
- C16 1
- C17 1
- C19 1
- C62 1
- C18 1
- C14 1
- R5 1
  C20 1
  C21 1
- U1 19
- L2 1
  C69 1
+ U19 14
+ C19 1
+ C17 1
+ C62 1
+ C16 1
+ R6 1
+ C18 1
+ C22 1
+ R5 1
+ U17 14
+ L4 2
+ C14 1
+ L5 2
+ L2 1
+ U1 19
+ C61 1
+ U1 5
+ L1 1
+ C76 1
+ P8 2
+ P8 4
+ P8 6
+ U1 22
 Net 5 "/RESETX" "RESETX"
- P4 7
- P4 8
+ R5 2
  C54 1
  U1 29
- R5 2
+ P4 8
+ P4 7
 Net 8 "" ""
- U10 3
  C46 1
+ U10 3
 Net 9 "" ""
- U3 1
  C33 1
+ U3 1
 Net 10 "" ""
  C44 2
  U15 1
 Net 11 "" ""
- U10 5
  C44 1
+ U10 5
 Net 12 "" ""
  C67 2
  T7 1
 Net 13 "/SWD2" "SWD2"
  C38 1
+ U17 10
+ U10 6
  U7 6
  C41 1
- U10 6
- U17 10
 Net 14 "" ""
  C34 1
  U9 1
@@ -1309,24 +1309,24 @@ Net 16 "" ""
  U9 5
 Net 17 "" ""
  C64 1
- U1 28
  L6 1
+ U1 28
  L5 1
 Net 18 "" ""
  T3 4
  C34 2
 Net 19 "" ""
- C8 2
  U8 1
+ C8 2
 Net 20 "" ""
- U15 8
  C63 1
+ U15 8
 Net 21 "" ""
- C47 2
  T6 5
+ C47 2
 Net 22 "" ""
- U14 5
  C52 1
+ U14 5
 Net 23 "" ""
  C45 1
  U12 5
@@ -1334,32 +1334,32 @@ Net 24 "" ""
  C23 2
  T3 5
 Net 25 "" ""
- U6 1
  C23 1
+ U6 1
 Net 26 "/SWRXB1" "SWRXB1"
- U18 6
  U16 6
- U15 3
- C60 1
- C70 1
  P7 3
+ U15 3
  U17 3
+ U18 6
+ C70 1
+ C60 1
 Net 27 "/SWTXB1" "SWTXB1"
- U4 6
  C1 1
+ P7 1
  U2 6
+ C7 1
  U19 10
  U19 13
  U17 1
- C7 1
- P7 1
+ U4 6
 Net 28 "/SWRXA1" "SWRXA1"
- P7 9
- U19 5
- U17 9
- C42 1
- U14 6
  U12 6
+ U14 6
+ U17 9
+ P7 9
+ U19 2
+ C42 1
  C50 1
 Net 30 "/SWTXA1" "SWTXA1"
  P7 5
@@ -1367,50 +1367,50 @@ Net 30 "/SWTXA1" "SWTXA1"
  C15 1
  U6 6
  U9 6
- U19 12
+ U19 9
  U17 5
 Net 31 "" ""
  U1 17
- L1 2
- L3 2
  C24 2
+ L3 2
+ L1 2
 Net 32 "/CLK" "CLK"
- P6 2
  C74 1
+ P6 2
 Net 35 "/SWRXV3" "SWRXV3"
- U19 6
  U15 7
+ U19 6
 Net 36 "/SWRXB2" "SWRXB2"
- U19 4
  U16 4
- C68 1
- U18 4
+ U19 4
  U19 1
- U17 4
+ C68 1
  C75 1
-Net 37 "/SWRXA2" "SWRXA2"
- U19 2
- C49 1
- C58 1
- U17 8
- U12 4
- U14 4
-Net 38 "/SWRXV2" "SWRXV2"
+ U18 4
+ U17 4
+Net 37 "/SWRXV2" "SWRXV2"
  U15 6
  U19 3
+Net 38 "/SWRXA2" "SWRXA2"
+ U19 5
+ C49 1
+ U14 4
+ C58 1
+ U12 4
+ U17 8
 Net 39 "/SWTXA2" "SWTXA2"
- U9 4
- U19 9
- C39 1
- U17 6
- U6 4
  C26 1
+ U6 4
+ C39 1
+ U19 12
+ U17 6
+ U9 4
 Net 40 "" ""
- C25 2
  T4 4
+ C25 2
 Net 41 "" ""
- C10 1
  T2 3
+ C10 1
 Net 42 "" ""
  C5 2
  T2 1
@@ -1421,8 +1421,8 @@ Net 44 "" ""
  P1 1
  T1 1
 Net 45 "" ""
- C73 1
  U18 3
+ C73 1
 Net 46 "" ""
  U1 14
  C4 2
@@ -1439,39 +1439,39 @@ Net 50 "" ""
  T6 1
  U13 1
 Net 51 "/SWTXB2" "SWTXB2"
- U2 4
- C13 1
  U4 4
+ C13 1
  U17 2
- U3 7
+ U2 4
  C6 1
+ U3 7
 Net 52 "" ""
- U8 3
  T4 1
+ U8 3
 Net 53 "" ""
- U3 8
  C5 1
+ U3 8
 Net 54 "/SWTXV2" "SWTXV2"
  U19 11
  U3 6
 Net 55 "" ""
- U3 5
  C9 2
+ U3 5
 Net 56 "" ""
- U3 4
  C8 1
+ U3 4
 Net 57 "/SWTXV1" "SWTXV1"
- U3 3
  U19 8
+ U3 3
 Net 59 "/GPO6" "GPO6"
  P7 12
  U1 9
 Net 60 "" ""
- R4 2
  U1 4
+ R4 2
 Net 61 "/GPO5" "GPO5"
- U1 1
  P7 10
+ U1 1
 Net 62 "/REF_IN" "REF_IN"
  U1 10
  C74 2
@@ -1489,8 +1489,8 @@ Net 66 "/GPO2" "GPO2"
  U1 16
  P7 4
 Net 67 "/GPO3" "GPO3"
- U1 25
  P7 6
+ U1 25
 Net 68 "/GPO1" "GPO1"
  P7 2
  U1 15
@@ -1504,14 +1504,14 @@ Net 71 "" ""
  C71 2
  U18 1
 Net 75 "" ""
- U12 3
  C43 2
+ U12 3
 Net 76 "" ""
- C51 2
  U14 3
+ C51 2
 Net 77 "" ""
- T5 3
  C51 1
+ T5 3
 Net 78 "" ""
  U11 1
  C59 1
@@ -1519,44 +1519,44 @@ Net 79 "" ""
  U7 5
  C35 1
 Net 80 "" ""
- U7 3
  C33 2
+ U7 3
 Net 81 "" ""
  C40 1
  U7 1
 Net 82 "" ""
- T8 3
  C65 2
+ T8 3
 Net 83 "" ""
- C65 1
  U16 5
+ C65 1
 Net 84 "" ""
- C72 2
  T8 4
+ C72 2
 Net 85 "" ""
- P5 1
  T8 1
+ P5 1
 Net 86 "" ""
  U18 5
  C72 1
 Net 87 "" ""
- C66 1
  U16 3
+ C66 1
 Net 88 "" ""
- C64 2
  U16 1
+ C64 2
 Net 89 "" ""
- C25 1
  U6 3
+ C25 1
 Net 90 "" ""
- T4 3
  C37 2
+ T4 3
 Net 91 "" ""
- C37 1
  U9 3
+ C37 1
 Net 92 "" ""
- U14 1
  C53 1
+ U14 1
 Net 93 "" ""
  U12 1
  C47 1
@@ -1564,14 +1564,14 @@ Net 94 "" ""
  U15 4
  C67 1
 Net 95 "" ""
- U13 2
  C63 2
+ U13 2
 Net 96 "" ""
  C59 2
  U15 5
 Net 97 "" ""
- T6 4
  C53 2
+ T6 4
 Net 98 "" ""
  C2 1
  T2 4
@@ -1580,11 +1580,11 @@ Net 99 "" ""
  U4 1
 Net 100 "/SWD1" "SWD1"
  U17 11
- C48 1
  U7 4
  C27 1
- P7 11
  U10 4
+ P7 11
+ C48 1
 Net 101 "" ""
  C9 1
  U5 2
@@ -1593,43 +1593,43 @@ Net 102 "" ""
  C43 1
 Net 103 "" ""
  L3 1
- U1 18
- L2 2
  C36 2
+ L2 2
+ U1 18
 Net 108 "" ""
- U5 1
  T3 1
+ U5 1
 Net 109 "" ""
  C46 2
  D2 2
  P3 1
 Net 110 "" ""
- D1 2
  P2 1
+ D1 2
  C35 2
 Net 111 "" ""
- C40 2
  U10 1
+ C40 2
 Net 112 "/ENX" "ENX"
+ P4 6
  R6 2
+ P4 5
  C55 1
  U1 30
- P4 6
- P4 5
 Net 113 "/SDATA" "SDATA"
- C57 1
  U1 32
- P4 1
+ C57 1
  P4 2
+ P4 1
 Net 115 "" ""
- U4 5
  C11 1
+ U4 5
 Net 116 "" ""
- U4 3
  C12 1
+ U4 3
 Net 117 "" ""
- U2 5
  C3 1
+ U2 5
 Net 118 "" ""
  C4 1
  U2 3
@@ -1638,19 +1638,19 @@ Net 119 "" ""
  U2 1
 Net 120 "" ""
  C30 1
- C31 1
  R2 1
+ C31 1
  U1 7
 Net 121 "/SCLK" "SCLK"
  C56 1
  U1 31
- P4 3
  P4 4
+ P4 3
 Net 122 "" ""
- U1 27
- L4 1
- C71 1
  L6 2
+ C71 1
+ L4 1
+ U1 27
 Net 123 "" ""
  R2 2
  C29 1