diff --git a/hardware/lollipop/lollipop-cache.lib b/hardware/lollipop/lollipop-cache.lib
index 3ff16de5..4632b5e8 100644
--- a/hardware/lollipop/lollipop-cache.lib
+++ b/hardware/lollipop/lollipop-cache.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Fri May 18 18:46:38 2012
+EESchema-LIBRARY Version 2.3  Date: Fri May 18 23:02:13 2012
 #encoding utf-8
 #
 # BALUN
diff --git a/hardware/lollipop/lollipop.brd b/hardware/lollipop/lollipop.brd
index b28de6c4..95a8ac43 100644
--- a/hardware/lollipop/lollipop.brd
+++ b/hardware/lollipop/lollipop.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Fri May 18 19:16:02 2012
+PCBNEW-BOARD Version 1 date Sat May 19 14:57:29 2012
 
 # Created by Pcbnew(2011-06-30 BZR 3033)-stable
 
@@ -8,10 +8,10 @@ LayerCount 2
 Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 364
-NoConn 291
-Di -14560 2440 38560 36969
+NoConn 272
+Di -13560 2440 38560 36961
 Ndraw 0
-Ntrack 342
+Ntrack 464
 Nzone 0
 BoardThickness 630
 Nmodule 126
@@ -677,7 +677,7 @@ Le 190208
 $EndPAD
 $EndMODULE  GSG-SMA-EDGE
 $MODULE GSG-SMA-EDGE
-Po 1000 21000 0 15 4D83CDBE 4FB6B926 ~P
+Po 22000 20000 0 15 4D83CDBE 4FB6B926 ~P
 Li GSG-SMA-EDGE
 Sc 4FB6B926
 AR /4F94D0E4
@@ -726,7 +726,7 @@ Le 190208
 $EndPAD
 $EndMODULE  GSG-SMA-EDGE
 $MODULE GSG-SMA-EDGE
-Po -14000 35000 0 15 4D83CDBE 4FB6B928 ~P
+Po 22000 14000 0 15 4D83CDBE 4FB6B928 ~P
 Li GSG-SMA-EDGE
 Sc 4FB6B928
 AR /4F94D0F2
@@ -824,7 +824,7 @@ Le 190208
 $EndPAD
 $EndMODULE  GSG-SMA-EDGE
 $MODULE GSG-SKY13317-373LF
-Po -8000 36000 0 15 4FB689E7 4FB6B93E ~P
+Po 24900 15400 0 15 4FB689E7 4FB6B93E ~P
 Li GSG-SKY13317-373LF
 Sc 4FB6B93E
 AR /4F94CFA9
@@ -954,7 +954,7 @@ Le 343506680
 $EndPAD
 $EndMODULE  GSG-SKY13317-373LF
 $MODULE GSG-SKY13317-373LF
-Po -1000 31000 0 15 4FB689E7 4FB6B940 ~P
+Po 24850 18500 0 15 4FB689E7 4FB6B940 ~P
 Li GSG-SKY13317-373LF
 Sc 4FB6B940
 AR /4FB68075
@@ -1923,17 +1923,17 @@ Le 50882848
 $EndPAD
 $EndMODULE  GSG-QFN32
 $MODULE GSG-LXES1UBBB1-008
-Po -5000 3000 0 15 4FB67CFC 4FB6B945 ~P
+Po 23900 13800 2700 15 4FB67CFC 4FB6B945 ~P
 Li GSG-LXES1UBBB1-008
 Sc 4FB6B945
 AR /4FB3F7D4
 Op 0 0 0
-T0 0 0 157 118 0 30 N V 21 N "D1"
-T1 0 0 157 118 0 30 N I 21 N "GSG-DIODE-TVS-BI"
+T0 0 0 157 118 2700 30 N V 21 N "D1"
+T1 0 0 157 118 2700 30 N I 21 N "GSG-DIODE-TVS-BI"
 DS -197 157 197 157 40 21
 DS -197 -157 197 -157 40 21
 $PAD
-Sh "1" R 217 236 0 0 0
+Sh "1" R 217 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -1941,7 +1941,7 @@ Po -167 0
 Le 45103184
 $EndPAD
 $PAD
-Sh "2" R 217 236 0 0 0
+Sh "2" R 217 236 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 96 "N-000103"
@@ -1950,17 +1950,17 @@ Le 343506872
 $EndPAD
 $EndMODULE  GSG-LXES1UBBB1-008
 $MODULE GSG-LXES1UBBB1-008
-Po -8000 6000 0 15 4FB67CFC 4FB6B947 ~P
+Po 23900 20200 900 15 4FB67CFC 4FB6B947 ~P
 Li GSG-LXES1UBBB1-008
 Sc 4FB6B947
 AR /4FB3F9B0
 Op 0 0 0
-T0 0 0 157 118 0 30 N V 21 N "D2"
-T1 0 0 157 118 0 30 N I 21 N "GSG-DIODE-TVS-BI"
+T0 0 0 157 118 900 30 N V 21 N "D2"
+T1 0 0 157 118 900 30 N I 21 N "GSG-DIODE-TVS-BI"
 DS -197 157 197 157 40 21
 DS -197 -157 197 -157 40 21
 $PAD
-Sh "1" R 217 236 0 0 0
+Sh "1" R 217 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -1968,7 +1968,7 @@ Po -167 0
 Le 45103184
 $EndPAD
 $PAD
-Sh "2" R 217 236 0 0 0
+Sh "2" R 217 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
 Ne 95 "N-000102"
@@ -2024,7 +2024,7 @@ Le -1954803976
 $EndPAD
 $EndMODULE  GSG-LP0603
 $MODULE GSG-LP0603
-Po 26250 19050 1800 15 4FB69325 4FB6B94A ~P
+Po 26250 19200 1800 15 4FB69325 4FB6B94A ~P
 Li GSG-LP0603
 Sc 4FB6B94A
 AR /4F94D561
@@ -2851,7 +2851,7 @@ Le -738287784
 $EndPAD
 $EndMODULE  GSG-2500BL14M100
 $MODULE GSG-2500BL14M100
-Po -4000 27000 0 15 4F5D90A4 4FB6B95C ~P
+Po 32300 14300 0 15 4F5D90A4 4FB6B95C ~P
 Li GSG-2500BL14M100
 Sc 4FB6B95C
 AR /4F94CC10
@@ -2913,7 +2913,7 @@ Le -738287784
 $EndPAD
 $EndMODULE  GSG-2500BL14M100
 $MODULE GSG-2500BL14M100
-Po 35750 14150 1800 15 4F5D90A4 4FB6B95E ~P
+Po 35700 14400 1800 15 4F5D90A4 4FB6B95E ~P
 Li GSG-2500BL14M100
 Sc 4FB6B95E
 AR /4FA9C4DF
@@ -3367,7 +3367,7 @@ Le 47880416
 $EndPAD
 $EndMODULE  GSG-SKY13351-378LF
 $MODULE GSG-SKY13351-378LF
-Po -1000 22000 0 15 4FB6C2C7 4FB6B935 ~~
+Po 24000 17500 0 15 4FB6C2C7 4FB6B935 ~~
 Li GSG-SKY13351-378LF
 Sc 4FB6B935
 AR /4FB680FF
@@ -3465,13 +3465,13 @@ Le 47880416
 $EndPAD
 $EndMODULE  GSG-SKY13351-378LF
 $MODULE GSG-SKY13351-378LF
-Po 0 24000 0 15 4FB6C2C7 4FB6B931 ~~
+Po 24000 16500 1800 15 4FB6C2C7 4FB6B931 ~~
 Li GSG-SKY13351-378LF
 Sc 4FB6B931
 AR /4FAA1575
 Op 0 0 0
-T0 0 0 197 118 0 30 N V 21 N "U7"
-T1 0 0 197 118 0 30 N I 21 N "SKY13351"
+T0 0 0 197 118 1800 30 N V 21 N "U7"
+T1 0 0 197 118 1800 30 N I 21 N "SKY13351"
 DS 59 197 197 197 40 21
 DS -197 197 -59 197 40 21
 DS -59 -197 -118 -197 40 21
@@ -3482,7 +3482,7 @@ DS -197 -79 -197 -59 40 21
 DS 197 -59 197 -79 40 21
 DS 197 79 197 59 40 21
 $PAD
-Sh "1" R 130 60 0 0 0
+Sh "1" R 130 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 75 "N-000082"
@@ -3490,7 +3490,7 @@ Po -191 -138
 Le 41110432
 $EndPAD
 $PAD
-Sh "2" R 256 60 0 0 0
+Sh "2" R 256 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -3498,7 +3498,7 @@ Po -128 0
 Le 343506792
 $EndPAD
 $PAD
-Sh "3" R 130 60 0 0 0
+Sh "3" R 130 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 74 "N-000081"
@@ -3506,15 +3506,15 @@ Po -191 138
 Le 41110432
 $EndPAD
 $PAD
-Sh "4" R 130 60 0 0 0
+Sh "4" R 130 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 14 "/SWD2"
+Ne 13 "/SWD1"
 Po 191 138
 Le 20
 $EndPAD
 $PAD
-Sh "5" R 130 60 0 0 0
+Sh "5" R 130 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 73 "N-000080"
@@ -3522,15 +3522,15 @@ Po 191 0
 Le 4149
 $EndPAD
 $PAD
-Sh "6" R 130 60 0 0 0
+Sh "6" R 130 60 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "/SWD1"
+Ne 14 "/SWD2"
 Po 191 -138
 Le 41110432
 $EndPAD
 $PAD
-Sh "2" R 60 512 0 0 0
+Sh "2" R 60 512 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -3538,7 +3538,7 @@ Po 0 0
 Le 41110432
 $EndPAD
 $PAD
-Sh "2" O 51 197 0 0 0
+Sh "2" O 51 197 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -3546,7 +3546,7 @@ Po 26 0
 Le 41110432
 $EndPAD
 $PAD
-Sh "2" O 59 157 0 0 -450
+Sh "2" O 59 157 0 0 1350
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -3554,7 +3554,7 @@ Po -43 -35
 Le 41110432
 $EndPAD
 $PAD
-Sh "2" O 59 157 0 0 450
+Sh "2" O 59 157 0 0 2250
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -3661,7 +3661,7 @@ Le 47880416
 $EndPAD
 $EndMODULE  GSG-SKY13351-378LF
 $MODULE GSG-SKY13351-378LF
-Po 33800 14950 0 15 4FB6C2C7 4FB6B92F ~~
+Po 34200 15000 0 15 4FB6C2C7 4FB6B92F ~~
 Li GSG-SKY13351-378LF
 Sc 4FB6B92F
 AR /4FB68133
@@ -3857,7 +3857,7 @@ Le 47880416
 $EndPAD
 $EndMODULE  GSG-SKY13351-378LF
 $MODULE GSG-SKY13351-378LF
-Po 33550 14100 0 15 4FB6C2C7 4FB6B92D ~~
+Po 34200 14050 0 15 4FB6C2C7 4FB6B92D ~~
 Li GSG-SKY13351-378LF
 Sc 4FB6B92D
 AR /4FB68137
@@ -3955,7 +3955,7 @@ Le 47880416
 $EndPAD
 $EndMODULE  GSG-SKY13351-378LF
 $MODULE GSG-0402
-Po 34350 12750 0 15 4FB6CFE4 4FB6B9F3 ~~
+Po 34900 13500 0 15 4FB6CFE4 4FB6B9F3 ~~
 Li GSG-0402
 Sc 4FB6B9F3
 AR /4FA9C67C
@@ -3987,7 +3987,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 32840 13740 0 15 4FB6CFE4 4FB6B9D1 ~~
+Po 33250 13900 0 15 4FB6CFE4 4FB6B9D1 ~~
 Li GSG-0402
 Sc 4FB6B9D1
 AR /4FA9C7AF
@@ -4019,7 +4019,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 34440 13170 0 15 4FB6CFE4 4FB6B9CF ~~
+Po 34900 13950 0 15 4FB6CFE4 4FB6B9CF ~~
 Li GSG-0402
 Sc 4FB6B9CF
 AR /4FA9C6EF
@@ -4051,20 +4051,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 32870 14280 0 15 4FB6CFE4 4FB6B9CD ~~
+Po 33250 14200 1800 15 4FB6CFE4 4FB6B9CD ~~
 Li GSG-0402
 Sc 4FB6B9CD
 AR /4FA9C7B1
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C4"
-T1 0 20 160 160 0 40 N I 21 N "100pF"
+T0 0 20 160 160 1800 40 N V 21 N "C4"
+T1 0 20 160 160 1800 40 N I 21 N "100pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 56 "N-000049"
@@ -4072,7 +4072,7 @@ Po 210 0
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 97 "N-000104"
@@ -4114,7 +4114,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 34400 13620 0 15 4FB6CFE4 4FB6B9C9 ~~
+Po 34900 14550 0 15 4FB6CFE4 4FB6B9C9 ~~
 Li GSG-0402
 Sc 4FB6B9C9
 AR /4FA9C6ED
@@ -4146,20 +4146,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 34450 14070 0 15 4FB6CFE4 4FB6B9C7 ~~
+Po 33750 14500 1800 15 4FB6CFE4 4FB6B9C7 ~~
 Li GSG-0402
 Sc 4FB6B9C7
 AR /4FAA06F8
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C7"
-T1 0 20 160 160 0 40 N I 21 N "33pF"
+T0 0 20 160 160 1800 40 N V 21 N "C7"
+T1 0 20 160 160 1800 40 N I 21 N "33pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -4168,7 +4168,7 @@ Le 1
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 23 "/SWTXB1"
@@ -4242,7 +4242,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 32800 14850 0 15 4FB6CFE4 4FB6B9C1 ~~
+Po 32770 14850 0 15 4FB6CFE4 4FB6B9C1 ~~
 Li GSG-0402
 Sc 4FB6B9C1
 AR /4FAA0746
@@ -4274,7 +4274,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 34460 14480 0 15 4FB6CFE4 4FB6B9BF ~~
+Po 34900 14850 0 15 4FB6CFE4 4FB6B9BF ~~
 Li GSG-0402
 Sc 4FB6B9BF
 AR /4FAA071E
@@ -4306,20 +4306,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 33200 15150 0 15 4FB6CFE4 4FB6B9BD ~~
+Po 33200 15150 1800 15 4FB6CFE4 4FB6F4D0 ~~
 Li GSG-0402
-Sc 4FB6B9BD
+Sc 4FB6F4D0
 AR /4FAA074B
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C12"
-T1 0 20 160 160 0 40 N I 21 N "100pF"
+T0 0 20 160 160 1800 40 N V 21 N "C12"
+T1 0 20 160 160 1800 40 N I 21 N "100pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 55 "N-000048"
@@ -4328,7 +4328,7 @@ Le 47
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 99 "N-000106"
@@ -4338,20 +4338,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 34460 14850 0 15 4FB6CFE4 4FB6B9BB ~~
+Po 33750 15450 1800 15 4FB6CFE4 4FB6B9BB ~~
 Li GSG-0402
 Sc 4FB6B9BB
 AR /4FAA0711
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C13"
-T1 0 20 160 160 0 40 N I 21 N "33pF"
+T0 0 20 160 160 1800 40 N V 21 N "C13"
+T1 0 20 160 160 1800 40 N I 21 N "33pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -4360,7 +4360,7 @@ Le 45505904
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 24 "/SWTXB2"
@@ -4987,7 +4987,7 @@ $PAD
 Sh "2" R 200 220 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 75 "N-000082"
+Ne 74 "N-000081"
 Po 210 0
 Le 20
 .SolderMask 40
@@ -5194,20 +5194,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -7000 21000 0 15 4FB6CFE4 4FB6BA03 ~~
+Po 24000 17000 1800 15 4FB6CFE4 4FB6BA03 ~~
 Li GSG-0402
 Sc 4FB6BA03
 AR /4FAAD17F
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C40"
-T1 0 20 160 160 0 40 N I 21 N "2.2nF"
+T0 0 20 160 160 1800 40 N V 21 N "C40"
+T1 0 20 160 160 1800 40 N I 21 N "2.2nF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 103 "N-000112"
@@ -5215,17 +5215,17 @@ Po 210 0
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 74 "N-000081"
+Ne 75 "N-000082"
 Po -210 0
 Le 24791752
 .SolderMask 40
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 0 16000 0 15 4FB6CFE4 4FB6BA01 ~~
+Po 25150 17000 0 15 4FB6CFE4 4FB6BA01 ~~
 Li GSG-0402
 Sc 4FB6BA01
 AR /4FAA157D
@@ -5320,20 +5320,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -2000 18000 0 15 4FB6CFE4 4FB6B9FB ~~
+Po 24600 17650 2700 15 4FB6CFE4 4FB6B9FB ~~
 Li GSG-0402
 Sc 4FB6B9FB
 AR /4FAAD185
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C44"
-T1 0 20 160 160 0 40 N I 21 N "2.2nF"
+T0 0 20 160 160 2700 40 N V 21 N "C44"
+T1 0 20 160 160 2700 40 N I 21 N "2.2nF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 40 "N-000019"
@@ -5341,7 +5341,7 @@ Po 210 0
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 41 "N-000020"
@@ -5383,20 +5383,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 0 18000 0 15 4FB6CFE4 4FB6B9F7 ~~
+Po 23400 18100 2700 15 4FB6CFE4 4FB6B9F7 ~~
 Li GSG-0402
 Sc 4FB6B9F7
 AR /4FAAD181
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C46"
-T1 0 20 160 160 0 40 N I 21 N "2.2nF"
+T0 0 20 160 160 2700 40 N V 21 N "C46"
+T1 0 20 160 160 2700 40 N I 21 N "2.2nF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 95 "N-000102"
@@ -5404,7 +5404,7 @@ Po 210 0
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 30 "N-000008"
@@ -5445,20 +5445,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -12000 4000 0 15 4FB6CFE4 4FB6B9D3 ~~
+Po 24000 18550 2700 15 4FB6CFE4 4FB6B9D3 ~~
 Li GSG-0402
 Sc 4FB6B9D3
 AR /4FAA157E
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C48"
-T1 0 20 160 160 0 40 N I 21 N "33pF"
+T0 0 20 160 160 2700 40 N V 21 N "C48"
+T1 0 20 160 160 2700 40 N I 21 N "33pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -5467,7 +5467,7 @@ Le 47
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 13 "/SWD1"
@@ -5794,20 +5794,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -12000 7000 0 15 4FB6CFE4 4FB6B9DD ~~
+Po 25900 17950 1800 15 4FB6CFE4 4FB6B9DD ~~
 Li GSG-0402
 Sc 4FB6B9DD
 AR /4FAA149B
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C59"
-T1 0 20 160 160 0 40 N I 21 N "47pF"
+T0 0 20 160 160 1800 40 N V 21 N "C59"
+T1 0 20 160 160 1800 40 N I 21 N "47pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 72 "N-000079"
@@ -5816,7 +5816,7 @@ Le 1750126328
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 87 "N-000094"
@@ -5921,7 +5921,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -2000 6000 0 15 4FB6CFE4 4FB6B9D5 ~~
+Po 25400 19050 0 15 4FB6CFE4 4FB6B9D5 ~~
 Li GSG-0402
 Sc 4FB6B9D5
 AR /4FAAD1E7
@@ -6049,20 +6049,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -2000 10000 0 15 4FB6CFE4 4FB6B963 ~~
+Po 24600 19650 2700 15 4FB6CFE4 4FB6B963 ~~
 Li GSG-0402
 Sc 4FB6B963
 AR /4FAA138A
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C67"
-T1 0 20 160 160 0 40 N I 21 N "47pF"
+T0 0 20 160 160 2700 40 N V 21 N "C67"
+T1 0 20 160 160 2700 40 N I 21 N "47pF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 67 "N-000067"
@@ -6070,7 +6070,7 @@ Po 210 0
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 2700
 Dr 0 0 0
 At SMD N 00888000
 Ne 42 "N-000021"
@@ -6112,7 +6112,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -6000 17000 0 15 4FB6CFE4 4FB6B977 ~~
+Po -2450 31750 0 15 4FB6CFE4 4FB6B977 ~~
 Li GSG-0402
 Sc 4FB6B977
 AR /4FB2FD07
@@ -6144,7 +6144,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po 34950 20200 0 15 4FB6CFE4 4FB6B975 ~~
+Po 34950 20350 0 15 4FB6CFE4 4FB6B975 ~~
 Li GSG-0402
 Sc 4FB6B975
 AR /4FAA08E9
@@ -6270,7 +6270,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -7000 19000 0 15 4FB6CFE4 4FB6B96F ~~
+Po -9300 34300 0 15 4FB6CFE4 4FB6B96F ~~
 Li GSG-0402
 Sc 4FB6B96F
 AR /4FAECD45
@@ -6334,7 +6334,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -6000 15000 0 15 4FB6CFE4 4FB6B973 ~~
+Po -300 31900 0 15 4FB6CFE4 4FB6B973 ~~
 Li GSG-0402
 Sc 4FB6B973
 AR /4FB2FF68
@@ -6365,20 +6365,20 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -8000 16000 0 15 4FB6CFE4 4FB6B979 ~~
+Po -9400 33650 1800 15 4FB6CFE4 4FB6B979 ~~
 Li GSG-0402
 Sc 4FB6B979
 AR /4FB3CC76
 Op 0 0 0
 .SolderMask 40
-T0 0 20 160 160 0 40 N V 21 N "C77"
-T1 0 20 160 160 0 40 N I 21 N "1nF"
+T0 0 20 160 160 1800 40 N V 21 N "C77"
+T1 0 20 160 160 1800 40 N I 21 N "1nF"
 DS 350 -150 350 150 80 21
 DS 350 150 -350 150 80 21
 DS -350 150 -350 -150 80 21
 DS -350 -150 350 -150 80 21
 $PAD
-Sh "2" R 200 220 0 0 0
+Sh "2" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 27 "GND"
@@ -6386,7 +6386,7 @@ Po 210 0
 .SolderMask 40
 $EndPAD
 $PAD
-Sh "1" R 200 220 0 0 0
+Sh "1" R 200 220 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
 Ne 9 "/REF_IN"
@@ -6712,7 +6712,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -7000 23000 0 15 4FB6CFE4 4FB6B98F ~~
+Po -3650 28400 0 15 4FB6CFE4 4FB6B98F ~~
 Li GSG-0402
 Sc 4FB6B98F
 AR /4FAECE50
@@ -6744,7 +6744,7 @@ Le 24791752
 $EndPAD
 $EndMODULE  GSG-0402
 $MODULE GSG-0402
-Po -3000 20000 0 15 4FB6CFE4 4FB6B991 ~~
+Po -3650 29250 0 15 4FB6CFE4 4FB6B991 ~~
 Li GSG-0402
 Sc 4FB6B991
 AR /4FAECFAE
@@ -6813,6 +6813,16 @@ Po 3 34180 15890 34180 15890 250 -1
 De 15 1 8 0 0
 Po 0 34035 16035 34180 15890 60 -1
 De 15 0 8 0 0
+Po 0 33492 16035 33492 15898 60 -1
+De 15 0 9 0 400000
+Po 3 33890 15750 33890 15750 250 -1
+De 15 1 9 0 0
+Po 0 33880 15740 33890 15750 60 -1
+De 15 0 9 0 0
+Po 0 33650 15740 33880 15740 60 -1
+De 15 0 9 0 0
+Po 0 33492 15898 33650 15740 60 -1
+De 15 0 9 0 0
 Po 0 34690 18700 34560 18700 60 -1
 De 15 0 10 0 400000
 Po 0 33098 18248 33350 18500 60 -1
@@ -6861,6 +6871,24 @@ Po 0 34440 17930 34220 17930 60 -1
 De 15 0 12 0 0
 Po 0 34570 17800 34440 17930 60 -1
 De 15 0 12 0 0
+Po 0 24200 18000 24200 18140 60 -1
+De 15 0 13 0 0
+Po 0 24191 17991 24200 18000 60 -1
+De 15 0 13 0 0
+Po 3 24200 18000 24200 18000 250 -1
+De 15 1 13 0 0
+Po 0 24191 17638 24191 17991 60 -1
+De 15 0 13 0 400000
+Po 0 24200 18140 24000 18340 60 -1
+De 15 0 13 0 800000
+Po 0 24940 17000 24600 17000 60 -1
+De 15 0 14 0 400000
+Po 0 24238 17362 24600 17000 60 -1
+De 15 0 14 0 0
+Po 3 24600 17000 24600 17000 250 -1
+De 15 1 14 0 0
+Po 0 24238 17362 24191 17362 60 -1
+De 15 0 14 0 800000
 Po 0 30491 18712 30491 18699 60 -1
 De 15 0 15 0 400000
 Po 0 30491 18699 30790 18400 60 -1
@@ -6887,18 +6915,28 @@ Po 0 30491 18139 30491 18038 60 -1
 De 15 0 16 0 800000
 Po 0 30230 18400 30491 18139 60 -1
 De 15 0 16 0 0
-Po 0 34391 20512 34391 20259 60 -1
+Po 0 34740 20350 34740 20240 60 -1
 De 15 0 17 0 400000
-Po 3 34450 20200 34450 20200 250 -1
+Po 3 34600 20100 34600 20100 250 -1
 De 15 1 17 0 0
-Po 0 34450 20200 34740 20200 60 -1
+Po 0 34740 20240 34600 20100 60 -1
+De 15 0 17 0 0
+Po 0 34391 20512 34391 20509 60 -1
+De 15 0 17 0 400000
+Po 0 34550 20350 34740 20350 60 -1
 De 15 0 17 0 800000
-Po 0 34391 20259 34450 20200 60 -1
+Po 0 34391 20509 34550 20350 60 -1
 De 15 0 17 0 0
 Po 0 34391 19562 34391 19251 60 -1
 De 15 0 17 0 400000
 Po 0 34391 19251 34340 19200 60 -1
 De 15 0 17 0 800000
+Po 0 24565 18579 24329 18579 60 -1
+De 15 0 18 0 400000
+Po 3 24300 18550 24300 18550 250 -1
+De 15 1 18 0 0
+Po 0 24329 18579 24300 18550 60 -1
+De 15 0 18 0 0
 Po 0 34740 21100 34400 21100 60 -1
 De 15 0 18 0 400000
 Po 0 34391 21091 34400 21100 60 -1
@@ -6917,6 +6955,18 @@ Po 3 34140 20150 34140 20150 250 -1
 De 15 1 18 0 0
 Po 0 34391 19929 34391 19838 60 -1
 De 15 0 18 0 800000
+Po 0 25135 18579 25429 18579 60 -1
+De 15 0 19 0 400000
+Po 3 25500 18650 25500 18650 250 -1
+De 15 1 19 0 0
+Po 0 25429 18579 25500 18650 60 -1
+De 15 0 19 0 0
+Po 0 25135 18421 25671 18421 60 -1
+De 15 0 20 0 400000
+Po 3 25800 18550 25800 18550 250 -1
+De 15 1 20 0 0
+Po 0 25671 18421 25800 18550 60 -1
+De 15 0 20 0 0
 Po 0 30500 14750 30500 14600 60 -1
 De 15 0 21 0 0
 Po 0 30491 14759 30500 14750 60 -1
@@ -6957,6 +7007,130 @@ Po 0 30750 15800 30800 15800 60 -1
 De 15 0 22 0 0
 Po 0 30491 15541 30500 15550 60 -1
 De 15 0 22 0 0
+Po 0 34391 13912 34391 13799 60 -1
+De 15 0 23 0 400000
+Po 0 34391 13799 34690 13500 60 -1
+De 15 0 23 0 800000
+Po 0 33960 14500 34150 14500 60 -1
+De 15 0 23 0 400000
+Po 0 34391 14741 34391 14862 60 -1
+De 15 0 23 0 800000
+Po 0 34150 14500 34391 14741 60 -1
+De 15 0 23 0 0
+Po 0 34690 14550 34550 14550 60 -1
+De 15 0 24 0 400000
+Po 0 34391 14391 34450 14450 60 -1
+De 15 0 24 0 0
+Po 3 34450 14450 34450 14450 250 -1
+De 15 1 24 0 0
+Po 0 34391 14391 34391 14188 60 -1
+De 15 0 24 0 800000
+Po 0 34550 14550 34450 14450 60 -1
+De 15 0 24 0 0
+Po 0 33960 15450 34300 15450 60 -1
+De 15 0 24 0 400000
+Po 0 34391 15359 34330 15420 60 -1
+De 15 0 24 0 0
+Po 3 34330 15420 34330 15420 250 -1
+De 15 1 24 0 0
+Po 0 34391 15359 34391 15138 60 -1
+De 15 0 24 0 800000
+Po 0 34300 15450 34330 15420 60 -1
+De 15 0 24 0 0
+Po 0 24128 16500 24450 16500 60 -1
+De 15 0 27 0 400000
+Po 3 24450 16500 24450 16500 250 -1
+De 15 1 27 0 0
+Po 0 25360 17000 25650 17000 60 -1
+De 15 0 27 0 400000
+Po 3 25650 17000 25650 17000 250 -1
+De 15 1 27 0 0
+Po 0 24850 18500 24850 18100 60 -1
+De 15 0 27 0 400000
+Po 3 25000 17950 25000 17950 250 -1
+De 15 1 27 0 0
+Po 0 24850 18100 25000 17950 60 -1
+De 15 0 27 0 0
+Po 0 24850 18500 24850 19000 60 -1
+De 15 0 27 0 400000
+Po 3 24850 19000 24850 19000 250 -1
+De 15 1 27 0 0
+Po 0 24000 18760 24000 19050 60 -1
+De 15 0 27 0 400000
+Po 3 24000 19050 24000 19050 250 -1
+De 15 1 27 0 0
+Po 0 24000 17500 24000 17850 60 -1
+De 15 0 27 0 400000
+Po 3 23800 18000 23800 18000 250 -1
+De 15 1 27 0 0
+Po 0 23850 18000 23800 18000 60 -1
+De 15 0 27 0 0
+Po 0 24000 17850 23850 18000 60 -1
+De 15 0 27 0 0
+Po 0 23872 17500 23550 17500 60 -1
+De 15 0 27 0 400000
+Po 3 23550 17500 23550 17500 250 -1
+De 15 1 27 0 0
+Po 0 32300 14133 32300 13840 60 -1
+De 15 0 27 0 400000
+Po 3 32300 13840 32300 13840 250 -1
+De 15 1 27 0 0
+Po 0 32300 14467 32300 14710 60 -1
+De 15 0 27 0 400000
+Po 3 32240 14770 32240 14770 250 -1
+De 15 1 27 0 0
+Po 0 32300 14710 32240 14770 60 -1
+De 15 0 27 0 0
+Po 0 35700 14233 35700 13940 60 -1
+De 15 0 27 0 400000
+Po 3 35700 13940 35700 13940 250 -1
+De 15 1 27 0 0
+Po 0 35700 14567 35700 14870 60 -1
+De 15 0 27 0 400000
+Po 3 35700 14870 35700 14870 250 -1
+De 15 1 27 0 0
+Po 0 34072 14050 33750 14050 60 -1
+De 15 0 27 0 400000
+Po 3 33750 14050 33750 14050 250 -1
+De 15 1 27 0 0
+Po 0 35160 21100 35450 21100 60 -1
+De 15 0 27 0 400000
+Po 3 35450 21100 35450 21100 250 -1
+De 15 1 27 0 0
+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 3 34900 14250 34900 14250 250 -1
+De 15 1 27 0 0
+Po 0 35110 14460 34900 14250 60 -1
+De 15 0 27 0 0
+Po 0 33540 14500 33250 14500 60 -1
+De 15 0 27 0 400000
+Po 3 33250 14500 33250 14500 250 -1
+De 15 1 27 0 0
+Po 0 33540 15450 33430 15450 60 -1
+De 15 0 27 0 400000
+Po 0 33098 15782 33200 15680 60 -1
+De 15 0 27 0 0
+Po 3 33200 15680 33200 15680 250 -1
+De 15 1 27 0 0
+Po 0 33098 15782 33098 16035 60 -1
+De 15 0 27 0 800000
+Po 0 33430 15450 33200 15680 60 -1
+De 15 0 27 0 0
+Po 0 35160 20350 35160 20140 60 -1
+De 15 0 27 0 400000
+Po 3 35250 20050 35250 20050 250 -1
+De 15 1 27 0 0
+Po 0 35160 20140 35250 20050 60 -1
+De 15 0 27 0 0
+Po 0 34072 15000 33760 15000 60 -1
+De 15 0 27 0 400000
+Po 3 33760 15000 33760 15000 250 -1
+De 15 1 27 0 0
 Po 0 35110 18700 35250 18700 60 -1
 De 15 0 27 0 400000
 Po 0 35250 18400 35400 18550 60 -1
@@ -6991,12 +7165,6 @@ Po 0 33098 16035 33098 16902 60 -1
 De 15 0 27 0 400000
 Po 0 33098 16902 33000 17000 60 -1
 De 15 0 27 0 800000
-Po 0 33098 16035 33098 15782 60 -1
-De 15 0 27 0 400000
-Po 3 33200 15680 33200 15680 250 -1
-De 15 1 27 0 0
-Po 0 33098 15782 33200 15680 60 -1
-De 15 0 27 0 0
 Po 0 35550 15240 35260 15240 60 -1
 De 15 0 27 0 400000
 Po 0 35110 15290 35210 15190 60 -1
@@ -7201,6 +7369,34 @@ Po 0 28826 20091 29119 20091 60 -1
 De 15 0 49 0 400000
 Po 0 29119 20091 29550 19660 60 -1
 De 15 0 49 0 800000
+Po 0 32497 14467 32497 14787 60 -1
+De 15 0 50 0 400000
+Po 0 32497 14787 32560 14850 60 -1
+De 15 0 50 0 800000
+Po 0 35110 14850 35310 14850 60 -1
+De 15 0 52 0 400000
+Po 0 35503 14657 35503 14567 60 -1
+De 15 0 52 0 800000
+Po 0 35310 14850 35503 14657 60 -1
+De 15 0 52 0 0
+Po 0 35110 13950 35310 13950 60 -1
+De 15 0 53 0 400000
+Po 0 35503 14143 35503 14233 60 -1
+De 15 0 53 0 800000
+Po 0 35310 13950 35503 14143 60 -1
+De 15 0 53 0 0
+Po 0 32902 16035 32902 15238 60 -1
+De 15 0 55 0 400000
+Po 0 32902 15238 32990 15150 60 -1
+De 15 0 55 0 800000
+Po 0 32705 16035 32705 15715 60 -1
+De 15 0 56 0 400000
+Po 0 32770 14470 33040 14200 60 -1
+De 15 0 56 0 800000
+Po 0 32770 15650 32770 14470 60 -1
+De 15 0 56 0 0
+Po 0 32705 15715 32770 15650 60 -1
+De 15 0 56 0 0
 Po 0 28556 17956 28556 18116 60 -1
 De 15 0 57 0 400000
 Po 0 28556 18116 28840 18400 60 -1
@@ -7307,6 +7503,12 @@ Po 0 29940 16330 29540 16330 60 -1
 De 15 0 85 0 0
 Po 0 30032 16238 29940 16330 60 -1
 De 15 0 85 0 0
+Po 0 32497 14133 32497 14073 60 -1
+De 15 0 89 0 400000
+Po 0 32670 13900 33040 13900 60 -1
+De 15 0 89 0 800000
+Po 0 32497 14073 32670 13900 60 -1
+De 15 0 89 0 0
 Po 0 32547 20333 32547 19883 60 -1
 De 15 0 90 0 400000
 Po 0 32547 19883 32580 19850 60 -1
@@ -7325,6 +7527,48 @@ Po 0 28556 16044 28556 15884 60 -1
 De 15 0 94 0 400000
 Po 0 28556 15884 28840 15600 60 -1
 De 15 0 94 0 800000
+Po 0 34009 14188 33932 14188 60 -1
+De 15 0 97 0 400000
+Po 0 33540 14280 33460 14200 60 -1
+De 15 0 97 0 800000
+Po 0 33840 14280 33540 14280 60 -1
+De 15 0 97 0 0
+Po 0 33932 14188 33840 14280 60 -1
+De 15 0 97 0 0
+Po 0 34391 15000 34540 15000 60 -1
+De 15 0 98 0 400000
+Po 0 34540 15000 34690 14850 60 -1
+De 15 0 98 0 800000
+Po 0 34009 15138 33942 15138 60 -1
+De 15 0 99 0 400000
+Po 0 33490 15230 33410 15150 60 -1
+De 15 0 99 0 800000
+Po 0 33850 15230 33490 15230 60 -1
+De 15 0 99 0 0
+Po 0 33942 15138 33850 15230 60 -1
+De 15 0 99 0 0
+Po 0 34009 14862 33942 14862 60 -1
+De 15 0 100 0 400000
+Po 0 33590 14850 32980 14850 60 -1
+De 15 0 100 0 800000
+Po 0 33670 14770 33590 14850 60 -1
+De 15 0 100 0 0
+Po 0 33850 14770 33670 14770 60 -1
+De 15 0 100 0 0
+Po 0 33942 14862 33850 14770 60 -1
+De 15 0 100 0 0
+Po 0 34391 14050 34590 14050 60 -1
+De 15 0 101 0 400000
+Po 0 34590 14050 34690 13950 60 -1
+De 15 0 101 0 800000
+Po 0 34009 13912 33932 13912 60 -1
+De 15 0 102 0 400000
+Po 0 33540 13820 33460 13900 60 -1
+De 15 0 102 0 800000
+Po 0 33840 13820 33540 13820 60 -1
+De 15 0 102 0 0
+Po 0 33932 13912 33840 13820 60 -1
+De 15 0 102 0 0
 Po 0 32990 20850 32730 20850 60 -1
 De 15 0 104 0 400000
 Po 0 32730 20850 32547 20667 60 -1
diff --git a/hardware/lollipop/lollipop.net b/hardware/lollipop/lollipop.net
index 1eda9e5e..4ebaee3d 100644
--- a/hardware/lollipop/lollipop.net
+++ b/hardware/lollipop/lollipop.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Fri May 18 18:46:44 2012
+# EESchema Netlist Version 1.1 created  Fri May 18 23:02:23 2012
 (
  ( /4FB68137 $noname  U2 SKY13351 {Lib=SKY13351}
   (    1 N-000109 )
@@ -369,14 +369,14 @@
  )
  ( /4FAAD183 $noname  C33 2.2nF {Lib=C}
   (    1 N-000010 )
-  (    2 N-000082 )
+  (    2 N-000081 )
  )
  ( /4FAAD181 $noname  C46 2.2nF {Lib=C}
   (    1 N-000008 )
   (    2 N-000102 )
  )
  ( /4FAAD17F $noname  C40 2.2nF {Lib=C}
-  (    1 N-000081 )
+  (    1 N-000082 )
   (    2 N-000112 )
  )
  ( /4FAA157E $noname  C48 33pF {Lib=C}
@@ -403,9 +403,9 @@
   (    1 N-000082 )
   (    2 GND )
   (    3 N-000081 )
-  (    4 /SWD2 )
+  (    4 /SWD1 )
   (    5 N-000080 )
-  (    6 /SWD1 )
+  (    6 /SWD2 )
  )
  ( /4FAA149B $noname  C59 47pF {Lib=C}
   (    1 N-000094 )
@@ -1264,9 +1264,9 @@ Net 8 "" ""
 Net 9 "/SWD2" "SWD2"
  C41 1
  U10 6
- U7 4
- C38 1
  U17 10
+ C38 1
+ U7 6
 Net 10 "" ""
  C33 1
  U3 1
@@ -1348,22 +1348,22 @@ Net 30 "/SWTXB1" "SWTXB1"
  U3 7
 Net 31 "/SWRXA1" "SWRXA1"
  U17 9
- P7 9
- U14 6
  U12 6
+ U14 6
+ P7 9
  C50 1
  C42 1
  U19 5
 Net 32 "/SWD1" "SWD1"
- U7 6
+ U17 11
  P7 11
  U10 4
  C48 1
- U17 11
+ U7 4
  C27 1
 Net 33 "" ""
- T3 3
  C23 2
+ T3 3
 Net 34 "" ""
  C53 2
  T6 1
@@ -1503,16 +1503,16 @@ Net 78 "" ""
  U12 1
  C43 2
 Net 79 "" ""
- U15 8
  C59 2
+ U15 8
 Net 80 "" ""
  C35 1
  U7 5
 Net 81 "" ""
- C40 1
+ C33 2
  U7 3
 Net 82 "" ""
- C33 2
+ C40 1
  U7 1
 Net 83 "" ""
  C65 2
diff --git a/hardware/lollipop/lollipop.sch b/hardware/lollipop/lollipop.sch
index 5270474f..4694f049 100644
--- a/hardware/lollipop/lollipop.sch
+++ b/hardware/lollipop/lollipop.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Fri May 18 18:46:38 2012
+EESchema Schematic File Version 2  date Fri May 18 23:02:13 2012
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -2268,7 +2268,7 @@ F 4 "Skyworks" H 2950 4450 60  0001 C CNN "Manufacturer"
 F 5 "SKY13351-378LF" H 2950 4450 60  0001 C CNN "Part Number"
 F 6 "20 MHz-6.0 GHz GaAs SPDT Switch" H 2950 4450 60  0001 C CNN "Description"
 	1    2950 4450
-	-1   0    0    -1  
+	-1   0    0    1   
 $EndComp
 $Comp
 L GND #PWR045