diff --git a/hardware/kicad/hackrf.mod b/hardware/kicad/hackrf.mod
index ece6ad6f..efc08c0f 100644
--- a/hardware/kicad/hackrf.mod
+++ b/hardware/kicad/hackrf.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Thu Jun 21 18:19:07 2012
+PCBNEW-LibModule-V1  Thu Jun 21 19:04:23 2012
 # encoding utf-8
 $INDEX
 GSG-HEADER-1x3
@@ -6693,51 +6693,6 @@ Po -98 -167
 Le 343506680
 $EndPAD
 $EndMODULE  GSG-SKY13317-373LF
-$MODULE GSG-HP-DEA
-Po 0 0 0 15 4FB69E07 00000000 ~~
-Li GSG-HP-DEA
-Sc 00000000
-AR
-Op 0 0 0
-T0 0 0 157 118 0 30 N V 21 N "GSG-HP-DEA"
-T1 0 0 157 118 0 30 N I 21 N "VAL**"
-DS -236 197 -315 197 118 21
-DS 236 197 315 197 118 21
-DS 236 -197 315 -197 118 21
-DS -315 -197 -236 -197 118 21
-$PAD
-Sh "1" R 315 236 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -433 0
-Le 1341
-$EndPAD
-$PAD
-Sh "3" R 315 236 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 433 0
-Le -1983002225
-$EndPAD
-$PAD
-Sh "4" R 315 315 0 0 0
-Dr 130 0 0
-At STD N 00C8FFFF
-Ne 0 ""
-Po 0 -276
-Le -1954803880
-$EndPAD
-$PAD
-Sh "2" R 315 315 0 0 0
-Dr 130 0 0
-At STD N 00C8FFFF
-Ne 0 ""
-Po 0 276
-Le 1341
-$EndPAD
-$EndMODULE  GSG-HP-DEA
 $MODULE GSG-CX2156NL
 Po 0 0 0 15 4FB6B2B7 00000000 ~~
 Li GSG-CX2156NL
@@ -7749,7 +7704,7 @@ $MODULE GSG-LP0603
 Po 0 0 0 15 4FE3B99C 00000000 ~~
 Li GSG-LP0603
 Sc 00000000
-AR 
+AR
 Op 0 0 0
 T0 0 0 157 118 0 30 N V 21 N "GSG-LP0603"
 T1 0 0 157 118 0 30 N I 21 N "VAL**"
@@ -7792,4 +7747,48 @@ Po -246 -138
 Le -1954803976
 $EndPAD
 $EndMODULE  GSG-LP0603
+$MODULE GSG-HP-DEA
+Po 0 0 0 15 4FE3C48C 00000000 ~~
+Li GSG-HP-DEA
+Sc 00000000
+AR 
+Op 0 0 0
+T0 0 0 157 118 0 30 N V 21 N "GSG-HP-DEA"
+T1 0 0 157 118 0 30 N I 21 N "VAL**"
+DS -200 -220 -520 -220 80 21
+DS -520 -220 -520 220 80 21
+DS -520 220 -200 220 80 21
+$PAD
+Sh "1" R 197 276 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -335 0
+Le 1341
+$EndPAD
+$PAD
+Sh "3" R 197 276 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 335 0
+Le -1983002225
+$EndPAD
+$PAD
+Sh "4" R 236 197 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 -177
+Le -1954803880
+$EndPAD
+$PAD
+Sh "2" R 236 197 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 0 177
+Le 1341
+$EndPAD
+$EndMODULE  GSG-HP-DEA
 $EndLIBRARY
diff --git a/hardware/lollipop/lollipop.brd b/hardware/lollipop/lollipop.brd
index 4d188081..94eeb2c0 100644
--- a/hardware/lollipop/lollipop.brd
+++ b/hardware/lollipop/lollipop.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Thu Jun 21 18:55:35 2012
+PCBNEW-BOARD Version 1 date Thu Jun 21 19:09:48 2012
 
 # Created by Pcbnew(2011-06-30 BZR 3033)-stable
 
@@ -11,7 +11,7 @@ Links 383
 NoConn 53
 Di 20440 8924 38560 29076
 Ndraw 12
-Ntrack 1406
+Ntrack 1423
 Nzone 0
 BoardThickness 630
 Nmodule 130
@@ -37,7 +37,7 @@ Layer[0] Back signal
 Layer[1] Inner2 signal
 Layer[2] Inner3 signal
 Layer[15] Front signal
-TrackWidth 160
+TrackWidth 200
 TrackWidthList 90
 TrackWidthList 160
 TrackWidthList 200
@@ -62,11 +62,11 @@ MicroViaMinSize 200
 MicroViaMinDrill 50
 TextPcbWidth 120
 TextPcbSize 600 800
-EdgeModWidth 150
+EdgeModWidth 80
 TextModSize 600 600
-TextModWidth 120
-PadSize 600 600
-PadDrill 320
+TextModWidth 80
+PadSize 236 197
+PadDrill 0
 Pad2MaskClearance 100
 Pad2PasteClearanceRatio -0.12
 AuxiliaryAxisOrg 0 0
@@ -638,6 +638,94 @@ AddNet "N-000119"
 AddNet "N-000123"
 AddNet "VCC"
 $EndNCLASS
+$MODULE GSG-HP-DEA
+Po 26800 19960 0 15 4FE3C48C 4FB6B94B ~~
+Li GSG-HP-DEA
+Sc 4FB6B94B
+AR /4F94D4F4
+Op 0 0 0
+T0 0 0 157 118 0 30 N V 21 N "U11"
+T1 0 0 157 118 0 30 N I 21 N "TX_HIGHPASS_FILTER"
+DS -200 -220 -520 -220 80 21
+DS -520 -220 -520 220 80 21
+DS -520 220 -200 220 80 21
+$PAD
+Sh "1" R 197 276 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 66 "N-000056"
+Po -335 0
+Le 1341
+$EndPAD
+$PAD
+Sh "3" R 197 276 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 65 "N-000055"
+Po 335 0
+Le -1983002225
+$EndPAD
+$PAD
+Sh "4" R 236 197 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 27 "GND"
+Po 0 -177
+Le -1954803880
+$EndPAD
+$PAD
+Sh "2" R 236 197 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 27 "GND"
+Po 0 177
+Le 1341
+$EndPAD
+$EndMODULE  GSG-HP-DEA
+$MODULE GSG-HP-DEA
+Po 26550 16250 1800 15 4FE3C48C 4FB82D0E ~~
+Li GSG-HP-DEA
+Sc 4FB82D0E
+AR /4F94CF02
+Op 0 0 0
+T0 0 0 157 118 1800 30 N V 21 N "U8"
+T1 0 0 157 118 1800 30 N I 21 N "TX_HIGHPASS_FILTER"
+DS -200 -220 -520 -220 80 21
+DS -520 -220 -520 220 80 21
+DS -520 220 -200 220 80 21
+$PAD
+Sh "1" R 197 276 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 68 "N-000059"
+Po -335 0
+Le 1341
+$EndPAD
+$PAD
+Sh "3" R 197 276 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 67 "N-000058"
+Po 335 0
+Le -1983002225
+$EndPAD
+$PAD
+Sh "4" R 236 197 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 27 "GND"
+Po 0 -177
+Le -1954803880
+$EndPAD
+$PAD
+Sh "2" R 236 197 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 27 "GND"
+Po 0 177
+Le 1341
+$EndPAD
+$EndMODULE  GSG-HP-DEA
 $MODULE GSG-S-PVQFN-14
 Po 29500 24500 1800 15 4FE0A018 4FB6B941 ~~
 Li GSG-S-PVQFN-14
@@ -1984,96 +2072,6 @@ Po 167 0
 Le 343506872
 $EndPAD
 $EndMODULE  GSG-LXES1UBBB1-008
-$MODULE GSG-HP-DEA
-Po 26800 19960 0 15 4FB69E07 4FB6B94B ~P
-Li GSG-HP-DEA
-Sc 4FB6B94B
-AR /4F94D4F4
-Op 0 0 0
-T0 0 0 157 118 0 30 N V 21 N "U11"
-T1 0 0 157 118 0 30 N I 21 N "TX_HIGHPASS_FILTER"
-DS -236 197 -315 197 118 21
-DS 236 197 315 197 118 21
-DS 236 -197 315 -197 118 21
-DS -315 -197 -236 -197 118 21
-$PAD
-Sh "1" R 315 236 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 66 "N-000056"
-Po -433 0
-Le 1341
-$EndPAD
-$PAD
-Sh "3" R 315 236 0 0 0
-Dr 0 0 0
-At SMD N 00888000
-Ne 65 "N-000055"
-Po 433 0
-Le -1983002225
-$EndPAD
-$PAD
-Sh "4" R 315 315 0 0 0
-Dr 130 0 0
-At STD N 00C8FFFF
-Ne 27 "GND"
-Po 0 -276
-Le -1954803880
-$EndPAD
-$PAD
-Sh "2" R 315 315 0 0 0
-Dr 130 0 0
-At STD N 00C8FFFF
-Ne 27 "GND"
-Po 0 276
-Le 1341
-$EndPAD
-$EndMODULE  GSG-HP-DEA
-$MODULE GSG-HP-DEA
-Po 26550 16250 1800 15 4FB69E07 4FB82D0E ~P
-Li GSG-HP-DEA
-Sc 4FB82D0E
-AR /4F94CF02
-Op 0 0 0
-T0 0 0 157 118 1800 30 N V 21 N "U8"
-T1 0 0 157 118 1800 30 N I 21 N "TX_HIGHPASS_FILTER"
-DS -236 197 -315 197 118 21
-DS 236 197 315 197 118 21
-DS 236 -197 315 -197 118 21
-DS -315 -197 -236 -197 118 21
-$PAD
-Sh "1" R 315 236 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 68 "N-000059"
-Po -433 0
-Le 1341
-$EndPAD
-$PAD
-Sh "3" R 315 236 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 67 "N-000058"
-Po 433 0
-Le -1983002225
-$EndPAD
-$PAD
-Sh "4" R 315 315 0 0 1800
-Dr 130 0 0
-At STD N 00C8FFFF
-Ne 27 "GND"
-Po 0 -276
-Le -1954803880
-$EndPAD
-$PAD
-Sh "2" R 315 315 0 0 1800
-Dr 130 0 0
-At STD N 00C8FFFF
-Ne 27 "GND"
-Po 0 276
-Le 1341
-$EndPAD
-$EndMODULE  GSG-HP-DEA
 $MODULE GSG-HHM1595A1
 Po 28000 19860 0 15 4FB6B4A3 4FB6C772 ~P
 Li GSG-HHM1595A1
@@ -8148,6 +8146,34 @@ Po 0 28413 24697 28023 24697 60 -1
 De 15 0 26 0 0
 Po 0 28610 24500 28413 24697 60 -1
 De 15 0 26 0 0
+Po 0 26800 19783 26800 19560 200 -1
+De 15 0 27 0 400000
+Po 3 26800 19560 26800 19560 250 -1
+De 15 1 27 0 0
+Po 0 26800 20137 26800 20360 200 -1
+De 15 0 27 0 400000
+Po 3 26800 20360 26800 20360 250 -1
+De 15 1 27 0 0
+Po 0 26800 20137 26800 19960 200 -1
+De 15 0 27 0 400000
+Po 3 26800 19960 26800 19960 250 -1
+De 15 1 27 0 0
+Po 0 26800 19960 26800 19783 200 -1
+De 15 0 27 0 800000
+Po 0 26550 16073 26550 15850 200 -1
+De 15 0 27 0 400000
+Po 3 26550 15850 26550 15850 250 -1
+De 15 1 27 0 0
+Po 0 26550 16427 26550 16650 200 -1
+De 15 0 27 0 400000
+Po 3 26550 16650 26550 16650 250 -1
+De 15 1 27 0 0
+Po 0 26550 16427 26550 16250 200 -1
+De 15 0 27 0 400000
+Po 3 26550 16250 26550 16250 250 -1
+De 15 1 27 0 0
+Po 0 26550 16250 26550 16073 200 -1
+De 15 0 27 0 800000
 Po 0 25360 17000 25360 16930 160 -1
 De 15 0 27 0 400000
 Po 3 25510 16780 25510 16780 250 -1
@@ -9288,22 +9314,28 @@ Po 0 32902 16035 32902 15163 90 -1
 De 15 0 64 0 400000
 Po 0 32902 15163 32915 15150 90 -1
 De 15 0 64 0 800000
-Po 0 27744 20116 27389 20116 200 -1
+Po 0 27744 20116 27291 20116 200 -1
 De 15 0 65 0 400000
-Po 0 27389 20116 27233 19960 200 -1
+Po 0 27291 20116 27135 19960 200 -1
 De 15 0 65 0 800000
-Po 0 25920 19340 25920 19513 200 -1
+Po 0 25920 19340 25920 19510 200 -1
 De 15 0 66 0 400000
-Po 0 25920 19513 26367 19960 200 -1
+Po 0 26370 19960 26465 19960 200 -1
+De 15 0 66 0 C00000
+Po 0 25920 19510 26370 19960 200 -1
 De 15 0 66 0 800000
-Po 0 25860 15800 25860 15993 200 -1
+Po 0 25860 15800 25860 15980 200 -1
 De 15 0 67 0 400000
-Po 0 25860 15993 26117 16250 200 -1
+Po 0 26130 16250 26215 16250 200 -1
+De 15 0 67 0 C00000
+Po 0 25860 15980 26130 16250 200 -1
 De 15 0 67 0 800000
-Po 0 27339 16606 26983 16250 200 -1
-De 15 0 68 0 800000
-Po 0 27544 16606 27339 16606 200 -1
+Po 0 27544 16606 27336 16606 200 -1
 De 15 0 68 0 400000
+Po 0 26980 16250 26885 16250 200 -1
+De 15 0 68 0 C00000
+Po 0 27336 16606 26980 16250 200 -1
+De 15 0 68 0 800000
 Po 0 26496 13912 27043 13912 200 -1
 De 15 0 69 0 400000
 Po 0 27043 13912 27055 13900 200 -1