diff --git a/hardware/datasheet/bus-switch_CB3Q3244.pdf b/hardware/datasheet/bus-switch_CB3Q3244.pdf
new file mode 100644
index 0000000..c6ec726
Binary files /dev/null and b/hardware/datasheet/bus-switch_CB3Q3244.pdf differ
diff --git a/hardware/datasheet/QS3244-bus_switch.pdf b/hardware/datasheet/bus-switch_QS3244.pdf
similarity index 100%
rename from hardware/datasheet/QS3244-bus_switch.pdf
rename to hardware/datasheet/bus-switch_QS3244.pdf
diff --git a/hardware/kicad/SIMtrace.brd b/hardware/kicad/SIMtrace.brd
index 544cd63..2d15926 100644
--- a/hardware/kicad/SIMtrace.brd
+++ b/hardware/kicad/SIMtrace.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Mo 20 Jun 2011 15:48:39 CEST
+PCBNEW-BOARD Version 1 date Mo 20 Jun 2011 17:22:19 CEST
 
 # Created by Pcbnew(2010-00-09 BZR 23xx)-stable
 
@@ -8,9 +8,9 @@ Ly 1FFF8001
 EnabledLayers 1FFF8001
 Links 181
 NoConn 0
-Di 14401 34909 49338 56341
+Di 14401 34909 48426 56341
 Ndraw 12
-Ntrack 944
+Ntrack 949
 Nzone 0
 BoardThickness 630
 Nmodule 63
@@ -21,7 +21,7 @@ $SHEETDESCR
 Sheet A4 11700 8267
 Title "SIMtrace"
 Date "20 jun 2011"
-Rev "v0.9.82"
+Rev "v0.9.83"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
@@ -55,7 +55,7 @@ TextPcbSize 600 800
 EdgeModWidth 100
 TextModSize 600 600
 TextModWidth 120
-PadSize 1181 472
+PadSize 160 748
 PadDrill 0
 Pad2MaskClearance 100
 AuxiliaryAxisOrg 62750 26200
@@ -352,7 +352,7 @@ AddNet "N-000064"
 AddNet "N-000065"
 $EndNCLASS
 $MODULE FFC_REBELSIM
-Po 16750 42050 2700 15 4DFF3645 4DCD07C6 ~~
+Po 16750 42050 2700 15 4DFF62DF 4DCD07C6 ~~
 Li FFC_REBELSIM
 Sc 4DCD07C6
 AR /4DC51F05
@@ -424,12 +424,12 @@ Po 1378 630
 $EndPAD
 $EndMODULE  FFC_REBELSIM
 $MODULE JACK_2.5
-Po 45150 40100 1800 15 4DFF2F80 4DCD07C7 ~~
+Po 45150 40100 1800 15 4DFF632E 4DCD07C7 ~~
 Li JACK_2.5
 Sc 4DCD07C7
 AR /4DCBE233
 Op 0 0 0
-T0 200 1500 600 600 1800 120 N V 21 N"J2"
+T0 200 1500 600 600 1800 120 N I 21 N"J2"
 T1 -900 -2550 600 600 1800 120 N V 21 N"SERIAL"
 DS -2362 -787 -2953 -787 150 21
 DS -2953 -787 -2953 787 150 21
@@ -2377,173 +2377,6 @@ Ne 34 "3V3"
 Po -750 -1142
 $EndPAD
 $EndMODULE  SOIC8
-$MODULE SSOP20
-Po 21700 42350 1800 15 4DFB164F 4DCD0830 ~~
-Li SSOP20
-Cd SSOP 20 pins
-Kw CMS SSOP SMD
-Sc 4DCD0830
-AR /4DC6A187
-Op 0 0 0
-.LocalClearance 79
-At SMD 
-T0 750 0 300 300 1800 50 N V 21 N"IC4"
-T1 -50 1800 300 300 1800 50 N V 21 N"QS3244"
-DS 1500 -700 -1500 -700 65 21
-DS -1500 700 1500 700 65 21
-DS 1500 -700 1500 700 65 21
-DS -1500 700 -1500 -700 60 21
-DC -1300 500 -1400 400 50 21
-DS -1500 -250 -1200 -250 50 21
-DS -1200 -250 -1200 250 50 21
-DS -1200 250 -1500 250 50 21
-$PAD
-Sh "1" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 22 "/SC_SW"
-Po -1150 1050
-$EndPAD
-$PAD
-Sh "2" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 31 "/VCC_PHONE"
-Po -900 1050
-$EndPAD
-$PAD
-Sh "3" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -640 1050
-$EndPAD
-$PAD
-Sh "4" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 19 "/RST_PHONE"
-Po -380 1050
-$EndPAD
-$PAD
-Sh "5" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -130 1050
-$EndPAD
-$PAD
-Sh "6" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 5 "/CLK_PHONE"
-Po 130 1050
-$EndPAD
-$PAD
-Sh "7" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 390 1050
-$EndPAD
-$PAD
-Sh "8" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 640 1050
-$EndPAD
-$PAD
-Sh "9" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 13 "/I/O_SIM"
-Po 900 1050
-$EndPAD
-$PAD
-Sh "10" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 35 "GND"
-Po 1150 1050
-$EndPAD
-$PAD
-Sh "11" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 12 "/I/O_PHONE"
-Po 1150 -1050
-$EndPAD
-$PAD
-Sh "12" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 900 -1050
-$EndPAD
-$PAD
-Sh "13" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 640 -1050
-$EndPAD
-$PAD
-Sh "14" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 6 "/CLK_SIM"
-Po 390 -1050
-$EndPAD
-$PAD
-Sh "15" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po 130 -1050
-$EndPAD
-$PAD
-Sh "16" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 20 "/RST_SIM"
-Po -130 -1050
-$EndPAD
-$PAD
-Sh "17" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 0 ""
-Po -380 -1050
-$EndPAD
-$PAD
-Sh "18" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 32 "/VCC_SIM"
-Po -640 -1050
-$EndPAD
-$PAD
-Sh "19" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 14 "/I/O_SW"
-Po -900 -1050
-$EndPAD
-$PAD
-Sh "20" R 160 500 0 0 1800
-Dr 0 0 0
-At SMD N 00888000
-Ne 34 "3V3"
-Po -1150 -1050
-$EndPAD
-$SHAPE3D
-Na "smd/cms_so20.wrl"
-Sc 0.255000 0.330000 0.300000
-Of 0.000000 0.000000 0.000000
-Ro 0.000000 0.000000 0.000000
-$EndSHAPE3D
-$EndMODULE  SSOP20
 $MODULE TQFP_64
 Po 32950 46800 2700 15 4DFDBDC2 4DCD0831 ~~
 Li TQFP_64
@@ -3232,12 +3065,12 @@ Po 1339 787
 $EndPAD
 $EndMODULE  PUSH_BUTTON
 $MODULE SOT223-6
-Po 39950 51350 0 15 4DFF2FC5 4DCD082E ~~
+Po 39950 51350 0 15 4DFF630F 4DCD082E ~~
 Li SOT223-6
 Sc 4DCD082E
 AR /4DC6A52E
 Op 0 0 0
-T0 0 2352 600 600 0 120 N V 21 N"IC2"
+T0 50 50 600 600 0 120 N V 21 N"IC2"
 T1 -10 -2165 600 600 0 120 N V 21 N"LDO"
 DS -1289 -699 1289 -699 150 21
 DS 1289 -699 1289 699 150 21
@@ -3287,14 +3120,14 @@ Po 1004 1142
 $EndPAD
 $EndMODULE  SOT223-6
 $MODULE USB-MINI-B_UX60
-Po 45650 50000 900 15 4DFF2B1C 4DD21AF7 ~~
+Po 45650 50000 900 15 4DFF6301 4DD21AF7 ~~
 Li USB-MINI-B_UX60
 Cd Hirose UX60-MB-5ST
 Sc 4DD21AF7
 AR /4CFAC6EA
 Op 0 0 0
-T0 0 3228 600 600 900 120 N V 21 N"J1"
-T1 0 -1969 600 600 900 120 N V 21 N"USB"
+T0 0 1250 600 600 900 120 N I 21 N"J1"
+T1 -150 -2350 600 600 900 120 N V 21 N"USB"
 DS -433 1890 -276 236 100 21
 DS -276 236 276 236 100 21
 DS 276 236 433 1890 100 21
@@ -3551,6 +3384,173 @@ Ne 0 ""
 Po 8996 -3878
 $EndPAD
 $EndMODULE  SIM_AMPHENOL
+$MODULE SSOP20_BDQ
+Po 21700 42350 1800 15 4DFF59C4 4DCD0830 ~~
+Li SSOP20_BDQ
+Cd SSOP 20 pins
+Kw CMS SSOP SMD
+Sc 4DCD0830
+AR /4DC6A187
+Op 0 0 0
+.LocalClearance 79
+At SMD 
+T0 0 -250 300 300 1800 50 N V 21 N"IC4"
+T1 0 250 300 300 1800 50 N V 21 N"CB3Q3244"
+DS 1500 -700 -1500 -700 65 21
+DS -1500 700 1500 700 65 21
+DS 1500 -700 1500 700 65 21
+DS -1500 700 -1500 -700 60 21
+DC -1300 500 -1400 400 50 21
+DS -1500 -250 -1200 -250 50 21
+DS -1200 -250 -1200 250 50 21
+DS -1200 250 -1500 250 50 21
+$PAD
+Sh "1" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 22 "/SC_SW"
+Po -1150 1050
+$EndPAD
+$PAD
+Sh "2" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 31 "/VCC_PHONE"
+Po -900 1050
+$EndPAD
+$PAD
+Sh "3" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -640 1050
+$EndPAD
+$PAD
+Sh "4" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 19 "/RST_PHONE"
+Po -380 1050
+$EndPAD
+$PAD
+Sh "5" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -130 1050
+$EndPAD
+$PAD
+Sh "6" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 5 "/CLK_PHONE"
+Po 130 1050
+$EndPAD
+$PAD
+Sh "7" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 390 1050
+$EndPAD
+$PAD
+Sh "8" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 640 1050
+$EndPAD
+$PAD
+Sh "9" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 13 "/I/O_SIM"
+Po 900 1050
+$EndPAD
+$PAD
+Sh "10" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 35 "GND"
+Po 1150 1050
+$EndPAD
+$PAD
+Sh "11" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 12 "/I/O_PHONE"
+Po 1150 -1050
+$EndPAD
+$PAD
+Sh "12" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 900 -1050
+$EndPAD
+$PAD
+Sh "13" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 640 -1050
+$EndPAD
+$PAD
+Sh "14" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 6 "/CLK_SIM"
+Po 390 -1050
+$EndPAD
+$PAD
+Sh "15" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 130 -1050
+$EndPAD
+$PAD
+Sh "16" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 20 "/RST_SIM"
+Po -130 -1050
+$EndPAD
+$PAD
+Sh "17" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -380 -1050
+$EndPAD
+$PAD
+Sh "18" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 32 "/VCC_SIM"
+Po -640 -1050
+$EndPAD
+$PAD
+Sh "19" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 14 "/I/O_SW"
+Po -900 -1050
+$EndPAD
+$PAD
+Sh "20" R 160 748 0 0 1800
+Dr 0 0 0
+At SMD N 00888000
+Ne 34 "3V3"
+Po -1150 -1050
+$EndPAD
+$SHAPE3D
+Na "smd/cms_so20.wrl"
+Sc 0.255000 0.330000 0.300000
+Of 0.000000 0.000000 0.000000
+Ro 0.000000 0.000000 0.000000
+$EndSHAPE3D
+$EndMODULE  SSOP20_BDQ
 $TEXTPCB
 Te "1"
 Po 37200 54250 300 300 75 0
@@ -3787,6 +3787,32 @@ Po 0 33836 45179 33439 45576 80 -1
 De 15 0 4 0 0
 Po 0 33836 44489 33836 45179 80 -1
 De 15 0 4 0 800
+Po 0 19300 40650 19300 41050 80 -1
+De 15 0 5 0 0
+Po 0 24650 41850 24650 41871 80 -1
+De 0 0 5 0 0
+Po 0 23850 41050 24650 41850 80 -1
+De 0 0 5 0 0
+Po 0 19300 41050 23850 41050 80 -1
+De 0 0 5 0 0
+Po 3 19300 41050 19300 41050 350 -1
+De 15 1 5 0 0
+Po 0 24650 41871 24650 41900 80 -1
+De 0 0 5 0 0
+Po 0 24650 41900 24650 41871 80 -1
+De 0 0 5 0 0
+Po 0 17500 41853 17797 41853 80 -1
+De 15 0 5 0 0
+Po 0 21570 40870 21570 41300 80 -1
+De 15 0 5 0 400
+Po 0 21350 40650 21570 40870 80 -1
+De 15 0 5 0 0
+Po 0 19000 40650 19300 40650 80 -1
+De 15 0 5 0 0
+Po 0 19300 40650 21350 40650 80 -1
+De 15 0 5 0 0
+Po 0 17797 41853 19000 40650 80 -1
+De 15 0 5 0 0
 Po 0 32950 46600 32950 47100 80 -1
 De 0 0 5 0 0
 Po 0 34319 47500 34526 47293 80 -1
@@ -3807,18 +3833,8 @@ Po 0 32950 46600 32600 46600 80 -1
 De 0 0 5 0 0
 Po 0 30800 45308 28087 45308 80 -1
 De 0 0 5 0 0
-Po 0 28087 45308 24517 41738 80 -1
+Po 0 28087 45308 24650 41871 80 -1
 De 0 0 5 0 0
-Po 0 24517 41738 21713 41738 80 -1
-De 0 0 5 0 0
-Po 0 21713 41738 21606 41845 80 -1
-De 0 0 5 0 0
-Po 0 21570 41300 21570 41809 80 -1
-De 15 0 5 0 800
-Po 0 21570 41809 21606 41845 80 -1
-De 15 0 5 0 0
-Po 3 21606 41845 21606 41845 350 -1
-De 15 1 5 0 0
 Po 0 32600 46600 31300 45300 80 -1
 De 0 0 5 0 0
 Po 0 31300 45300 30800 45300 80 -1
@@ -3831,14 +3847,8 @@ Po 0 35325 47293 34526 47293 80 -1
 De 15 0 5 0 800
 Po 3 32950 46600 32950 46600 350 -1
 De 15 1 5 0 0
-Po 0 19082 41853 16947 41853 80 -1
+Po 0 17500 41853 16947 41853 80 -1
 De 15 0 5 0 400
-Po 0 20028 40907 19082 41853 80 -1
-De 15 0 5 0 0
-Po 0 21570 40907 20028 40907 80 -1
-De 15 0 5 0 0
-Po 0 21570 41300 21570 40907 80 -1
-De 15 0 5 0 800
 Po 0 31224 48080 30639 48080 80 -1
 De 15 0 5 0 400
 Po 0 31433 47871 31224 48080 80 -1
@@ -4015,25 +4025,21 @@ Po 0 33836 49664 34368 50196 80 -1
 De 15 0 11 0 0
 Po 0 33836 49175 33836 49664 80 -1
 De 15 0 11 0 800
-Po 3 20677 43929 20677 43929 350 -1
+Po 0 20550 43400 20550 44150 80 -1
+De 15 0 12 0 800
+Po 0 20550 44150 20700 44300 80 -1
+De 15 0 12 0 0
+Po 3 20700 44300 20700 44300 350 -1
 De 15 1 12 0 0
 Po 3 31218 47395 31218 47395 350 -1
 De 15 1 12 0 0
 Po 3 18634 42242 18634 42242 350 -1
 De 15 1 12 0 0
-Po 0 20676 43929 20677 43929 80 -1
-De 15 0 12 0 0
-Po 0 20676 43919 20676 43929 80 -1
-De 15 0 12 0 0
-Po 0 20550 43793 20676 43919 80 -1
-De 15 0 12 0 0
 Po 0 30639 47293 31082 47293 80 -1
 De 15 0 12 0 800
 Po 0 30639 47883 31082 47883 80 -1
 De 15 0 12 0 800
-Po 0 20550 43400 20550 43793 80 -1
-De 15 0 12 0 800
-Po 0 20677 43184 20677 43929 80 -1
+Po 0 20677 43184 20700 44300 80 -1
 De 0 0 12 0 0
 Po 0 19576 43184 18634 42242 80 -1
 De 0 0 12 0 0
@@ -4063,6 +4069,12 @@ Po 0 31082 47883 31082 47395 80 -1
 De 15 0 12 0 0
 Po 0 31082 47395 31082 47293 80 -1
 De 15 0 12 0 0
+Po 0 23861 42533 23833 42533 80 -1
+De 15 0 13 0 0
+Po 0 23500 42200 21307 42200 80 -1
+De 15 0 13 0 0
+Po 0 23833 42533 23500 42200 80 -1
+De 15 0 13 0 0
 Po 3 23861 42533 23861 42533 350 -1
 De 15 1 13 0 0
 Po 3 29951 49794 29951 49794 350 -1
@@ -4079,15 +4091,7 @@ Po 0 33965 46643 33965 46079 80 -1
 De 15 0 13 0 0
 Po 0 25403 49794 25999 49794 80 -1
 De 15 0 13 0 800
-Po 0 21458 42351 20800 41693 80 -1
-De 15 0 13 0 0
-Po 0 22389 42351 21458 42351 80 -1
-De 15 0 13 0 0
-Po 0 22540 42502 22389 42351 80 -1
-De 15 0 13 0 0
-Po 0 23830 42502 22540 42502 80 -1
-De 15 0 13 0 0
-Po 0 23861 42533 23830 42502 80 -1
+Po 0 21307 42200 20800 41693 80 -1
 De 15 0 13 0 0
 Po 0 24249 42533 23861 42533 80 -1
 De 0 0 13 0 0
@@ -4211,46 +4215,58 @@ Po 0 34199 52712 33592 52712 80 -1
 De 15 0 18 0 800
 Po 0 32458 49175 32458 49618 80 -1
 De 15 0 18 0 800
-Po 0 32294 47856 32400 47962 80 -1
-De 0 0 19 0 0
-Po 0 32400 48500 32400 47962 80 -1
-De 0 0 19 0 0
-Po 0 32655 48732 32510 48587 80 -1
-De 15 0 19 0 0
-Po 0 32510 48587 32400 48500 80 -1
-De 15 0 19 0 0
-Po 0 32655 49175 32655 48732 80 -1
+Po 0 22080 41300 22080 41830 80 -1
 De 15 0 19 0 800
-Po 3 32400 48500 32400 48500 350 -1
+Po 0 23200 42000 23500 41700 80 -1
+De 15 0 19 0 0
+Po 0 22250 42000 23200 42000 80 -1
+De 15 0 19 0 0
+Po 0 22080 41830 22250 42000 80 -1
+De 15 0 19 0 0
+Po 0 23500 41700 23935 41700 80 -1
+De 0 0 19 0 0
+Po 3 23500 41700 23500 41700 350 -1
 De 15 1 19 0 0
-Po 3 23204 42057 23204 42057 350 -1
-De 15 1 19 0 0
-Po 0 22444 42057 23204 42057 80 -1
-De 15 0 19 0 0
-Po 0 22080 41693 22444 42057 80 -1
-De 15 0 19 0 0
-Po 0 22080 41300 22080 41693 80 -1
-De 15 0 19 0 800
-Po 0 22080 41300 22080 40907 80 -1
-De 15 0 19 0 800
-Po 0 23232 42029 23204 42057 80 -1
-De 0 0 19 0 0
-Po 0 24265 42029 23232 42029 80 -1
-De 0 0 19 0 0
-Po 0 27727 45491 24265 42029 80 -1
+Po 0 32294 47856 29929 45491 80 -1
 De 0 0 19 0 0
 Po 0 29929 45491 27727 45491 80 -1
 De 0 0 19 0 0
-Po 0 32294 47856 29929 45491 80 -1
+Po 0 27727 45491 24353 42117 80 -1
 De 0 0 19 0 0
-Po 0 21897 40724 22080 40907 80 -1
-De 15 0 19 0 0
-Po 0 18917 40724 21897 40724 80 -1
-De 15 0 19 0 0
-Po 0 18182 41459 18917 40724 80 -1
-De 15 0 19 0 0
-Po 0 16947 41459 18182 41459 80 -1
+Po 3 32400 48500 32400 48500 350 -1
+De 15 1 19 0 0
+Po 0 32655 49175 32655 48732 80 -1
 De 15 0 19 0 800
+Po 0 32510 48587 32400 48500 80 -1
+De 15 0 19 0 0
+Po 0 32655 48732 32510 48587 80 -1
+De 15 0 19 0 0
+Po 0 32400 48500 32400 47962 80 -1
+De 0 0 19 0 0
+Po 0 32294 47856 32400 47962 80 -1
+De 0 0 19 0 0
+Po 0 23935 41700 24353 42118 80 -1
+De 0 0 19 0 0
+Po 0 24353 42118 24353 42117 80 -1
+De 0 0 19 0 0
+Po 0 22080 41300 22080 40441 80 -1
+De 15 0 19 0 800
+Po 0 17641 41459 16947 41459 80 -1
+De 15 0 19 0 400
+Po 0 18800 40300 17641 41459 80 -1
+De 15 0 19 0 0
+Po 0 21939 40300 18800 40300 80 -1
+De 15 0 19 0 0
+Po 0 22080 40441 21939 40300 80 -1
+De 15 0 19 0 0
+Po 0 21830 43400 21830 42930 80 -1
+De 15 0 20 0 800
+Po 0 20423 42800 20151 43072 80 -1
+De 15 0 20 0 0
+Po 0 21700 42800 20423 42800 80 -1
+De 15 0 20 0 0
+Po 0 21830 42930 21700 42800 80 -1
+De 15 0 20 0 0
 Po 0 34107 48350 34090 48350 80 -1
 De 15 0 20 0 0
 Po 0 32100 48150 31982 48268 80 -1
@@ -4271,18 +4287,12 @@ Po 0 29639 51294 31230 49703 80 -1
 De 15 0 20 0 0
 Po 0 25999 51294 29639 51294 80 -1
 De 15 0 20 0 0
-Po 0 20216 43007 21830 43007 80 -1
-De 15 0 20 0 0
-Po 0 20151 43072 20216 43007 80 -1
-De 15 0 20 0 0
 Po 0 20151 49585 20151 43072 80 -1
 De 15 0 20 0 0
 Po 0 21860 51294 20151 49585 80 -1
 De 15 0 20 0 0
 Po 0 25403 51294 21860 51294 80 -1
 De 15 0 20 0 800
-Po 0 21830 43400 21830 43007 80 -1
-De 15 0 20 0 800
 Po 0 34427 48670 34427 49175 80 -1
 De 15 0 20 0 400
 Po 0 34107 48350 34427 48670 80 -1
@@ -4293,32 +4303,30 @@ Po 0 32262 51654 32262 49175 80 -1
 De 15 0 21 0 400
 Po 0 33820 53212 32262 51654 80 -1
 De 15 0 21 0 0
+Po 0 22850 41300 23900 41300 80 -1
+De 15 0 22 0 800
+Po 0 24274 41674 24274 43010 80 -1
+De 15 0 22 0 0
+Po 0 23900 41300 24274 41674 80 -1
+De 15 0 22 0 0
 Po 3 24274 43010 24274 43010 350 -1
 De 15 1 22 0 0
-Po 3 30067 48432 30067 48432 350 -1
-De 15 1 22 0 0
-Po 0 30067 47670 30067 48432 80 -1
-De 0 0 22 0 0
-Po 0 28864 46467 30067 47670 80 -1
-De 0 0 22 0 0
-Po 0 27731 46467 28864 46467 80 -1
-De 0 0 22 0 0
-Po 0 24274 43010 27731 46467 80 -1
-De 0 0 22 0 0
-Po 0 24274 42496 24274 43010 80 -1
+Po 0 30196 48277 30196 48303 80 -1
 De 15 0 22 0 0
-Po 0 23471 41693 24274 42496 80 -1
-De 15 0 22 0 0
-Po 0 22850 41693 23471 41693 80 -1
+Po 0 30196 48303 30067 48432 80 -1
 De 15 0 22 0 0
 Po 0 30639 48277 30196 48277 80 -1
 De 15 0 22 0 800
-Po 0 30196 48303 30067 48432 80 -1
-De 15 0 22 0 0
-Po 0 30196 48277 30196 48303 80 -1
-De 15 0 22 0 0
-Po 0 22850 41300 22850 41693 80 -1
-De 15 0 22 0 800
+Po 0 24274 43010 27731 46467 80 -1
+De 0 0 22 0 0
+Po 0 27731 46467 28864 46467 80 -1
+De 0 0 22 0 0
+Po 0 28864 46467 30067 47670 80 -1
+De 0 0 22 0 0
+Po 0 30067 47670 30067 48432 80 -1
+De 0 0 22 0 0
+Po 3 30067 48432 30067 48432 350 -1
+De 15 1 22 0 0
 Po 3 34413 49753 34413 49753 350 -1
 De 15 1 23 0 0
 Po 3 30729 49429 30729 49429 350 -1
@@ -4465,6 +4473,24 @@ Po 0 43900 53522 43900 53075 80 -1
 De 15 0 30 0 400
 Po 0 43945 53567 43900 53522 80 -1
 De 15 0 30 0 0
+Po 0 22600 40500 25000 40500 80 -1
+De 15 0 31 0 0
+Po 0 25550 41050 25550 41055 80 -1
+De 15 0 31 0 0
+Po 0 25000 40500 25550 41050 80 -1
+De 15 0 31 0 0
+Po 0 22600 41300 22600 40500 80 -1
+De 15 0 31 0 800
+Po 0 22600 40500 22600 40200 80 -1
+De 15 0 31 0 0
+Po 0 17584 41066 16947 41066 80 -1
+De 15 0 31 0 400
+Po 0 18600 40050 17584 41066 80 -1
+De 15 0 31 0 0
+Po 0 22450 40050 18600 40050 80 -1
+De 15 0 31 0 0
+Po 0 22600 40200 22450 40050 80 -1
+De 15 0 31 0 0
 Po 0 33049 49175 33049 48801 80 -1
 De 15 0 31 0 800
 Po 0 31500 46050 31082 46050 80 -1
@@ -4487,50 +4513,36 @@ Po 0 31082 46050 31100 46050 80 -1
 De 15 0 31 0 0
 Po 0 31100 46050 31082 46050 80 -1
 De 15 0 31 0 0
-Po 0 25402 40907 22600 40907 80 -1
-De 15 0 31 0 0
-Po 0 27982 43487 25402 40907 80 -1
-De 15 0 31 0 0
-Po 0 29353 43487 27982 43487 80 -1
-De 15 0 31 0 0
-Po 0 31082 45216 29353 43487 80 -1
-De 15 0 31 0 0
-Po 0 31082 46308 31082 46050 80 -1
+Po 0 27982 43487 25550 41055 80 -1
 De 15 0 31 0 0
 Po 0 31082 46050 31082 45216 80 -1
 De 15 0 31 0 0
+Po 0 31082 45216 29353 43487 80 -1
+De 15 0 31 0 0
+Po 0 29353 43487 27982 43487 80 -1
+De 15 0 31 0 0
+Po 0 31082 46308 31082 46050 80 -1
+De 15 0 31 0 0
 Po 0 30639 46308 31082 46308 80 -1
 De 15 0 31 0 800
-Po 0 22600 41300 22600 40953 80 -1
-De 15 0 31 0 800
-Po 0 22600 40953 22600 40907 80 -1
-De 15 0 31 0 0
-Po 0 16947 41066 17484 41066 80 -1
-De 15 0 31 0 800
-Po 0 22206 40513 22600 40907 80 -1
-De 15 0 31 0 0
-Po 0 18037 40513 22206 40513 80 -1
-De 15 0 31 0 0
-Po 0 17484 41066 18037 40513 80 -1
-De 15 0 31 0 0
+Po 0 22340 43400 22340 42740 80 -1
+De 15 0 32 0 800
+Po 0 20362 42600 19967 42995 80 -1
+De 15 0 32 0 0
+Po 0 22200 42600 20362 42600 80 -1
+De 15 0 32 0 0
+Po 0 22340 42740 22200 42600 80 -1
+De 15 0 32 0 0
 Po 3 35603 48709 35603 48709 350 -1
 De 15 1 32 0 0
 Po 3 30327 52218 30327 52218 350 -1
 De 15 1 32 0 0
-Po 0 22143 42810 22340 43007 80 -1
-De 15 0 32 0 0
-Po 0 20152 42810 22143 42810 80 -1
-De 15 0 32 0 0
-Po 0 19967 42995 20152 42810 80 -1
-De 15 0 32 0 0
 Po 0 19967 49662 19967 42995 80 -1
 De 15 0 32 0 0
 Po 0 22599 52294 19967 49662 80 -1
 De 15 0 32 0 0
 Po 0 25403 52294 22599 52294 80 -1
 De 15 0 32 0 800
-Po 0 22340 43400 22340 43007 80 -1
-De 15 0 32 0 800
 Po 0 35768 48544 35603 48709 80 -1
 De 15 0 32 0 0
 Po 0 35768 47883 35768 48544 80 -1
@@ -4839,6 +4851,12 @@ Po 0 24781 43774 24802 43753 80 -1
 De 15 0 34 0 0
 Po 0 24781 43793 24781 43774 80 -1
 De 15 0 34 0 0
+Po 0 23900 43334 23884 43334 80 -1
+De 15 0 35 0 0
+Po 0 22950 42400 20952 42400 80 -1
+De 15 0 35 0 0
+Po 0 23884 43334 22950 42400 80 -1
+De 15 0 35 0 0
 Po 0 46843 38811 46843 46807 80 -1
 De 15 0 35 0 800
 Po 0 46600 47050 46600 47017 80 -1
@@ -5143,17 +5161,9 @@ Po 0 26951 44170 27932 44170 80 -1
 De 15 0 35 0 0
 Po 0 20550 41998 20550 41693 80 -1
 De 15 0 35 0 0
-Po 0 21176 42624 20550 41998 80 -1
+Po 0 20952 42400 20550 41998 80 -1
 De 15 0 35 0 0
-Po 0 22311 42624 21176 42624 80 -1
-De 15 0 35 0 0
-Po 0 22372 42685 22311 42624 80 -1
-De 15 0 35 0 0
-Po 0 22920 42685 22372 42685 80 -1
-De 15 0 35 0 0
-Po 0 23569 43334 22920 42685 80 -1
-De 15 0 35 0 0
-Po 0 25419 43334 23569 43334 80 -1
+Po 0 25419 43334 23900 43334 80 -1
 De 15 0 35 0 0
 Po 0 25441 43356 25419 43334 80 -1
 De 15 0 35 0 0
@@ -5882,22 +5892,33 @@ $POLYSCORNERS
 19677 42995 0 0
 19699 42884 0 0
 19762 42790 0 0
-19946 42605 0 0
-20041 42542 0 0
-20152 42520 0 0
-21217 42520 0 0
+20156 42395 0 0
+20251 42332 0 0
+20362 42310 0 0
+21006 42310 0 0
 20595 41898 0 0
-20532 41804 0 0
-20510 41693 0 0
-20510 41692 0 0
-20509 41691 0 0
-20471 41599 0 0
-20471 41197 0 0
-20148 41196 0 0
-19287 42058 0 0
-19193 42121 0 0
-19082 42143 0 0
-19052 42143 0 0
+20589 41889 0 0
+20579 41885 0 0
+20509 41815 0 0
+20471 41723 0 0
+20471 40940 0 0
+19714 40940 0 0
+19725 40966 0 0
+19725 41135 0 0
+19660 41291 0 0
+19540 41411 0 0
+19384 41475 0 0
+19215 41475 0 0
+19059 41410 0 0
+18939 41290 0 0
+18889 41170 0 0
+18108 41952 0 0
+18322 41952 0 0
+18394 41881 0 0
+18550 41817 0 0
+18719 41817 0 0
+18875 41882 0 0
+18995 42002 0 0
 19059 42158 0 0
 19059 42327 0 0
 18994 42483 0 0
@@ -5980,11 +6001,14 @@ $POLYSCORNERS
 17196 40485 0 0
 17196 40699 0 0
 17390 40699 0 0
-17425 40714 0 0
-17832 40308 0 0
-17926 40245 0 0
-18037 40223 0 0
-20581 40223 0 1
+17481 40737 0 0
+17492 40748 0 0
+18394 39846 0 0
+18394 39845 0 0
+18395 39845 0 0
+18489 39782 0 0
+18600 39760 0 0
+20581 39760 0 1
 20581 38083 0 0
 20490 38045 0 0
 20420 37975 0 0
@@ -6002,15 +6026,22 @@ $POLYSCORNERS
 22032 38045 0 0
 21940 38083 0 0
 20581 38083 0 1
-20581 40223 0 0
-22206 40223 0 0
-22317 40245 0 0
-22411 40308 0 0
-22719 40617 0 0
-25402 40617 0 0
-25513 40639 0 0
-25607 40702 0 0
-28102 43197 0 0
+20581 39760 0 0
+22450 39760 0 0
+22561 39782 0 0
+22655 39845 0 0
+22805 39995 0 0
+22868 40089 0 0
+22890 40200 0 0
+22890 40210 0 0
+25000 40210 0 0
+25111 40232 0 0
+25205 40295 0 0
+25754 40844 0 0
+25754 40844 0 0
+25755 40845 0 0
+25765 40860 0 0
+28102 43196 0 0
 28349 43197 0 0
 24507 39355 0 0
 24444 39261 0 0
@@ -7122,16 +7153,16 @@ $POLYSCORNERS
 22395 44287 0 0
 22332 44193 0 0
 22310 44082 0 0
-22310 43899 0 0
-22210 43899 0 0
-22209 43898 0 0
-22209 43899 0 0
-21959 43899 0 0
-21950 43899 0 0
-21700 43899 0 0
-21699 43898 0 0
-21699 43899 0 0
-21600 43899 0 0
+22310 44023 0 0
+22210 44023 0 0
+22209 44022 0 0
+22209 44023 0 0
+21959 44023 0 0
+21950 44023 0 0
+21700 44023 0 0
+21699 44022 0 0
+21699 44023 0 0
+21600 44023 0 0
 21600 44508 0 0
 21578 44619 0 0
 21515 44713 0 0
@@ -7266,16 +7297,21 @@ $POLYSCORNERS
 26436 43126 0 0
 26547 43104 0 0
 27182 43104 0 0
-27189 43105 0 0
-25281 41197 0 0
-23179 41197 0 0
-23179 41403 0 0
-23471 41403 0 0
-23582 41425 0 0
-23676 41488 0 0
-24479 42291 0 0
-24542 42385 0 0
-24564 42496 0 0
+27190 43105 0 0
+25345 41260 0 0
+25334 41244 0 0
+24879 40789 0 0
+23143 40790 0 0
+23179 40877 0 0
+23179 41010 0 0
+23900 41010 0 0
+24011 41032 0 0
+24105 41095 0 0
+24478 41468 0 0
+24478 41468 0 0
+24479 41469 0 0
+24542 41563 0 0
+24564 41674 0 0
 24564 42699 0 0
 24635 42770 0 0
 24699 42926 0 0
@@ -7290,18 +7326,23 @@ $POLYSCORNERS
 23849 42958 0 0
 23776 42958 0 0
 23620 42893 0 0
-23519 42792 0 0
-22540 42792 0 0
-22533 42790 0 0
-22545 42802 0 0
-22608 42896 0 0
-22608 42901 0 0
-22721 42901 0 0
-22730 42901 0 0
-22980 42901 0 0
-23071 42939 0 0
-23141 43009 0 0
-23179 43101 0 0
+23500 42773 0 0
+23436 42617 0 0
+23436 42546 0 0
+23380 42490 0 0
+22500 42490 0 0
+22544 42534 0 0
+22544 42534 0 0
+22545 42535 0 0
+22608 42629 0 0
+22630 42740 0 0
+22630 42777 0 0
+22721 42777 0 0
+22730 42777 0 0
+22980 42777 0 0
+23071 42815 0 0
+23141 42885 0 0
+23179 42977 0 0
 23179 43503 1 0
 34470 42348 0 0
 34515 42303 0 0
@@ -7739,25 +7780,29 @@ $FILLSEGMENTS
 41858 39750 43689 39750
 44250 39750 45490 39750
 46612 39750 48010 39750
-14690 39830 24982 39830
+14690 39830 18418 39830
+22633 39830 24982 39830
 25802 39830 35920 39830
 36740 39830 41278 39830
 41858 39830 43609 39830
 44330 39830 45490 39830
 46692 39830 48010 39830
-14690 39910 25062 39910
+14690 39910 18330 39910
+22720 39910 25062 39910
 25882 39910 36000 39910
 36820 39910 41278 39910
 41858 39910 43565 39910
 44373 39910 45490 39910
 46735 39910 48010 39910
-14690 39990 25142 39990
+14690 39990 18250 39990
+22800 39990 25142 39990
 25962 39990 36080 39990
 36900 39990 41278 39990
 41858 39990 43532 39990
 44406 39990 45490 39990
 46768 39990 48010 39990
-14690 40070 25222 40070
+14690 40070 18170 40070
+22856 40070 25222 40070
 26042 40070 27990 40070
 30311 40070 31690 40070
 34011 40070 36160 40070
@@ -7765,7 +7810,8 @@ $FILLSEGMENTS
 41858 40070 43523 40070
 44415 40070 45490 40070
 46777 40070 48010 40070
-14690 40150 25302 40150
+14690 40150 18090 40150
+22881 40150 25302 40150
 26122 40150 27873 40150
 30427 40150 31573 40150
 34127 40150 36240 40150
@@ -7773,8 +7819,8 @@ $FILLSEGMENTS
 41858 40150 43523 40150
 44415 40150 45490 40150
 46777 40150 48010 40150
-14690 40230 18002 40230
-22242 40230 25382 40230
+14690 40230 18010 40230
+25101 40230 25382 40230
 26202 40230 27831 40230
 30470 40230 31531 40230
 34170 40230 36320 40230
@@ -7783,8 +7829,8 @@ $FILLSEGMENTS
 44398 40230 45490 40230
 46760 40230 48010 40230
 14690 40310 15184 40310
-17057 40310 17830 40310
-22413 40310 25462 40310
+17057 40310 17930 40310
+25220 40310 25462 40310
 26282 40310 27819 40310
 30481 40310 31519 40310
 34181 40310 36400 40310
@@ -7793,8 +7839,8 @@ $FILLSEGMENTS
 44364 40310 45490 40310
 46726 40310 48010 40310
 14690 40390 15085 40390
-17155 40390 17750 40390
-22493 40390 25542 40390
+17155 40390 17850 40390
+25300 40390 25542 40390
 26362 40390 27819 40390
 30481 40390 31519 40390
 34181 40390 36480 40390
@@ -7803,8 +7849,8 @@ $FILLSEGMENTS
 44309 40390 45490 40390
 46671 40390 48010 40390
 14690 40470 15050 40470
-17190 40470 17670 40470
-22573 40470 25622 40470
+17190 40470 17770 40470
+25380 40470 25622 40470
 26442 40470 27819 40470
 30481 40470 31519 40470
 34181 40470 36560 40470
@@ -7813,8 +7859,8 @@ $FILLSEGMENTS
 44229 40470 45216 40470
 46591 40470 48010 40470
 14690 40550 15044 40550
-17196 40550 17590 40550
-22653 40550 25702 40550
+17196 40550 17690 40550
+25460 40550 25702 40550
 26522 40550 27819 40550
 30481 40550 31519 40550
 34181 40550 36640 40550
@@ -7822,8 +7868,8 @@ $FILLSEGMENTS
 41989 40550 45107 40550
 46453 40550 48010 40550
 14690 40630 15044 40630
-17196 40630 17510 40630
-25468 40630 25782 40630
+17196 40630 17610 40630
+25540 40630 25782 40630
 26602 40630 27819 40630
 30481 40630 31519 40630
 34181 40630 36720 40630
@@ -7831,8 +7877,8 @@ $FILLSEGMENTS
 42069 40630 45068 40630
 46492 40630 48010 40630
 14690 40710 15044 40710
-17416 40710 17430 40710
-25615 40710 25862 40710
+17417 40710 17530 40710
+25620 40710 25862 40710
 26682 40710 27819 40710
 30481 40710 31519 40710
 34181 40710 36800 40710
@@ -7840,7 +7886,7 @@ $FILLSEGMENTS
 42149 40710 45059 40710
 46501 40710 48010 40710
 14690 40790 15044 40790
-25695 40790 25942 40790
+25700 40790 25942 40790
 26762 40790 27819 40790
 30481 40790 31519 40790
 34181 40790 36880 40790
@@ -7848,7 +7894,7 @@ $FILLSEGMENTS
 42229 40790 45059 40790
 46501 40790 48010 40790
 14690 40870 15048 40870
-25775 40870 26022 40870
+25776 40870 26022 40870
 26842 40870 27819 40870
 30481 40870 31519 40870
 34181 40870 36960 40870
@@ -7856,7 +7902,8 @@ $FILLSEGMENTS
 42309 40870 45059 40870
 46501 40870 48010 40870
 14690 40950 15081 40950
-25855 40950 26102 40950
+19719 40950 20471 40950
+25856 40950 26102 40950
 26922 40950 27819 40950
 30481 40950 31519 40950
 34181 40950 37040 40950
@@ -7864,7 +7911,8 @@ $FILLSEGMENTS
 42389 40950 45059 40950
 46501 40950 48010 40950
 14690 41030 15173 41030
-25935 41030 26182 41030
+19725 41030 20471 41030
+25936 41030 26182 41030
 27002 41030 27819 41030
 30481 41030 31519 41030
 34181 41030 37120 41030
@@ -7872,7 +7920,8 @@ $FILLSEGMENTS
 42469 41030 45059 41030
 46501 41030 48010 41030
 14690 41110 16305 41110
-26015 41110 26262 41110
+19725 41110 20471 41110
+26016 41110 26262 41110
 27082 41110 27819 41110
 30481 41110 31519 41110
 34181 41110 37200 41110
@@ -7880,7 +7929,9 @@ $FILLSEGMENTS
 42549 41110 45059 41110
 46501 41110 48010 41110
 14690 41190 16305 41190
-26095 41190 26342 41190
+18869 41190 18897 41190
+19702 41190 20471 41190
+26096 41190 26342 41190
 27162 41190 27838 41190
 30461 41190 31538 41190
 34161 41190 37280 41190
@@ -7888,8 +7939,9 @@ $FILLSEGMENTS
 42629 41190 45059 41190
 46501 41190 48010 41190
 14690 41270 16314 41270
-20074 41270 20471 41270
-26175 41270 26422 41270
+18789 41270 18930 41270
+19668 41270 20471 41270
+26176 41270 26422 41270
 27242 41270 27893 41270
 30407 41270 31593 41270
 34107 41270 37360 41270
@@ -7897,16 +7949,18 @@ $FILLSEGMENTS
 42709 41270 45059 41270
 46501 41270 48010 41270
 14690 41350 16305 41350
-19994 41350 20471 41350
-26255 41350 26502 41350
+18709 41350 18999 41350
+19601 41350 20471 41350
+26256 41350 26502 41350
 27322 41350 28860 41350
 29440 41350 32327 41350
 33116 41350 37470 41350
 42789 41350 45059 41350
 46501 41350 48010 41350
 14690 41430 16305 41430
-19914 41430 20471 41430
-26335 41430 26582 41430
+18629 41430 19107 41430
+19493 41430 20471 41430
+26336 41430 26582 41430
 27402 41430 28860 41430
 29440 41430 32247 41430
 33063 41430 33888 41430
@@ -7914,8 +7968,8 @@ $FILLSEGMENTS
 42869 41430 45059 41430
 46501 41430 48010 41430
 14690 41510 16305 41510
-19834 41510 20471 41510
-26415 41510 26662 41510
+18549 41510 20471 41510
+26416 41510 26662 41510
 27482 41510 28860 41510
 29440 41510 32167 41510
 32987 41510 33784 41510
@@ -7923,8 +7977,8 @@ $FILLSEGMENTS
 42949 41510 45059 41510
 46501 41510 48010 41510
 14690 41590 16305 41590
-19754 41590 20471 41590
-26495 41590 26742 41590
+18469 41590 20471 41590
+26496 41590 26742 41590
 27562 41590 28860 41590
 29440 41590 32087 41590
 32907 41590 33731 41590
@@ -7932,8 +7986,8 @@ $FILLSEGMENTS
 43029 41590 45059 41590
 46501 41590 48010 41590
 14690 41670 16311 41670
-19674 41670 20500 41670
-26575 41670 26822 41670
+18389 41670 20471 41670
+26576 41670 26822 41670
 27642 41670 28860 41670
 29440 41670 32020 41670
 32827 41670 33714 41670
@@ -7941,8 +7995,8 @@ $FILLSEGMENTS
 43109 41670 45059 41670
 46501 41670 48010 41670
 14690 41750 16305 41750
-19594 41750 20521 41750
-26655 41750 26902 41750
+18309 41750 20482 41750
+26656 41750 26902 41750
 27722 41750 28860 41750
 29440 41750 31978 41750
 32747 41750 33707 41750
@@ -7951,8 +8005,9 @@ $FILLSEGMENTS
 43189 41750 45059 41750
 46501 41750 48010 41750
 14690 41830 16305 41830
-19514 41830 20549 41830
-26735 41830 26982 41830
+18229 41830 18519 41830
+18751 41830 20524 41830
+26736 41830 26982 41830
 27802 41830 28860 41830
 29440 41830 31962 41830
 32667 41830 33707 41830
@@ -7961,8 +8016,9 @@ $FILLSEGMENTS
 43269 41830 45059 41830
 46501 41830 48010 41830
 14690 41910 16305 41910
-19434 41910 20607 41910
-26815 41910 27062 41910
+18149 41910 18365 41910
+18903 41910 20606 41910
+26816 41910 27062 41910
 27882 41910 28738 41910
 29562 41910 31960 41910
 32587 41910 33707 41910
@@ -7971,8 +8027,8 @@ $FILLSEGMENTS
 43349 41910 45059 41910
 46501 41910 48010 41910
 14690 41990 16305 41990
-19354 41990 20687 41990
-26895 41990 27142 41990
+18983 41990 20686 41990
+26896 41990 27142 41990
 27962 41990 28691 41990
 29698 41990 31960 41990
 32540 41990 33707 41990
@@ -7980,8 +8036,8 @@ $FILLSEGMENTS
 43429 41990 45092 41990
 46468 41990 48010 41990
 14690 42070 16309 42070
-19269 42070 20767 42070
-26975 42070 27222 42070
+19023 42070 20766 42070
+26976 42070 27222 42070
 28042 42070 28676 42070
 29780 42070 31960 42070
 32540 42070 33707 42070
@@ -7989,16 +8045,16 @@ $FILLSEGMENTS
 43509 42070 45165 42070
 46395 42070 48010 42070
 14690 42150 16305 42150
-19056 42150 20847 42150
-27055 42150 27302 42150
+19056 42150 20846 42150
+27056 42150 27302 42150
 28122 42150 28676 42150
 29860 42150 31960 42150
 32540 42150 33707 42150
 38902 42150 42183 42150
 43589 42150 48010 42150
 14690 42230 16305 42230
-19059 42230 20927 42230
-27135 42230 27382 42230
+19059 42230 20926 42230
+27136 42230 27382 42230
 28202 42230 28676 42230
 30976 42230 31960 42230
 32540 42230 33707 42230
@@ -8006,8 +8062,8 @@ $FILLSEGMENTS
 39883 42230 42263 42230
 43669 42230 48010 42230
 14690 42310 16305 42310
-19059 42310 21007 42310
-27215 42310 27462 42310
+19059 42310 20362 42310
+27216 42310 27462 42310
 28282 42310 28676 42310
 31166 42310 31905 42310
 32540 42310 33707 42310
@@ -8015,8 +8071,8 @@ $FILLSEGMENTS
 39970 42310 42343 42310
 43749 42310 48010 42310
 14690 42390 16305 42390
-19032 42390 21087 42390
-27295 42390 27542 42390
+19032 42390 20164 42390
+27296 42390 27542 42390
 28362 42390 28682 42390
 31247 42390 31825 42390
 32537 42390 33707 42390
@@ -8024,8 +8080,8 @@ $FILLSEGMENTS
 40050 42390 42423 42390
 43829 42390 48010 42390
 14690 42470 16307 42470
-18999 42470 21167 42470
-27375 42470 27622 42470
+18999 42470 20082 42470
+27376 42470 27622 42470
 28442 42470 28718 42470
 31327 42470 31428 42470
 35948 42470 36659 42470
@@ -8033,8 +8089,8 @@ $FILLSEGMENTS
 43909 42470 48010 42470
 14690 42550 16305 42550
 17589 42550 18341 42550
-18927 42550 20029 42550
-27455 42550 27702 42550
+18927 42550 20002 42550
+27456 42550 27702 42550
 28522 42550 28817 42550
 35948 42550 36739 42550
 40210 42550 42583 42550
@@ -8042,55 +8098,55 @@ $FILLSEGMENTS
 14690 42630 16305 42630
 17589 42630 18460 42630
 18808 42630 19922 42630
-27535 42630 27782 42630
+27536 42630 27782 42630
 28602 42630 29519 42630
 35932 42630 36819 42630
 40290 42630 42663 42630
 44069 42630 48010 42630
 14690 42710 16305 42710
 17589 42710 19842 42710
-27615 42710 27862 42710
+27616 42710 27862 42710
 28682 42710 29599 42710
 35899 42710 36926 42710
 40366 42710 42743 42710
 44149 42710 48010 42710
 14690 42790 16305 42790
 17589 42790 19762 42790
-27695 42790 27942 42790
+27696 42790 27942 42790
 28762 42790 29727 42790
 35842 42790 37193 42790
 40419 42790 42823 42790
 44229 42790 48010 42790
 14690 42870 16330 42870
 17563 42870 19709 42870
-27775 42870 28022 42870
+27776 42870 28022 42870
 28842 42870 30126 42870
 35760 42870 37560 42870
 40435 42870 42903 42870
 44309 42870 48010 42870
 14690 42950 16393 42950
 17501 42950 19686 42950
-27855 42950 28102 42950
+27856 42950 28102 42950
 29505 42950 30126 42950
 35489 42950 37640 42950
 40440 42950 42983 42950
 44389 42950 48010 42950
 14690 43030 19677 43030
-27935 43030 28182 43030
+27936 43030 28182 43030
 29612 43030 30149 43030
 35459 43030 37720 43030
 40440 43030 43063 43030
 44469 43030 48010 43030
 14690 43110 15121 43110
 17119 43110 19677 43110
-28015 43110 28262 43110
+28016 43110 28262 43110
 29692 43110 30208 43110
 35392 43110 37802 43110
 40440 43110 43143 43110
 46624 43110 48010 43110
 14690 43190 15065 43190
 17175 43190 19677 43190
-28095 43190 28342 43190
+28096 43190 28342 43190
 29772 43190 30310 43190
 35265 43190 39329 43190
 40440 43190 43223 43190
@@ -9106,68 +9162,66 @@ $FILLSEGMENTS
 29432 48970 30757 48970
 29352 49050 30533 49050
 29245 49130 30427 49130
-21699 43898 21699 43898
-22209 43898 22209 43898
-21600 43978 22310 43978
-21600 44058 22310 44058
-21600 44138 22321 44138
-21600 44218 22348 44218
-21600 44298 22406 44298
-21600 44378 22486 44378
-21600 44458 22566 44458
-21594 44538 22646 44538
-21578 44618 22726 44618
-21525 44698 22806 44698
-21450 44778 22886 44778
-21370 44858 22966 44858
-21290 44938 23046 44938
-21210 45018 23126 45018
-21130 45098 23206 45098
-21050 45178 23286 45178
-20970 45258 23366 45258
-20890 45338 23446 45338
-20810 45418 23526 45418
-20730 45498 23606 45498
-20650 45578 23686 45578
-20639 45658 23766 45658
-20639 45738 23846 45738
-20639 45818 23926 45818
-20639 45898 24006 45898
-20639 45978 24086 45978
-20639 46058 24166 46058
-20639 46138 24246 46138
-20639 46218 24326 46218
-20639 46298 24425 46298
-20639 46378 28087 46378
-20639 46458 28087 46458
-20639 46538 28087 46538
-20639 46618 28087 46618
-20639 46698 28087 46698
-20639 46778 28087 46778
-20639 46858 28087 46858
-20639 46938 28087 46938
-20639 47018 28087 47018
-20639 47098 28087 47098
-20639 47178 28087 47178
-20639 47258 28087 47258
-20639 47338 28087 47338
-24946 47418 28087 47418
-25036 47498 28087 47498
-25069 47578 28087 47578
-25073 47658 28087 47658
-25073 47738 28087 47738
-25073 47818 28087 47818
-25073 47898 28087 47898
-25073 47978 28087 47978
-25918 48058 28087 48058
-27460 48138 28087 48138
-27568 48218 28087 48218
-27648 48298 28087 48298
-27728 48378 28087 48378
-27808 48458 28087 48458
-27888 48538 28087 48538
-27968 48618 28087 48618
-28048 48698 28087 48698
+21699 44022 21699 44022
+22209 44022 22209 44022
+21600 44102 22313 44102
+21600 44182 22329 44182
+21600 44262 22378 44262
+21600 44342 22450 44342
+21600 44422 22530 44422
+21600 44502 22610 44502
+21585 44582 22690 44582
+21549 44662 22770 44662
+21486 44742 22850 44742
+21406 44822 22930 44822
+21326 44902 23010 44902
+21246 44982 23090 44982
+21166 45062 23170 45062
+21086 45142 23250 45142
+21006 45222 23330 45222
+20926 45302 23410 45302
+20846 45382 23490 45382
+20766 45462 23570 45462
+20686 45542 23650 45542
+20639 45622 23730 45622
+20639 45702 23810 45702
+20639 45782 23890 45782
+20639 45862 23970 45862
+20639 45942 24050 45942
+20639 46022 24130 46022
+20639 46102 24210 46102
+20639 46182 24290 46182
+20639 46262 24371 46262
+20639 46342 24565 46342
+20639 46422 28087 46422
+20639 46502 28087 46502
+20639 46582 28087 46582
+20639 46662 28087 46662
+20639 46742 28087 46742
+20639 46822 28087 46822
+20639 46902 28087 46902
+20639 46982 28087 46982
+20639 47062 28087 47062
+20639 47142 28087 47142
+20639 47222 28087 47222
+20639 47302 28087 47302
+20639 47382 28087 47382
+25001 47462 28087 47462
+25054 47542 28087 47542
+25073 47622 28087 47622
+25073 47702 28087 47702
+25073 47782 28087 47782
+25073 47862 28087 47862
+25073 47942 28087 47942
+25073 48022 28087 48022
+26008 48102 28087 48102
+27526 48182 28087 48182
+27612 48262 28087 48262
+27692 48342 28087 48342
+27772 48422 28087 48422
+27852 48502 28087 48502
+27932 48582 28087 48582
+28012 48662 28087 48662
 43276 46734 43276 46734
 43196 46814 43276 46814
 43116 46894 43276 46894
@@ -9227,45 +9281,54 @@ $FILLSEGMENTS
 28990 45924 30792 45924
 28990 46004 30792 46004
 29036 46084 30187 46084
-23179 41197 25281 41197
-23179 41277 25361 41277
-23179 41357 25441 41357
-23600 41437 25521 41437
-23705 41517 25601 41517
-23785 41597 25681 41597
-23865 41677 25761 41677
-23945 41757 25841 41757
-24025 41837 25921 41837
-24105 41917 26001 41917
-24185 41997 26081 41997
-24265 42077 26161 42077
-24345 42157 26241 42157
-24425 42237 26321 42237
-24497 42317 26401 42317
-24545 42397 26481 42397
-24561 42477 26561 42477
-24564 42557 26641 42557
-24564 42637 26721 42637
-24582 42717 26801 42717
-22540 42797 23524 42797
-24647 42797 26881 42797
-22596 42877 23604 42877
-24679 42877 26961 42877
-23089 42957 23773 42957
-24699 42957 27041 42957
-23153 43037 23849 43037
-24699 43037 27121 43037
-23179 43117 23858 43117
-24689 43117 26482 43117
-23179 43197 23891 43197
-24656 43197 26333 43197
-23179 43277 23940 43277
-24608 43277 24794 43277
-25446 43277 25544 43277
-26196 43277 26253 43277
-23179 43357 24020 43357
-24528 43357 24726 43357
-23179 43437 24696 43437
+24879 40789 24879 40789
+23176 40869 24959 40869
+23179 40949 25039 40949
+23996 41029 25119 41029
+24119 41109 25199 41109
+24199 41189 25279 41189
+24279 41269 25354 41269
+24359 41349 25434 41349
+24439 41429 25514 41429
+24506 41509 25594 41509
+24548 41589 25674 41589
+24564 41669 25754 41669
+24564 41749 25834 41749
+24564 41829 25914 41829
+24564 41909 25994 41909
+24564 41989 26074 41989
+24564 42069 26154 42069
+24564 42149 26234 42149
+24564 42229 26314 42229
+24564 42309 26394 42309
+24564 42389 26474 42389
+24564 42469 26554 42469
+22555 42549 23436 42549
+24564 42549 26634 42549
+22608 42629 23440 42629
+24564 42629 26714 42629
+22624 42709 23473 42709
+24574 42709 26794 42709
+23009 42789 23516 42789
+24643 42789 26874 42789
+23125 42869 23596 42869
+24676 42869 26954 42869
+23168 42949 23754 42949
+24699 42949 27034 42949
+23179 43029 23849 43029
+24699 43029 27114 43029
+23179 43109 23855 43109
+24693 43109 26522 43109
+23179 43189 23887 43189
+24659 43189 26341 43189
+23179 43269 23932 43269
+24616 43269 24802 43269
+25438 43269 25552 43269
+26188 43269 26261 43269
+23179 43349 24012 43349
+24536 43349 24729 43349
+23179 43429 24174 43429
+24372 43429 24696 43429
 35266 42163 35266 42163
 34470 42243 34605 42243
 34470 42323 34495 42323
@@ -9328,22 +9391,22 @@ $POLYSCORNERS
 22790 43389 0 0
 22696 43452 0 0
 22585 43474 0 0
-20967 43474 0 0
-20967 43618 0 0
-21038 43689 0 0
-21102 43845 0 0
-21102 44014 0 0
-21037 44170 0 0
-20917 44290 0 0
-20761 44354 0 0
-20592 44354 0 0
-20436 44289 0 0
-20316 44169 0 0
-20252 44013 0 0
-20252 43844 0 0
-20317 43688 0 0
-20387 43618 0 0
-20387 43474 0 0
+20973 43474 0 0
+20983 43982 0 0
+21061 44060 0 0
+21125 44216 0 0
+21125 44385 0 0
+21060 44541 0 0
+20940 44661 0 0
+20784 44725 0 0
+20615 44725 0 0
+20459 44660 0 0
+20339 44540 0 0
+20275 44384 0 0
+20275 44215 0 0
+20340 44059 0 0
+20403 43995 0 0
+20392 43474 0 0
 19576 43474 0 0
 19465 43452 0 0
 19371 43389 0 0
@@ -9362,29 +9425,35 @@ $POLYSCORNERS
 19059 42158 0 0
 19059 42257 0 0
 19695 42894 0 0
+20671 42894 0 0
 20677 42894 0 0
 22464 42894 0 0
-22952 42406 0 0
-22843 42297 0 0
-22779 42141 0 0
-22779 42028 0 0
-21990 42028 0 0
-21966 42086 0 0
-21846 42206 0 0
-21690 42270 0 0
-21521 42270 0 0
-21365 42205 0 0
-21245 42085 0 0
-21181 41929 0 0
-21181 41760 0 0
-21246 41604 0 0
-21366 41484 0 0
-21522 41420 0 0
-21691 41420 0 0
-21758 41448 0 0
-24517 41448 0 0
-24628 41470 0 0
-24722 41533 0 0
+23287 42071 0 0
+23259 42060 0 0
+23139 41940 0 0
+23075 41784 0 0
+23075 41615 0 0
+23140 41459 0 0
+23259 41340 0 0
+19611 41340 0 0
+19540 41411 0 0
+19384 41475 0 0
+19215 41475 0 0
+19059 41410 0 0
+18939 41290 0 0
+18875 41134 0 0
+18875 40965 0 0
+18940 40809 0 0
+19060 40689 0 0
+19216 40625 0 0
+19385 40625 0 0
+19541 40690 0 0
+19611 40760 0 0
+23850 40760 0 0
+23961 40782 0 0
+24055 40845 0 0
+24855 41645 0 0
+24897 41708 0 0
 27939 44749 0 0
 27940 44748 0 0
 28060 44628 0 0
@@ -10068,96 +10137,105 @@ $FILLSEGMENTS
 14690 40550 31074 40550
 36484 40550 40440 40550
 41759 40550 48010 40550
-14690 40630 31074 40630
+14690 40630 19204 40630
+19397 40630 31074 40630
 36484 40630 40360 40630
 41679 40630 48010 40630
-14690 40710 31074 40710
+14690 40710 19039 40710
+19561 40710 31074 40710
 36484 40710 40280 40710
 41599 40710 48010 40710
-14690 40790 31074 40790
+14690 40790 18959 40790
+23973 40790 31074 40790
 36484 40790 40200 40790
 41519 40790 48010 40790
-14690 40870 31074 40870
+14690 40870 18915 40870
+24080 40870 31074 40870
 36484 40870 40120 40870
 41439 40870 48010 40870
-14690 40950 31074 40950
+14690 40950 18882 40950
+24160 40950 31074 40950
 36484 40950 40040 40950
 41359 40950 48010 40950
-14690 41030 31074 41030
+14690 41030 18875 41030
+24240 41030 31074 41030
 36484 41030 39960 41030
 41279 41030 48010 41030
-14690 41110 31074 41110
+14690 41110 18875 41110
+24320 41110 31074 41110
 36484 41110 39880 41110
 41199 41110 48010 41110
-14690 41190 31074 41190
+14690 41190 18897 41190
+24400 41190 31074 41190
 36484 41190 39800 41190
 41119 41190 48010 41190
-14690 41270 31074 41270
+14690 41270 18930 41270
+24480 41270 31074 41270
 36484 41270 39720 41270
 41039 41270 48010 41270
-14690 41350 31074 41350
+14690 41350 18999 41350
+19601 41350 23249 41350
+24560 41350 31074 41350
 36484 41350 39640 41350
 40959 41350 48010 41350
-14690 41430 21498 41430
-21715 41430 31074 41430
+14690 41430 19107 41430
+19493 41430 23169 41430
+24640 41430 31074 41430
 36484 41430 39560 41430
 40879 41430 48010 41430
-14690 41510 21340 41510
-24688 41510 31074 41510
+14690 41510 23119 41510
+24720 41510 31074 41510
 36484 41510 39480 41510
 40799 41510 48010 41510
-14690 41590 21260 41590
-24780 41590 31074 41590
+14690 41590 23086 41590
+24800 41590 31074 41590
 36484 41590 39400 41590
 40719 41590 48010 41590
-14690 41670 21219 41670
-24860 41670 31074 41670
+14690 41670 23075 41670
+24872 41670 31074 41670
 36484 41670 39320 41670
 40639 41670 48010 41670
-14690 41750 21186 41750
+14690 41750 23075 41750
 24940 41750 31074 41750
 36484 41750 39240 41750
 40559 41750 48010 41750
 14690 41830 18519 41830
-18751 41830 21181 41830
+18751 41830 23093 41830
 25020 41830 31074 41830
 36484 41830 39160 41830
 40479 41830 48010 41830
 14690 41910 18365 41910
-18903 41910 21181 41910
+18903 41910 23126 41910
 25100 41910 31074 41910
 36484 41910 39080 41910
 40399 41910 48010 41910
 14690 41990 18285 41990
-18983 41990 21206 41990
+18983 41990 23189 41990
 25180 41990 31074 41990
 36484 41990 39000 41990
 40319 41990 48010 41990
 14690 42070 18246 42070
-19023 42070 21238 42070
-21972 42070 22779 42070
+19023 42070 23284 42070
 25260 42070 31074 42070
 36484 42070 38920 42070
 40239 42070 48010 42070
 14690 42150 18212 42150
-19056 42150 21310 42150
-21902 42150 22782 42150
+19056 42150 23208 42150
 25340 42150 31074 42150
 36484 42150 38840 42150
 40159 42150 48010 42150
 14690 42230 18209 42230
-19059 42230 21425 42230
-21787 42230 22815 42230
+19059 42230 23128 42230
 25420 42230 31074 42230
 36484 42230 38760 42230
 40079 42230 48010 42230
 14690 42310 18209 42310
-19112 42310 22856 42310
+19112 42310 23048 42310
 25500 42310 31074 42310
 36484 42310 38680 42310
 39999 42310 48010 42310
 14690 42390 18235 42390
-19192 42390 22936 42390
+19192 42390 22968 42390
 25580 42390 31074 42390
 36484 42390 38600 42390
 39919 42390 48010 42390
@@ -10229,79 +10307,84 @@ $FILLSEGMENTS
 26620 43430 31074 43430
 36484 43430 37560 43430
 38879 43430 48010 43430
-14690 43510 20387 43510
-20967 43510 24364 43510
+14690 43510 20392 43510
+20974 43510 24364 43510
 26700 43510 31074 43510
 36484 43510 37480 43510
 38799 43510 48010 43510
-14690 43590 20387 43590
-20967 43590 24444 43590
+14690 43590 20394 43590
+20976 43590 24444 43590
 26780 43590 31074 43590
 36484 43590 37400 43590
 38719 43590 48010 43590
-14690 43670 20335 43670
-21019 43670 24524 43670
+14690 43670 20396 43670
+20977 43670 24524 43670
 26860 43670 30781 43670
 36484 43670 37320 43670
 38639 43670 48010 43670
-14690 43750 20292 43750
-21064 43750 24604 43750
+14690 43750 20397 43750
+20979 43750 24604 43750
 26940 43750 30679 43750
 36484 43750 37240 43750
 38559 43750 48010 43750
-14690 43830 20258 43830
-21096 43830 24684 43830
+14690 43830 20399 43830
+20981 43830 24684 43830
 27020 43830 30614 43830
 36484 43830 37160 43830
 38479 43830 48010 43830
-14690 43910 20252 43910
-21102 43910 24764 43910
+14690 43910 20401 43910
+20982 43910 24764 43910
 27100 43910 30581 43910
 36484 43910 37080 43910
 38399 43910 48010 43910
-14690 43990 20252 43990
-21102 43990 24844 43990
+14690 43990 20402 43990
+20991 43990 24844 43990
 27180 43990 30559 43990
 36484 43990 37000 43990
 38319 43990 48010 43990
-14690 44070 20275 44070
-21078 44070 24924 44070
+14690 44070 20336 44070
+21066 44070 24924 44070
 27260 44070 30550 44070
 36484 44070 36920 44070
 38239 44070 48010 44070
-14690 44150 20308 44150
-21045 44150 25004 44150
+14690 44150 20303 44150
+21098 44150 25004 44150
 27340 44150 30470 44150
 36484 44150 36840 44150
 38159 44150 48010 44150
-14690 44230 20377 44230
-20977 44230 25084 44230
+14690 44230 20275 44230
+21125 44230 25084 44230
 27420 44230 30390 44230
 36484 44230 36760 44230
 38079 44230 48010 44230
-14690 44310 20486 44310
-20868 44310 25164 44310
+14690 44310 20275 44310
+21125 44310 25164 44310
 27500 44310 30310 44310
 36484 44310 36680 44310
 37999 44310 48010 44310
-14690 44390 25244 44390
+14690 44390 20277 44390
+21122 44390 25244 44390
 27580 44390 30230 44390
 36484 44390 36600 44390
 37919 44390 48010 44390
-14690 44470 25324 44470
+14690 44470 20310 44470
+21089 44470 25324 44470
 27660 44470 30150 44470
 36484 44470 36544 44470
 37839 44470 48010 44470
-14690 44550 25404 44550
+14690 44550 20349 44550
+21051 44550 25404 44550
 27740 44550 30070 44550
 36484 44550 36517 44550
 37759 44550 48010 44550
-14690 44630 25484 44630
+14690 44630 20429 44630
+20971 44630 25484 44630
 27820 44630 28058 44630
 28542 44630 29990 44630
 36484 44630 36506 44630
 37679 44630 48010 44630
-14690 44710 25564 44710
+14690 44710 20579 44710
+20820 44710 25564 44710
 27900 44710 27978 44710
 36484 44710 36506 44710
 37599 44710 48010 44710
diff --git a/hardware/kicad/SIMtrace.cmp b/hardware/kicad/SIMtrace.cmp
index 69f20df..c0e0969 100644
--- a/hardware/kicad/SIMtrace.cmp
+++ b/hardware/kicad/SIMtrace.cmp
@@ -1,4 +1,4 @@
-Cmp-Mod V01 Created by CvPCB (2010-00-09 BZR 23xx)-stable date = Mo 20 Jun 2011 12:54:15 CEST
+Cmp-Mod V01 Created by CvPCB (2010-00-09 BZR 23xx)-stable date = Mo 20 Jun 2011 16:53:08 CEST
 
 BeginCmp
 TimeStamp = /4DC804A6;
@@ -220,8 +220,8 @@ EndCmp
 BeginCmp
 TimeStamp = /4DC6A187;
 Reference = IC4;
-ValeurCmp = QS3244;
-IdModule  = SSOP20;
+ValeurCmp = CB3Q3244;
+IdModule  = SSOP20_BDQ;
 EndCmp
 
 BeginCmp
diff --git a/hardware/kicad/SIMtrace.net b/hardware/kicad/SIMtrace.net
index 6b5ea4b..d8d5b91 100644
--- a/hardware/kicad/SIMtrace.net
+++ b/hardware/kicad/SIMtrace.net
@@ -1,4 +1,4 @@
-# EESchema Netlist Version 1.1 created  Mo 20 Jun 2011 12:54:15 CEST
+# EESchema Netlist Version 1.1 created  Mo 20 Jun 2011 16:53:08 CEST
 (
  ( /4DC804A6 PIN_ARRAY_2X1 BT1 4.5-6V
   ( 1 N-000019 )
@@ -190,7 +190,7 @@
   ( 63 N-000033 )
   ( 64 +1.8V )
  )
- ( /4DC6A187 SSOP20 IC4 QS3244
+ ( /4DC6A187 SSOP20_BDQ IC4 CB3Q3244
   ( 1 /SC_SW )
   ( 2 /VCC_PHONE )
   ( 4 /RST_PHONE )
diff --git a/hardware/kicad/SIMtrace.pro b/hardware/kicad/SIMtrace.pro
index e5a3d94..f9867a0 100644
--- a/hardware/kicad/SIMtrace.pro
+++ b/hardware/kicad/SIMtrace.pro
@@ -1,4 +1,4 @@
-update=Mo 20 Jun 2011 13:28:37 CEST
+update=Mo 20 Jun 2011 17:22:43 CEST
 last_client=pcbnew
 [general]
 version=1
@@ -79,8 +79,8 @@ EquName1=devcms
 [pcbnew]
 version=1
 PadDrlX=0
-PadDimH=984
-PadDimV=866
+PadDimH=160
+PadDimV=748
 BoardThickness=630
 SgPcb45=1
 TxtPcbV=800
diff --git a/hardware/kicad/SIMtrace.sch b/hardware/kicad/SIMtrace.sch
index 7a178a4..3a9e68c 100644
--- a/hardware/kicad/SIMtrace.sch
+++ b/hardware/kicad/SIMtrace.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date So 19 Jun 2011 14:34:17 CEST
+EESchema Schematic File Version 2  date Mo 20 Jun 2011 17:09:56 CEST
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -38,8 +38,8 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "SIMtrace hardware"
-Date "19 jun 2011"
-Rev "0.9.7"
+Date "20 jun 2011"
+Rev "0.9.8"
 Comp "osmocom"
 Comment1 "CC-BY-SA"
 Comment2 ""
@@ -1163,47 +1163,47 @@ L QS3244 IC4
 U 9 1 4DC6A187
 P 9200 6650
 F 0 "IC4" V 9200 6650 60  0000 C CNN
-F 1 "QS3244" V 9400 6650 60  0000 C CNN
+F 1 "CB3Q3244" V 9400 6650 60  0000 C CNN
 F 2 "SSOP20" H 9200 6650 60  0001 C CNN
 	9    9200 6650
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC4
+L CB3Q3244 IC4
 U 5 1 4DC6A15F
 P 8450 6450
 F 0 "IC4" V 8600 6450 60  0000 C CNN
-F 1 "QS3244" H 8250 6300 60  0000 C CNN
+F 1 "CB3Q3244" H 8250 6300 60  0000 C CNN
 F 2 "SSOP20" H 8450 6450 60  0001 C CNN
 	5    8450 6450
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC4
+L CB3Q3244 IC4
 U 3 1 4DC6A152
 P 8850 6350
 F 0 "IC4" V 9000 6350 60  0000 C CNN
-F 1 "QS3244" H 8650 6200 60  0000 C CNN
+F 1 "CB3Q3244" H 8650 6200 60  0000 C CNN
 F 2 "SSOP20" H 8850 6350 60  0001 C CNN
 	3    8850 6350
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC4
+L CB3Q3244 IC4
 U 2 1 4DC6A149
 P 9250 6250
 F 0 "IC4" V 9400 6250 60  0000 C CNN
-F 1 "QS3244" H 9050 6100 60  0000 C CNN
+F 1 "CB3Q3244" H 9050 6100 60  0000 C CNN
 F 2 "SSOP20" H 9250 6250 60  0001 C CNN
 	2    9250 6250
 	0    1    1    0   
 $EndComp
 $Comp
-L QS3244 IC4
+L CB3Q3244 IC4
 U 1 1 4DC6A134
 P 9650 6150
 F 0 "IC4" V 9800 6150 60  0000 C CNN
-F 1 "QS3244" H 9450 6000 60  0000 C CNN
+F 1 "CB3Q3244" H 9450 6000 60  0000 C CNN
 F 2 "SSOP20" H 9650 6150 60  0001 C CNN
 	1    9650 6150
 	0    1    1    0   
diff --git a/hardware/kicad/lib/SIMtrace.bck b/hardware/kicad/lib/SIMtrace.bck
index fbbba56..b4efb33 100644
--- a/hardware/kicad/lib/SIMtrace.bck
+++ b/hardware/kicad/lib/SIMtrace.bck
@@ -1,4 +1,4 @@
-EESchema-DOCLIB  Version 2.0  Date: Tue 14 Jun 2011 11:30:58 PM CEST
+EESchema-DOCLIB  Version 2.0  Date: Mi 15 Jun 2011 17:08:11 CEST
 #
 $CMP BC847
 F transistors/bipolar/*.*
diff --git a/hardware/kicad/lib/SIMtrace.dcm b/hardware/kicad/lib/SIMtrace.dcm
index b4efb33..7dbc079 100644
--- a/hardware/kicad/lib/SIMtrace.dcm
+++ b/hardware/kicad/lib/SIMtrace.dcm
@@ -1,9 +1,13 @@
-EESchema-DOCLIB  Version 2.0  Date: Mi 15 Jun 2011 17:08:11 CEST
+EESchema-DOCLIB  Version 2.0  Date: Mo 20 Jun 2011 16:40:22 CEST
 #
 $CMP BC847
 F transistors/bipolar/*.*
 $ENDCMP
 #
+$CMP CB3Q3244
+D SN74CB3Q3244
+$ENDCMP
+#
 $CMP JTAG
 D symbole general de connecteur
 K CONN
diff --git a/hardware/kicad/lib/SIMtrace.lib b/hardware/kicad/lib/SIMtrace.lib
index c93dc1e..ab5ae77 100644
--- a/hardware/kicad/lib/SIMtrace.lib
+++ b/hardware/kicad/lib/SIMtrace.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mi 15 Jun 2011 17:08:11 CEST
+EESchema-LIBRARY Version 2.3  Date: Mo 20 Jun 2011 16:40:22 CEST
 #
 # BC847
 #
@@ -18,6 +18,105 @@ X C 3 100 200 100 D 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CB3Q3244
+#
+DEF CB3Q3244 IC 0 0 Y Y 9 L N
+F0 "IC" -150 200 60 H V C CNN
+F1 "CB3Q3244" -300 -150 60 H V C CNN
+DRAW
+C -85 0 10 1 1 0 N
+P 3 1 1 0  -200 0  -250 0  -250 0 N
+P 3 1 1 0  0 0  -75 0  -75 0 N
+P 3 1 1 0  0 50  0 -50  0 -50 N
+P 3 1 1 0  25 50  25 -50  25 -50 N
+P 4 1 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 1 1 0  25 25  100 25  100 100  100 100 N
+P 5 1 1 0  -200 50  -100 0  -200 -50  -200 50  -200 50 N
+X /1OE 1 -400 0 150 R 60 60 1 1 I
+X 1A1 2 100 250 150 D 60 60 1 1 B
+X 1B1 18 100 -250 150 U 60 60 1 1 B
+C -85 0 10 2 1 0 N
+P 3 2 1 0  -200 0  -250 0  -250 0 N
+P 3 2 1 0  0 0  -75 0  -75 0 N
+P 3 2 1 0  0 50  0 -50  0 -50 N
+P 3 2 1 0  25 50  25 -50  25 -50 N
+P 4 2 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 2 1 0  25 25  100 25  100 100  100 100 N
+P 5 2 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X /1OE 1 -400 0 150 R 60 60 2 1 I
+X 1A2 4 100 250 150 D 60 60 2 1 B
+X 1B2 16 100 -250 150 U 60 60 2 1 B
+C -85 0 10 3 1 0 N
+P 3 3 1 0  -200 0  -250 0  -250 0 N
+P 3 3 1 0  0 0  -75 0  -75 0 N
+P 3 3 1 0  0 50  0 -50  0 -50 N
+P 3 3 1 0  25 50  25 -50  25 -50 N
+P 4 3 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 3 1 0  25 25  100 25  100 100  100 100 N
+P 5 3 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X /1OE 1 -400 0 150 R 60 60 3 1 I
+X 1A3 6 100 250 150 D 60 60 3 1 B
+X 1B3 14 100 -250 150 U 60 60 3 1 B
+C -85 0 10 4 1 0 N
+P 3 4 1 0  -200 0  -250 0  -250 0 N
+P 3 4 1 0  0 0  -75 0  -75 0 N
+P 3 4 1 0  0 50  0 -50  0 -50 N
+P 3 4 1 0  25 50  25 -50  25 -50 N
+P 4 4 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 4 1 0  25 25  100 25  100 100  100 100 N
+P 5 4 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X /1OE 1 -400 0 150 R 60 60 4 1 I
+X 1A4 8 100 250 150 D 60 60 4 1 B
+X 1B4 12 100 -250 150 U 60 60 4 1 B
+C -85 0 10 5 1 0 N
+P 3 5 1 0  -250 0  -200 0  -200 0 N
+P 3 5 1 0  0 0  -75 0  -75 0 N
+P 3 5 1 0  0 50  0 -50  0 -50 N
+P 3 5 1 0  25 50  25 -50  25 -50 N
+P 4 5 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 5 1 0  25 25  100 25  100 100  100 100 N
+P 5 5 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X 2B1 9 100 -250 150 U 60 60 5 1 B
+X 2A1 11 100 250 150 D 60 60 5 1 B
+X /2OE 19 -400 0 150 R 60 60 5 1 I
+C -85 0 10 6 1 0 N
+P 3 6 1 0  0 0  -75 0  -75 0 N
+P 3 6 1 0  0 50  0 -50  0 -50 N
+P 3 6 1 0  25 50  25 -50  25 -50 N
+P 4 6 1 0  -200 0  -250 0  -250 0  -250 0 N
+P 4 6 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 6 1 0  25 25  100 25  100 100  100 100 N
+P 5 6 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X 2B2 7 100 -250 150 U 60 60 6 1 B
+X 2A2 13 100 250 150 D 60 60 6 1 B
+X /2OE 19 -400 0 150 R 60 60 6 1 I
+C -85 0 10 7 1 0 N
+P 3 7 1 0  -200 0  -250 0  -250 0 N
+P 3 7 1 0  0 0  -75 0  -75 0 N
+P 3 7 1 0  0 50  0 -50  0 -50 N
+P 3 7 1 0  25 50  25 -50  25 -50 N
+P 4 7 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 7 1 0  25 25  100 25  100 100  100 100 N
+P 5 7 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X 2B3 5 100 -250 150 U 60 60 7 1 B
+X 2A3 15 100 250 150 D 60 60 7 1 B
+X /2OE 19 -400 0 150 R 60 60 7 1 I
+C -85 0 10 8 1 0 N
+P 3 8 1 0  -200 0  -250 0  -250 0 N
+P 3 8 1 0  0 0  -75 0  -75 0 N
+P 3 8 1 0  0 50  0 -50  0 -50 N
+P 3 8 1 0  25 50  25 -50  25 -50 N
+P 4 8 1 0  25 -25  100 -25  100 -100  100 -100 N
+P 4 8 1 0  25 25  100 25  100 100  100 100 N
+P 5 8 1 0  -200 50  -200 -50  -100 0  -200 50  -200 50 N
+X 2B4 3 100 -250 150 U 60 60 8 1 B
+X 2A4 17 100 250 150 D 60 60 8 1 B
+X /2OE 19 -400 0 150 R 60 60 8 1 I
+X GND 10 100 -250 150 U 60 60 9 1 W
+X VCC 20 100 250 150 D 60 60 9 1 W
+ENDDRAW
+ENDDEF
+#
 # DEBUG
 #
 DEF DEBUG P 0 30 Y Y 1 F N
diff --git a/hardware/kicad/lib/SIMtrace.mdc b/hardware/kicad/lib/SIMtrace.mdc
index 5a1e3b7..9073c19 100644
--- a/hardware/kicad/lib/SIMtrace.mdc
+++ b/hardware/kicad/lib/SIMtrace.mdc
@@ -1,4 +1,4 @@
-PCBNEW-LibDoc----V1  Mo 20 Jun 2011 13:12:41 CEST
+PCBNEW-LibDoc----V1  Mo 20 Jun 2011 16:31:41 CEST
 #
 $MODULE pin_array_10x2
 Li pin_array_10x2
@@ -11,4 +11,10 @@ Li USB-MINI-B_UX60
 Cd Hirose UX60-MB-5ST
 $EndMODULE
 #
+$MODULE SSOP20_BDQ
+Li SSOP20_BDQ
+Cd SSOP 20 pins
+Kw CMS SSOP SMD
+$EndMODULE
+#
 $EndLIBDOC
diff --git a/hardware/kicad/lib/SIMtrace.mod b/hardware/kicad/lib/SIMtrace.mod
index ba596db..be24479 100644
--- a/hardware/kicad/lib/SIMtrace.mod
+++ b/hardware/kicad/lib/SIMtrace.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Mo 20 Jun 2011 13:12:41 CEST
+PCBNEW-LibModule-V1  Mo 20 Jun 2011 16:31:41 CEST
 $INDEX
 CAP_AVE_E
 SC_ID0
@@ -13,6 +13,7 @@ PUSH_BUTTON
 SOIC8
 SOT23_BC847
 USB-MINI-B_UX60
+SSOP20_BDQ
 $EndINDEX
 $MODULE CAP_AVE_E
 Po 0 0 0 15 4CFCEE9A 00000000 ~~
@@ -830,7 +831,7 @@ Po 0 0 0 15 4DFF2B1C 00000000 ~~
 Li USB-MINI-B_UX60
 Cd Hirose UX60-MB-5ST
 Sc 00000000
-AR 
+AR
 Op 0 0 0
 T0 0 3228 600 600 0 120 N V 21 N"USB-MINI-B_UX60"
 T1 0 -1969 600 600 0 120 N V 21 N"VAL**"
@@ -923,4 +924,170 @@ Ne 0 ""
 Po 1654 1299
 $EndPAD
 $EndMODULE  USB-MINI-B_UX60
+$MODULE SSOP20_BDQ
+Po 0 0 0 15 4DFF59C4 00000000 ~~
+Li SSOP20_BDQ
+Cd SSOP 20 pins
+Kw CMS SSOP SMD
+Sc 00000000
+AR 
+Op 0 0 0
+At SMD 
+T0 0 -250 300 300 0 50 N V 21 N"SSOP20_DBQ"
+T1 0 250 300 300 0 50 N V 21 N"Val**"
+DS 1500 -700 -1500 -700 65 21
+DS -1500 700 1500 700 65 21
+DS 1500 -700 1500 700 65 21
+DS -1500 700 -1500 -700 60 21
+DC -1300 500 -1400 400 50 21
+DS -1500 -250 -1200 -250 50 21
+DS -1200 -250 -1200 250 50 21
+DS -1200 250 -1500 250 50 21
+$PAD
+Sh "1" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -1150 1050
+$EndPAD
+$PAD
+Sh "2" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -900 1050
+$EndPAD
+$PAD
+Sh "3" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -640 1050
+$EndPAD
+$PAD
+Sh "4" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -380 1050
+$EndPAD
+$PAD
+Sh "5" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -130 1050
+$EndPAD
+$PAD
+Sh "6" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 130 1050
+$EndPAD
+$PAD
+Sh "7" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 390 1050
+$EndPAD
+$PAD
+Sh "8" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 640 1050
+$EndPAD
+$PAD
+Sh "9" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 900 1050
+$EndPAD
+$PAD
+Sh "10" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1150 1050
+$EndPAD
+$PAD
+Sh "11" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1150 -1050
+$EndPAD
+$PAD
+Sh "12" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 900 -1050
+$EndPAD
+$PAD
+Sh "13" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 640 -1050
+$EndPAD
+$PAD
+Sh "14" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 390 -1050
+$EndPAD
+$PAD
+Sh "15" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 130 -1050
+$EndPAD
+$PAD
+Sh "16" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -130 -1050
+$EndPAD
+$PAD
+Sh "17" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -380 -1050
+$EndPAD
+$PAD
+Sh "18" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -640 -1050
+$EndPAD
+$PAD
+Sh "19" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -900 -1050
+$EndPAD
+$PAD
+Sh "20" R 160 748 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -1150 -1050
+$EndPAD
+$SHAPE3D
+Na "smd/cms_so20.wrl"
+Sc 0.255000 0.330000 0.300000
+Of 0.000000 0.000000 0.000000
+Ro 0.000000 0.000000 0.000000
+$EndSHAPE3D
+$EndMODULE  SSOP20_BDQ
 $EndLIBRARY
diff --git a/hardware/kicad/lib/smartcard.bak b/hardware/kicad/lib/smartcard.bak
index 57f2d18..3f49cc5 100644
--- a/hardware/kicad/lib/smartcard.bak
+++ b/hardware/kicad/lib/smartcard.bak
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Mo 20 Jun 2011 15:28:40 CEST
+PCBNEW-LibModule-V1  Mo 20 Jun 2011 15:32:10 CEST
 $INDEX
 smartcard-CARDSOCKET
 SIM_AMPHENOL
@@ -112,7 +112,7 @@ Po -10000 1000
 $EndPAD
 $EndMODULE CARDSOCKET
 $MODULE SIM_AMPHENOL
-Po 0 0 0 15 4DFF4B03 00000000 ~~
+Po 0 0 0 15 4DFF4BD6 00000000 ~~
 Li SIM_AMPHENOL
 Sc 00000000
 AR 
@@ -203,63 +203,63 @@ $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 9193 0
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 9193 2000
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 9193 1000
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 9193 -1000
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 6193 -1000
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 6193 0
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 6193 1000
 $EndPAD
 $PAD
 Sh "" R 1181 472 0 0 0
 Dr 0 0 0
-At SMD N 0C000000
+At SMD N 00008000
 Ne 0 ""
 Po 6193 2000
 $EndPAD
 $PAD
 Sh "" R 4331 1732 0 0 0
 Dr 0 0 0
-At SMD N 00800000
+At SMD N 00008000
 Ne 0 ""
 Po 2291 2547
 $EndPAD
diff --git a/hardware/kicad/lib/smartcard.mdc b/hardware/kicad/lib/smartcard.mdc
index 2b26c7a..e3c9205 100644
--- a/hardware/kicad/lib/smartcard.mdc
+++ b/hardware/kicad/lib/smartcard.mdc
@@ -1,4 +1,4 @@
-PCBNEW-LibDoc----V1  Mo 20 Jun 2011 15:32:10 CEST
+PCBNEW-LibDoc----V1  Mo 20 Jun 2011 16:27:09 CEST
 #
 $MODULE smartcard-CARDSOCKET
 Li smartcard-CARDSOCKET
diff --git a/hardware/kicad/lib/smartcard.mod b/hardware/kicad/lib/smartcard.mod
index 3f49cc5..ce8668a 100644
--- a/hardware/kicad/lib/smartcard.mod
+++ b/hardware/kicad/lib/smartcard.mod
@@ -1,4 +1,4 @@
-PCBNEW-LibModule-V1  Mo 20 Jun 2011 15:32:10 CEST
+PCBNEW-LibModule-V1  Mo 20 Jun 2011 16:27:09 CEST
 $INDEX
 smartcard-CARDSOCKET
 SIM_AMPHENOL
diff --git a/hardware/pcb/bom/BOM.ods b/hardware/pcb/bom/BOM.ods
index 0d77746..4009a72 100644
Binary files a/hardware/pcb/bom/BOM.ods and b/hardware/pcb/bom/BOM.ods differ