diff --git a/components/atmega48-mmu.lib b/components/atmega48-mmu.lib
index dcb195a..f1f0583 100644
--- a/components/atmega48-mmu.lib
+++ b/components/atmega48-mmu.lib
@@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: Mon Jan 31 15:41:03 2011
+EESchema-LIBRARY Version 2.3  Date: Mon Jan 31 20:22:23 2011
 #
 # ATmega48-MMU
 #
@@ -24,14 +24,14 @@ X PB9/PCINT0/CLKO/ICP1 10 -150 -1400 300 U 50 50 1 1 T
 X PC1/ADC1/PCINT9 20 1700 300 300 L 50 50 1 1 T
 X PB1/PCINT1/OC1A 11 0 -1400 300 U 50 50 1 1 T
 X PC2/ADC2/PCINT10 21 1700 450 300 L 50 50 1 1 T
-X PB2/PCINT2/OC1B 12 150 -1400 300 U 50 50 1 1 T
+X PB2/PCINT2/nSS/OC1B 12 150 -1400 300 U 50 50 1 1 T
 X PC3/ADC3/PCINT11 22 450 1400 300 D 50 50 1 1 T
 X PB3/PCINT3/OC2A/MOSI 13 300 -1400 300 U 50 50 1 1 T
 X PC4/ADC4/SDA/PCINT12 23 300 1400 300 D 50 50 1 1 T
 X PB4/PCINT4/MISO 14 450 -1400 300 U 50 50 1 1 T
 X PC5/ADC5/SCL/PCINT13 24 150 1400 300 D 50 50 1 1 T
 X PB5/SCK/PCINT5 15 1700 -450 300 L 50 50 1 1 T
-X PC6/RESET/PCINT14 25 0 1400 300 D 50 50 1 1 T
+X PC6/nRESET/PCINT14 25 0 1400 300 D 50 50 1 1 T
 X AVCC 16 1700 -300 300 L 50 50 1 1 W
 X PD0/RXD/PCINT16 26 -150 1400 300 D 50 50 1 1 T
 X AREF 17 1700 -150 300 L 50 50 1 1 W
diff --git a/uart/uart.brd b/uart/uart.brd
index 09f2fdc..daeeea5 100644
--- a/uart/uart.brd
+++ b/uart/uart.brd
@@ -1,4 +1,4 @@
-PCBNEW-BOARD Version 1 date Mon Jan 31 19:00:29 2011
+PCBNEW-BOARD Version 1 date Mon Jan 31 21:29:39 2011
 
 # Created by Pcbnew(2010-12-27 BZR 2685)-unstable
 
@@ -8,9 +8,9 @@ Ly 1FFF8001
 EnabledLayers 13E88001
 Links 24
 NoConn 0
-Di 54659 41863 64794 47524
+Di 54540 41785 64794 47524
 Ndraw 17
-Ntrack 107
+Ntrack 130
 Nzone 0
 BoardThickness 630
 Nmodule 11
@@ -20,7 +20,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet A4 11700 8267
 Title "External UART (3.3 V) as 8:10 card"
-Date "31 jan 2011"
+Date "1 feb 2011"
 Rev "20110131"
 Comp "Werner Almesberger"
 Comment1 ""
@@ -70,23 +70,23 @@ Na 1 "/CLK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 2 "/INT"
+Na 2 "/MISO"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 3 "/MISO"
+Na 3 "/MOSI"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 4 "/MOSI"
+Na 4 "/SCK"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 5 "/SCK"
+Na 5 "/nRESET"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 6 "/nRESET"
+Na 6 "/nSS"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -94,27 +94,27 @@ Na 7 "GND"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 8 "N-000005"
+Na 8 "N-000004"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 9 "N-000006"
+Na 9 "N-000005"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 10 "N-000015"
+Na 10 "N-000014"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 11 "N-000016"
+Na 11 "N-000015"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 12 "N-000017"
+Na 12 "N-000016"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 13 "N-000019"
+Na 13 "N-000018"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -126,7 +126,7 @@ Na 15 "N-000022"
 St ~
 $EndEQUIPOT
 $EQUIPOT
-Na 16 "N-000029"
+Na 16 "N-000028"
 St ~
 $EndEQUIPOT
 $EQUIPOT
@@ -144,20 +144,20 @@ uViaDia 200
 uViaDrill 50
 AddNet ""
 AddNet "/CLK"
-AddNet "/INT"
 AddNet "/MISO"
 AddNet "/MOSI"
 AddNet "/SCK"
 AddNet "/nRESET"
+AddNet "/nSS"
+AddNet "N-000004"
 AddNet "N-000005"
-AddNet "N-000006"
+AddNet "N-000014"
 AddNet "N-000015"
 AddNet "N-000016"
-AddNet "N-000017"
-AddNet "N-000019"
+AddNet "N-000018"
 AddNet "N-000021"
 AddNet "N-000022"
-AddNet "N-000029"
+AddNet "N-000028"
 $EndNCLASS
 $NCLASS
 Name "Power"
@@ -172,7 +172,7 @@ AddNet "GND"
 AddNet "VDD"
 $EndNCLASS
 $MODULE 0402
-Po 57441 44252 1800 15 4D3AED1A 4D470BA3 ~~
+Po 57323 44252 1800 15 4D3AED1A 4D470BA3 ~~
 Li 0402
 Sc 4D470BA3
 AR /4D47052C
@@ -188,19 +188,19 @@ $PAD
 Sh "1" R 197 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 9 "N-000006"
+Ne 9 "N-000005"
 Po -196 0
 $EndPAD
 $PAD
 Sh "2" R 197 236 0 0 1800
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "N-000015"
+Ne 10 "N-000014"
 Po 196 0
 $EndPAD
 $EndMODULE  0402
 $MODULE 0402
-Po 56142 44252 0 15 4D3AED1A 4D470BA5 ~~
+Po 56024 44252 0 15 4D3AED1A 4D470BA5 ~~
 Li 0402
 Sc 4D470BA5
 AR /4D47052E
@@ -216,19 +216,19 @@ $PAD
 Sh "1" R 197 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 8 "N-000005"
+Ne 8 "N-000004"
 Po -196 0
 $EndPAD
 $PAD
 Sh "2" R 197 236 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "N-000016"
+Ne 11 "N-000015"
 Po 196 0
 $EndPAD
 $EndMODULE  0402
 $MODULE 0402
-Po 55749 45590 2700 15 4D3AED1A 4D470BA7 ~~
+Po 55669 45591 2700 15 4D3AED1A 4D470BA7 ~~
 Li 0402
 Sc 4D470BA7
 AR /4D470731
@@ -279,21 +279,21 @@ $PAD
 Sh "1" R 1181 355 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 6 "/nRESET"
+Ne 5 "/nRESET"
 Po 4920 -1239
 $EndPAD
 $PAD
 Sh "2" R 1181 355 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 2 "/INT"
+Ne 3 "/MOSI"
 Po 4920 -806
 $EndPAD
 $PAD
 Sh "3" R 1181 355 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 4 "/MOSI"
+Ne 6 "/nSS"
 Po 4920 -373
 $EndPAD
 $PAD
@@ -321,19 +321,19 @@ $PAD
 Sh "7" R 1181 354 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 5 "/SCK"
+Ne 4 "/SCK"
 Po 4920 1358
 $EndPAD
 $PAD
 Sh "8" R 1181 354 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 3 "/MISO"
+Ne 2 "/MISO"
 Po 4920 1791
 $EndPAD
 $EndMODULE  8:10-card
 $MODULE PIN_ARRAY_3X1
-Po 56497 43504 0 15 4D471131 4D470BA9 ~~
+Po 56457 43504 0 15 4D471131 4D470BA9 ~~
 Li PIN_ARRAY_3X1
 Cd Connecteur 3 pins
 Kw CONN DEV
@@ -351,7 +351,7 @@ $PAD
 Sh "1" R 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 8 "N-000005"
+Ne 8 "N-000004"
 Po -1000 0
 $EndPAD
 $PAD
@@ -365,7 +365,7 @@ $PAD
 Sh "3" C 800 800 0 0 0
 Dr 400 0 0
 At STD N 00E0FFFF
-Ne 9 "N-000006"
+Ne 9 "N-000005"
 Po 1000 0
 $EndPAD
 $SHAPE3D
@@ -376,7 +376,7 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  PIN_ARRAY_3X1
 $MODULE 0402
-Po 55237 44685 900 15 4D3AED1A 4D472640 ~~
+Po 55118 44685 900 15 4D3AED1A 4D472640 ~~
 Li 0402
 Sc 4D472640
 AR /4D472610
@@ -399,12 +399,12 @@ $PAD
 Sh "2" R 197 236 0 0 900
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "N-000017"
+Ne 12 "N-000016"
 Po 196 0
 $EndPAD
 $EndMODULE  0402
 $MODULE 0603
-Po 55237 45905 2700 15 4D3AED1A 4D472641 ~~
+Po 55197 45906 2700 15 4D3AED1A 4D472641 ~~
 Li 0603
 Sc 4D472641
 AR /4D47260E
@@ -432,7 +432,7 @@ Po 295 0
 $EndPAD
 $EndMODULE  0603
 $MODULE PAD_2mm
-Po 55591 46929 0 15 4D34EABB 4D4727A5 ~~
+Po 55512 46929 0 15 4D34EABB 4D4727A5 ~~
 Li PAD_2mm
 Sc 4D4727A5
 AR /4D472716
@@ -449,7 +449,7 @@ Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
 $MODULE PAD_2mm
-Po 55591 46614 0 15 4D34EABB 4D4727A7 ~~
+Po 55472 46614 0 15 4D34EABB 4D4727A7 ~~
 Li PAD_2mm
 Sc 4D4727A7
 AR /4D472714
@@ -461,29 +461,12 @@ $PAD
 Sh "1" O 786 196 0 0 0
 Dr 0 0 0
 At SMD N 00808000
-Ne 13 "N-000019"
-Po 0 0
-$EndPAD
-$EndMODULE  PAD_2mm
-$MODULE PAD_2mm
-Po 56851 46929 0 15 4D34EABB 4D4729E4 ~~
-Li PAD_2mm
-Sc 4D4729E4
-AR /4D47292F
-Op 0 0 0
-At SMD 
-T0 0 -150 200 200 0 40 N V 25 N"P4"
-T1 0 150 200 200 0 40 N I 25 N"CONN_1"
-$PAD
-Sh "1" O 786 196 0 0 0
-Dr 0 0 0
-At SMD N 00808000
-Ne 16 "N-000029"
+Ne 13 "N-000018"
 Po 0 0
 $EndPAD
 $EndMODULE  PAD_2mm
 $MODULE QFN28-Atmel
-Po 57087 45630 0 15 4D472F2A 4D470C12 ~~
+Po 57008 45630 0 15 4D472F2A 4D470C12 ~~
 Li QFN28-Atmel
 Sc 4D470C12
 AR /4D4702FE
@@ -549,7 +532,7 @@ $PAD
 Sh "7" R 275 94 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 13 "N-000019"
+Ne 13 "N-000018"
 Po -806 531
 $EndPAD
 $PAD
@@ -563,7 +546,7 @@ $PAD
 Sh "9" R 94 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 16 "N-000029"
+Ne 16 "N-000028"
 Po -354 806
 $EndPAD
 $PAD
@@ -584,28 +567,28 @@ $PAD
 Sh "12" R 95 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 0 ""
+Ne 6 "/nSS"
 Po 176 806
 $EndPAD
 $PAD
 Sh "13" R 94 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 4 "/MOSI"
+Ne 3 "/MOSI"
 Po 354 806
 $EndPAD
 $PAD
 Sh "14" R 94 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 3 "/MISO"
+Ne 2 "/MISO"
 Po 531 806
 $EndPAD
 $PAD
 Sh "15" R 275 94 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 5 "/SCK"
+Ne 4 "/SCK"
 Po 806 531
 $EndPAD
 $PAD
@@ -647,7 +630,7 @@ $PAD
 Sh "21" R 275 94 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 2 "/INT"
+Ne 0 ""
 Po 806 -531
 $EndPAD
 $PAD
@@ -675,28 +658,28 @@ $PAD
 Sh "25" R 94 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 6 "/nRESET"
+Ne 5 "/nRESET"
 Po 0 -806
 $EndPAD
 $PAD
 Sh "26" R 95 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 10 "N-000015"
+Ne 10 "N-000014"
 Po -176 -806
 $EndPAD
 $PAD
 Sh "27" R 94 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 11 "N-000016"
+Ne 11 "N-000015"
 Po -354 -806
 $EndPAD
 $PAD
 Sh "28" R 94 275 0 0 0
 Dr 0 0 0
 At SMD N 00888000
-Ne 12 "N-000017"
+Ne 12 "N-000016"
 Po -531 -806
 $EndPAD
 $PAD
@@ -735,6 +718,47 @@ Ne 0 ""
 Po 196 -196
 $EndPAD
 $EndMODULE  QFN28-Atmel
+$MODULE PAD_2mm
+Po 56417 46929 0 15 4D34EABB 4D474F35 ~~
+Li PAD_2mm
+Sc 4D474F35
+AR /4D47292F
+Op 0 0 0
+At SMD 
+T0 0 -150 200 200 0 40 N V 25 N"P4"
+T1 0 150 200 200 0 40 N I 25 N"CONN_1"
+$PAD
+Sh "1" O 786 196 0 0 0
+Dr 0 0 0
+At SMD N 00808000
+Ne 16 "N-000028"
+Po 0 0
+$EndPAD
+$EndMODULE  PAD_2mm
+$DRAWSEGMENT
+Po 0 55039 41811 58228 41811 50
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 54646 42205 55039 41812 50
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 55118 47205 55197 47205 50
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 54646 46732 55118 47204 50
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 54646 46732 54646 42205 50
+De 28 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 58228 42874 58228 41811 50
+De 28 0 900 0 0
+$EndDRAWSEGMENT
 $TEXTPCB
 Te "110131"
 Po 59528 43425 500 500 100 0
@@ -746,38 +770,14 @@ Po 56497 42519 600 600 120 0
 De 15 1 0 Normal
 $EndTEXTPCB
 $DRAWSEGMENT
-Po 0 54725 42283 54725 46732 50
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 55119 41889 54725 42283 50
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 58229 41889 55119 41889 50
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
 Po 0 60788 42874 58229 42874 50
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $DRAWSEGMENT
-Po 0 58229 41889 58229 42874 50
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 54882 46889 54725 46732 50
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
 Po 0 55197 47203 64686 47203 50
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $DRAWSEGMENT
-Po 0 54883 46889 55197 47203 50
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
 Po 0 61103 43189 60788 42874 50
 De 28 0 900 0 0
 $EndDRAWSEGMENT
@@ -806,219 +806,265 @@ Po 0 64686 43425 64686 47204 50
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $TRACK
-Po 0 56281 45806 56045 45806 80 -1
+Po 0 56202 45806 55966 45806 80 -1
 De 15 0 1 0 800
-Po 0 55906 46102 55749 46259 80 -1
-De 0 0 1 0 0
-Po 3 55749 46259 55749 46259 300 -1
+Po 0 58504 46102 59076 45530 80 -1
+De 15 0 1 0 0
+Po 3 58346 46102 58346 46102 300 -1
 De 15 1 1 0 0
 Po 0 59076 45530 63700 45530 80 -1
 De 15 0 1 0 400
-Po 3 58504 46102 58504 46102 300 -1
-De 15 1 1 0 0
-Po 0 59076 45530 58504 46102 80 -1
+Po 0 58346 46102 58504 46102 80 -1
 De 15 0 1 0 0
-Po 0 58504 46102 55906 46102 80 -1
+Po 0 55788 46102 58346 46102 80 -1
 De 0 0 1 0 0
-Po 0 56024 45984 55749 46259 80 -1
+Po 0 55709 46181 55788 46102 80 -1
+De 0 0 1 0 0
+Po 3 55709 46181 55709 46181 300 -1
+De 15 1 1 0 0
+Po 0 55945 45945 55709 46181 80 -1
 De 15 0 1 0 0
-Po 0 56024 45827 56024 45984 80 -1
+Po 0 55945 45827 55945 45945 80 -1
 De 15 0 1 0 0
-Po 0 56045 45806 56024 45827 80 -1
+Po 0 55966 45806 55945 45827 80 -1
 De 15 0 1 0 0
-Po 0 57893 45099 57933 45099 80 -1
-De 15 0 2 0 800
-Po 0 58799 44233 63700 44233 80 -1
-De 15 0 2 0 400
-Po 0 57933 45099 58799 44233 80 -1
+Po 0 58071 46968 57952 46968 80 -1
+De 15 0 2 0 0
+Po 0 57539 46555 57539 46436 80 -1
+De 15 0 2 0 400
+Po 0 57952 46968 57539 46555 80 -1
+De 15 0 2 0 0
+Po 0 58070 46968 58071 46968 80 -1
+De 15 0 2 0 0
+Po 0 58071 46968 59174 46968 80 -1
 De 15 0 2 0 0
-Po 0 57618 46436 57618 46516 80 -1
-De 15 0 3 0 800
-Po 0 59312 46830 59174 46968 80 -1
-De 15 0 3 0 0
 Po 0 59312 46830 63700 46830 80 -1
+De 15 0 2 0 400
+Po 0 59312 46830 59174 46968 80 -1
+De 15 0 2 0 0
+Po 0 58504 46969 57560 46969 80 -1
+De 0 0 3 0 0
+Po 0 58347 44528 58782 44963 80 -1
+De 0 0 3 0 0
+Po 0 58782 44963 58782 46691 80 -1
+De 0 0 3 0 0
+Po 0 58782 46691 58504 46969 80 -1
+De 0 0 3 0 0
+Po 0 58799 44233 58641 44233 80 -1
+De 15 0 3 0 0
+Po 0 63700 44233 58799 44233 80 -1
+De 15 0 3 0 800
+Po 3 58346 44528 58346 44528 300 -1
+De 15 1 3 0 0
+Po 0 58641 44233 58346 44528 80 -1
+De 15 0 3 0 0
+Po 0 58346 44528 58347 44528 80 -1
+De 0 0 3 0 0
+Po 0 57362 46771 57362 46436 80 -1
 De 15 0 3 0 400
-Po 0 58070 46968 59174 46968 80 -1
+Po 0 57441 46850 57362 46771 80 -1
 De 15 0 3 0 0
-Po 0 57618 46516 58070 46968 80 -1
-De 15 0 3 0 0
-Po 0 57441 46436 57441 46731 80 -1
+Po 3 57441 46850 57441 46850 300 -1
+De 15 1 3 0 0
+Po 0 57560 46969 57441 46850 80 -1
+De 0 0 3 0 0
+Po 0 57814 46161 57932 46161 80 -1
 De 15 0 4 0 800
-Po 3 57599 46889 57599 46889 300 -1
-De 15 1 4 0 0
-Po 0 57599 46889 58505 46889 80 -1
-De 0 0 4 0 0
-Po 0 58505 44921 58780 45196 80 -1
-De 0 0 4 0 0
-Po 0 58780 45196 58780 46614 80 -1
-De 0 0 4 0 0
-Po 0 58780 46614 58505 46889 80 -1
-De 0 0 4 0 0
-Po 0 58759 44666 63700 44666 80 -1
-De 15 0 4 0 400
-Po 3 58504 44921 58504 44921 300 -1
-De 15 1 4 0 0
-Po 0 58759 44666 58504 44921 80 -1
-De 15 0 4 0 0
-Po 0 58504 44921 58505 44921 80 -1
-De 0 0 4 0 0
-Po 0 57441 46731 57599 46889 80 -1
-De 15 0 4 0 0
-Po 0 57893 46161 57972 46161 80 -1
-De 15 0 5 0 800
-Po 0 58997 46397 58623 46771 80 -1
-De 15 0 5 0 0
-Po 0 58623 46771 58150 46771 80 -1
-De 15 0 5 0 0
-Po 0 58150 46771 58071 46692 80 -1
-De 15 0 5 0 0
 Po 0 58997 46397 63700 46397 80 -1
+De 15 0 4 0 400
+Po 0 58997 46397 58623 46771 80 -1
+De 15 0 4 0 0
+Po 0 58149 46771 58623 46771 80 -1
+De 15 0 4 0 0
+Po 0 58031 46653 58149 46771 80 -1
+De 15 0 4 0 0
+Po 0 58031 46260 58031 46653 80 -1
+De 15 0 4 0 0
+Po 0 57932 46161 58031 46260 80 -1
+De 15 0 4 0 0
+Po 0 58759 43800 58681 43800 80 -1
+De 15 0 5 0 0
+Po 0 63700 43800 58759 43800 80 -1
+De 15 0 5 0 800
+Po 0 57008 44567 57008 44824 80 -1
 De 15 0 5 0 400
-Po 0 58071 46260 58071 46692 80 -1
+Po 0 57047 44528 57008 44567 80 -1
 De 15 0 5 0 0
-Po 0 57972 46161 58071 46260 80 -1
+Po 0 57953 44528 57047 44528 80 -1
 De 15 0 5 0 0
-Po 0 57087 44824 57087 44606 80 -1
+Po 0 58681 43800 57953 44528 80 -1
+De 15 0 5 0 0
+Po 0 58465 46772 58111 46772 80 -1
+De 0 0 6 0 0
+Po 0 58347 44921 58622 45196 80 -1
+De 0 0 6 0 0
+Po 0 58622 45196 58622 46615 80 -1
+De 0 0 6 0 0
+Po 0 58622 46615 58465 46772 80 -1
+De 0 0 6 0 0
+Po 0 58759 44666 58601 44666 80 -1
+De 15 0 6 0 0
+Po 0 63700 44666 58759 44666 80 -1
 De 15 0 6 0 800
-Po 0 58759 43800 58032 44527 80 -1
+Po 3 58346 44921 58346 44921 300 -1
+De 15 1 6 0 0
+Po 0 58601 44666 58346 44921 80 -1
 De 15 0 6 0 0
-Po 0 58759 43800 63700 43800 80 -1
+Po 0 58346 44921 58347 44921 80 -1
+De 0 0 6 0 0
+Po 0 57184 46713 57184 46436 80 -1
 De 15 0 6 0 400
-Po 0 57166 44527 58032 44527 80 -1
+Po 0 57047 46850 57184 46713 80 -1
 De 15 0 6 0 0
-Po 0 57087 44606 57166 44527 80 -1
-De 15 0 6 0 0
-Po 0 57893 45630 58189 45630 90 -1
-De 15 0 7 0 800
-Po 0 58504 45315 58504 45314 90 -1
+Po 3 57047 46850 57047 46850 300 -1
+De 15 1 6 0 0
+Po 0 57362 46535 57047 46850 80 -1
+De 0 0 6 0 0
+Po 0 57874 46535 57362 46535 80 -1
+De 0 0 6 0 0
+Po 0 58111 46772 57874 46535 80 -1
+De 0 0 6 0 0
+Po 0 58346 46496 58228 46496 90 -1
 De 0 0 7 0 0
-Po 3 58504 45315 58504 45315 300 -1
+Po 0 58504 46496 59036 45964 80 -1
+De 15 0 7 0 0
+Po 3 58346 46496 58346 46496 300 -1
 De 15 1 7 0 0
-Po 0 57835 44645 56772 44645 90 -1
-De 0 0 7 0 0
-Po 0 58504 45314 57835 44645 90 -1
-De 0 0 7 0 0
-Po 0 58189 45630 58504 45315 90 -1
-De 15 0 7 0 0
-Po 0 56281 45630 57087 45630 90 -1
-De 15 0 7 0 C00
-Po 0 57893 45630 57087 45630 90 -1
-De 15 0 7 0 C00
-Po 0 56281 45630 55987 45630 90 -1
+Po 0 63759 45964 59036 45964 95 -1
 De 15 0 7 0 800
-Po 0 55831 45786 55749 45786 90 -1
-De 15 0 7 0 400
-Po 0 55987 45630 55831 45786 90 -1
+Po 0 58346 46496 58504 46496 80 -1
 De 15 0 7 0 0
-Po 0 56772 44291 56772 43779 90 -1
-De 15 0 7 0 0
-Po 0 56772 43779 56497 43504 90 -1
-De 15 0 7 0 400
-Po 0 56772 44645 56772 44291 90 -1
-De 0 0 7 0 0
-Po 3 56772 44291 56772 44291 300 -1
-De 15 1 7 0 0
-Po 0 55749 45786 55749 45865 90 -1
-De 15 0 7 0 800
-Po 0 55414 46200 55237 46200 90 -1
-De 15 0 7 0 400
-Po 0 55749 45865 55414 46200 90 -1
-De 15 0 7 0 0
-Po 0 55552 44645 55394 44803 95 -1
-De 0 0 7 0 0
-Po 0 56772 44645 55552 44645 90 -1
-De 0 0 7 0 0
-Po 0 59036 45964 58504 46496 95 -1
-De 15 0 7 0 0
-Po 3 58504 46496 58504 46496 300 -1
-De 15 1 7 0 0
-Po 0 59036 45964 63759 45964 95 -1
-De 15 0 7 0 400
-Po 0 56181 46496 58504 46496 95 -1
-De 0 0 7 0 0
-Po 0 56063 46614 56181 46496 95 -1
-De 0 0 7 0 0
-Po 0 55591 46614 56063 46614 95 -1
+Po 0 55394 44803 55394 46417 95 -1
 De 0 0 7 0 0
 Po 0 55394 46417 55591 46614 95 -1
 De 0 0 7 0 0
-Po 0 55394 44803 55394 46417 95 -1
+Po 0 55591 46614 56063 46614 95 -1
 De 0 0 7 0 0
-Po 0 55946 44252 55946 43953 80 -1
+Po 0 56063 46614 56181 46496 95 -1
+De 0 0 7 0 0
+Po 0 55552 44645 56693 44645 90 -1
+De 0 0 7 0 0
+Po 0 55552 44645 55394 44803 95 -1
+De 0 0 7 0 0
+Po 0 56338 46339 56181 46496 90 -1
+De 0 0 7 0 0
+Po 0 58071 46339 56338 46339 90 -1
+De 0 0 7 0 0
+Po 0 58228 46496 58071 46339 90 -1
+De 0 0 7 0 0
+Po 0 57814 45630 57008 45630 90 -1
+De 15 0 7 0 C00
+Po 0 56202 45630 57008 45630 90 -1
+De 15 0 7 0 C00
+Po 0 55669 45787 55611 45787 90 -1
+De 15 0 7 0 800
+Po 0 55611 45787 55197 46201 90 -1
+De 15 0 7 0 400
+Po 0 56202 45630 55826 45630 90 -1
+De 15 0 7 0 800
+Po 0 55826 45630 55669 45787 90 -1
+De 15 0 7 0 400
+Po 0 56693 44645 56693 44252 90 -1
+De 0 0 7 0 0
+Po 0 56457 44016 56693 44252 90 -1
+De 15 0 7 0 0
+Po 3 56693 44252 56693 44252 300 -1
+De 15 1 7 0 0
+Po 0 56457 44016 56457 43504 90 -1
+De 15 0 7 0 400
+Po 0 56772 44645 57676 44645 80 -1
+De 0 0 7 0 0
+Po 0 58031 45630 58346 45315 90 -1
+De 15 0 7 0 0
+Po 3 58346 45315 58346 45315 300 -1
+De 15 1 7 0 0
+Po 0 57814 45630 58031 45630 90 -1
+De 15 0 7 0 800
+Po 0 57676 44645 58346 45315 80 -1
+De 0 0 7 0 0
+Po 0 56772 44645 56693 44645 90 -1
+De 0 0 7 0 0
+Po 0 55457 43504 55457 43881 80 -1
 De 15 0 8 0 800
-Po 0 55946 43953 55497 43504 80 -1
+Po 0 55457 43881 55828 44252 80 -1
 De 15 0 8 0 400
-Po 0 57637 44252 57637 43644 80 -1
+Po 0 57519 44252 57519 43566 80 -1
 De 15 0 9 0 800
-Po 0 57637 43644 57497 43504 80 -1
+Po 0 57519 43566 57457 43504 80 -1
 De 15 0 9 0 400
-Po 0 56911 44824 56911 44546 80 -1
+Po 0 56832 44824 56832 44506 80 -1
 De 15 0 10 0 800
-Po 0 57205 44252 57245 44252 80 -1
+Po 0 57086 44252 57127 44252 80 -1
 De 15 0 10 0 400
-Po 0 56911 44546 57205 44252 80 -1
+Po 0 56832 44506 57086 44252 80 -1
 De 15 0 10 0 0
-Po 0 56733 44824 56733 44647 80 -1
+Po 0 56654 44824 56654 44607 80 -1
 De 15 0 11 0 800
-Po 0 56733 44647 56338 44252 80 -1
+Po 0 56299 44252 56220 44252 80 -1
 De 15 0 11 0 400
-Po 0 56556 44824 56556 44745 80 -1
+Po 0 56654 44607 56299 44252 80 -1
+De 15 0 11 0 0
+Po 0 56477 44824 56477 44745 80 -1
 De 15 0 12 0 800
-Po 0 55512 44489 55237 44489 80 -1
+Po 0 55157 44528 55118 44489 80 -1
 De 15 0 12 0 400
-Po 0 55629 44606 55512 44489 80 -1
+Po 0 56260 44528 55157 44528 80 -1
 De 15 0 12 0 0
-Po 0 56417 44606 55629 44606 80 -1
+Po 0 56477 44745 56260 44528 80 -1
 De 15 0 12 0 0
-Po 0 56556 44745 56417 44606 80 -1
-De 15 0 12 0 0
-Po 0 56281 46161 56161 46161 80 -1
+Po 0 56202 46161 56122 46161 80 -1
 De 15 0 13 0 800
-Po 0 55866 46614 55591 46614 80 -1
+Po 0 55788 46614 55472 46614 80 -1
 De 15 0 13 0 400
-Po 0 56063 46417 55866 46614 80 -1
+Po 0 56024 46378 55788 46614 80 -1
 De 15 0 13 0 0
-Po 0 56063 46259 56063 46417 80 -1
+Po 0 56024 46259 56024 46378 80 -1
 De 15 0 13 0 0
-Po 0 56161 46161 56063 46259 80 -1
+Po 0 56122 46161 56024 46259 80 -1
 De 15 0 13 0 0
-Po 0 56556 46436 56556 46515 80 -1
+Po 0 56477 46436 56477 46516 80 -1
 De 15 0 14 0 800
-Po 0 56142 46929 55591 46929 80 -1
+Po 0 55788 46929 55512 46929 80 -1
 De 15 0 14 0 400
-Po 0 56556 46515 56142 46929 80 -1
+Po 0 56063 46654 55788 46929 80 -1
 De 15 0 14 0 0
-Po 0 55237 44881 55237 45610 80 -1
-De 15 0 15 0 C00
-Po 0 56733 46436 56733 46811 80 -1
+Po 0 56339 46654 56063 46654 80 -1
+De 15 0 14 0 0
+Po 0 56477 46516 56339 46654 80 -1
+De 15 0 14 0 0
+Po 0 55118 44881 55118 45532 80 -1
+De 15 0 15 0 800
+Po 0 55118 45532 55197 45611 80 -1
+De 15 0 15 0 400
+Po 0 56654 46436 56654 46692 80 -1
 De 15 0 16 0 800
-Po 0 56733 46811 56851 46929 80 -1
+Po 0 56654 46692 56417 46929 80 -1
 De 15 0 16 0 400
-Po 0 56281 45454 56005 45454 90 -1
+Po 0 55669 45395 55669 45001 90 -1
 De 15 0 17 0 800
-Po 0 55945 45394 55749 45394 90 -1
+Po 3 58346 45709 58346 45709 300 -1
+De 15 1 17 0 0
+Po 0 56457 45709 58346 45709 90 -1
+De 0 0 17 0 0
+Po 0 55709 44961 56457 45709 90 -1
+De 0 0 17 0 0
+Po 3 55709 44961 55709 44961 300 -1
+De 15 1 17 0 0
+Po 0 55669 45001 55709 44961 90 -1
+De 15 0 17 0 0
+Po 0 56202 45454 55728 45454 90 -1
+De 15 0 17 0 800
+Po 0 55728 45454 55669 45395 90 -1
 De 15 0 17 0 400
-Po 0 56005 45454 55945 45394 90 -1
+Po 0 58346 45709 58503 45709 90 -1
 De 15 0 17 0 0
-Po 0 57893 45984 58228 45984 90 -1
+Po 0 63759 45098 59114 45098 95 -1
 De 15 0 17 0 800
-Po 0 58228 45984 58504 45708 90 -1
+Po 0 58503 45709 59114 45098 90 -1
 De 15 0 17 0 0
-Po 3 58504 45708 58504 45708 300 -1
-De 15 1 17 0 0
-Po 0 55749 45394 55749 44960 95 -1
-De 15 0 17 0 800
-Po 3 55749 44960 55749 44960 300 -1
-De 15 1 17 0 0
-Po 0 55749 45157 55749 44960 95 -1
-De 0 0 17 0 0
-Po 0 56300 45708 55749 45157 95 -1
-De 0 0 17 0 0
-Po 0 56300 45708 58504 45708 95 -1
-De 0 0 17 0 0
-Po 0 59114 45098 58504 45708 95 -1
-De 15 0 17 0 0
-Po 0 59114 45098 63759 45098 95 -1
+Po 0 58071 45984 58346 45709 90 -1
+De 15 0 17 0 1
+Po 0 58071 45984 57814 45984 90 -1
 De 15 0 17 0 400
 $EndTRACK
 $ZONE
@@ -1034,11 +1080,91 @@ ZCorner 64607 47126 0
 ZCorner 64607 43504 0
 ZCorner 61300 43504 0
 ZCorner 60749 42952 0
-ZCorner 55197 42952 0
-ZCorner 54961 43189 0
-ZCorner 54961 46850 0
-ZCorner 55237 47126 1
+ZCorner 54961 42953 0
+ZCorner 54764 43150 0
+ZCorner 54764 46693 0
+ZCorner 55197 47126 1
 $POLYSCORNERS
+55190 47029 0 0
+55197 47028 0 0
+56743 47028 0 0
+56698 46919 0 0
+56698 46780 0 0
+56751 46652 0 0
+56850 46554 0 0
+56978 46501 0 0
+57056 46501 0 0
+57192 46365 0 0
+57226 46342 0 0
+56020 46342 0 0
+56005 46379 0 0
+55906 46477 0 0
+55778 46530 0 0
+55639 46530 0 0
+55511 46477 0 0
+55413 46378 0 0
+55360 46250 0 0
+55360 46111 0 0
+55413 45983 0 0
+55512 45885 0 0
+55640 45832 0 0
+55779 45832 0 0
+55851 45862 0 0
+56263 45862 0 0
+55711 45310 0 0
+55639 45310 0 0
+55511 45257 0 0
+55413 45158 0 0
+55360 45030 0 0
+55360 44891 0 0
+55413 44763 0 0
+55512 44665 0 0
+55640 44612 0 0
+55779 44612 0 0
+55907 44665 0 0
+56005 44764 0 0
+56058 44892 0 0
+56058 44963 0 0
+56354 45259 0 1
+56354 44145 0 0
+56117 44058 0 0
+56079 43953 0 0
+56456 43575 0 0
+56835 43953 0 0
+56797 44058 0 0
+56608 44135 0 0
+56354 44145 0 1
+56354 45259 0 0
+56558 45464 0 0
+58097 45464 0 0
+58149 45413 0 0
+58277 45360 0 0
+58382 45360 0 0
+58382 45295 0 0
+58356 45270 0 0
+58276 45270 0 0
+58148 45217 0 0
+58050 45118 0 0
+57997 44990 0 0
+57997 44851 0 0
+58049 44723 0 0
+57997 44597 0 0
+57997 44458 0 0
+58050 44330 0 0
+58149 44232 0 0
+58277 44179 0 0
+58416 44179 0 0
+58544 44232 0 0
+58642 44331 0 0
+58695 44459 0 0
+58695 44536 0 0
+58952 44793 0 0
+59004 44871 0 0
+59022 44963 0 0
+59022 46691 0 0
+59004 46783 0 0
+58952 46861 0 0
+58785 47028 0 0
 64511 47028 0 0
 64511 43600 0 0
 62678 43600 0 0
@@ -1052,275 +1178,216 @@ $POLYSCORNERS
 60977 43310 0 0
 60715 43049 0 0
 58229 43049 0 0
-58162 43036 0 0
-58111 43002 0 0
-57842 43002 0 0
-58005 43165 0 0
-58096 43385 0 0
-58096 43623 0 0
-58005 43843 0 0
-57836 44012 0 0
-57616 44103 0 0
-57378 44103 0 0
-57158 44012 0 0
-57006 43860 0 0
-56946 43882 0 0
-56568 43504 0 0
-56946 43126 0 0
-57006 43147 0 0
-57151 43002 0 0
-56855 43002 0 0
-56875 43055 0 0
-56496 43432 0 0
-56119 43055 0 0
-56138 43002 0 0
-56070 43002 0 0
-56088 43048 0 0
-56100 43037 0 0
-56496 43432 0 0
-56426 43504 0 0
-56096 43173 0 0
-56096 43174 0 0
-56426 43504 0 0
-56096 43834 0 0
-56096 43834 0 0
-56426 43504 0 0
-56497 43575 0 0
-56875 43953 0 0
-56837 44058 0 0
-56648 44135 0 0
-56394 44145 0 0
-56157 44058 0 0
-56119 43953 0 0
-56497 43575 0 0
-56100 43971 0 0
-56089 43960 0 0
-56065 44017 0 0
-56009 44073 0 0
-55936 44103 0 0
-55057 44103 0 0
-55011 44083 0 0
-55011 46769 0 0
-55270 47028 0 0
-57278 47028 0 0
-57250 46958 0 0
-57250 46819 0 0
-57303 46691 0 0
-57402 46593 0 0
-57530 46540 0 0
-57669 46540 0 0
-57797 46593 0 0
-57852 46649 0 0
-58405 46649 0 0
-58540 46514 0 0
-58540 46451 0 0
-58434 46451 0 0
-58306 46398 0 0
-58250 46342 0 0
-56092 46342 0 0
-56045 46457 0 0
-55946 46555 0 0
-55818 46608 0 0
-55679 46608 0 0
-55551 46555 0 0
-55453 46456 0 0
-55400 46328 0 0
-55400 46189 0 0
-55453 46061 0 0
-55552 45963 0 0
-55680 45910 0 0
-55769 45910 0 0
-55814 45880 0 0
-55906 45862 0 0
-56104 45862 0 0
-55574 45332 0 0
-55521 45252 0 0
-55514 45219 0 0
-55453 45157 0 0
-55400 45029 0 0
-55400 44890 0 0
-55453 44762 0 0
-55552 44664 0 0
-55680 44611 0 0
-55819 44611 0 0
-55947 44664 0 0
-56045 44763 0 0
-56098 44891 0 0
-56098 45030 0 0
-56061 45119 0 0
-56394 45452 0 1
-56394 44145 0 1
-56394 45452 0 0
-56402 45461 0 0
-58257 45461 0 0
-58307 45412 0 0
-58435 45359 0 0
-58540 45359 0 0
-58540 45295 0 0
-58514 45270 0 0
-58434 45270 0 0
-58306 45217 0 0
-58208 45118 0 0
-58155 44990 0 0
-58155 44851 0 0
-58208 44723 0 0
-58307 44625 0 0
-58435 44572 0 0
-58574 44572 0 0
-58702 44625 0 0
-58800 44724 0 0
-58853 44852 0 0
-58853 44929 0 0
-58947 45024 0 0
-58950 45026 0 0
-59002 45104 0 0
-59016 45177 0 0
-59020 45195 0 0
-59019 45195 0 0
-59020 45196 0 0
-59020 46614 0 0
-59019 46614 0 0
-59020 46615 0 0
-59016 46632 0 0
-59002 46706 0 0
-58950 46784 0 0
-58947 46785 0 0
-58705 47027 1 0
+58228 43048 0 0
+58228 43049 0 0
+58161 43036 0 0
+58110 43002 0 0
+57802 43002 0 0
+57965 43165 0 0
+58056 43385 0 0
+58056 43623 0 0
+57965 43843 0 0
+57796 44012 0 0
+57576 44103 0 0
+57338 44103 0 0
+57118 44012 0 0
+56966 43860 0 0
+56906 43882 0 0
+56528 43504 0 0
+56906 43126 0 0
+56966 43147 0 0
+57111 43002 0 0
+56815 43002 0 0
+56835 43055 0 0
+56456 43432 0 0
+56079 43055 0 0
+56098 43002 0 0
+56030 43002 0 0
+56048 43048 0 0
+56060 43037 0 0
+56456 43432 0 0
+56386 43504 0 0
+56056 43173 0 0
+56056 43174 0 0
+56386 43504 0 0
+56056 43834 0 0
+56056 43834 0 0
+56386 43504 0 0
+56456 43575 0 0
+56060 43971 0 0
+56049 43960 0 0
+56025 44017 0 0
+55969 44073 0 0
+55896 44103 0 0
+55017 44103 0 0
+54944 44072 0 0
+54888 44016 0 0
+54858 43943 0 0
+54858 43125 0 0
+54821 43162 0 0
+54821 46659 1 0
+58365 46532 0 0
+58382 46515 0 0
+58382 46451 0 0
+58276 46451 0 0
+58148 46398 0 0
+58092 46342 0 0
+58009 46342 0 0
+58044 46365 0 0
+58211 46532 1 0
 $endPOLYSCORNERS
 $FILLSEGMENTS
-56070 43002 56138 43002
-56855 43002 57151 43002
-57842 43002 58111 43002
-56146 43082 56146 43082
-56847 43082 57071 43082
-57922 43082 60748 43082
-56226 43162 56226 43162
-56767 43162 56910 43162
-58002 43162 60828 43162
-56164 43242 56164 43242
-56306 43242 56306 43242
-56687 43242 56830 43242
-58037 43242 60908 43242
-56244 43322 56244 43322
-56386 43322 56386 43322
-56606 43322 56750 43322
-58070 43322 60992 43322
-56324 43402 56324 43402
-56466 43402 56466 43402
-56526 43402 56670 43402
-58096 43402 61127 43402
-56404 43482 56404 43482
-56447 43482 56590 43482
-58096 43482 61207 43482
-56368 43562 56368 43562
-56484 43562 56626 43562
-58096 43562 62573 43562
-56288 43642 56288 43642
-56429 43642 56430 43642
-56564 43642 56706 43642
-58088 43642 64511 43642
-56208 43722 56208 43722
-56349 43722 56350 43722
-56644 43722 56786 43722
-58055 43722 64511 43722
-56128 43802 56128 43802
-56269 43802 56270 43802
-56724 43802 56866 43802
-58021 43802 64511 43802
-56189 43882 56190 43882
-56804 43882 57028 43882
-57966 43882 64511 43882
-56088 43962 56091 43962
-56109 43962 56122 43962
-56871 43962 57108 43962
-57886 43962 64511 43962
-56040 44042 56151 44042
-56842 44042 57230 44042
-57763 44042 64511 44042
-55011 44122 56331 44122
-56679 44122 64511 44122
-55011 44202 64511 44202
-55011 44282 64511 44282
-55011 44362 64511 44362
-55011 44442 64511 44442
-55011 44522 64511 44522
-55011 44602 58363 44602
-58647 44602 64511 44602
-55011 44682 55534 44682
-55965 44682 58250 44682
-58759 44682 64511 44682
-55011 44762 55453 44762
-56045 44762 58192 44762
-58816 44762 64511 44762
-55011 44842 55420 44842
-56078 44842 58159 44842
-58849 44842 64511 44842
-55011 44922 55400 44922
-56098 44922 58155 44922
-58853 44922 64511 44922
-55011 45002 55400 45002
-56098 45002 58159 45002
-58926 45002 64511 45002
-55011 45082 55421 45082
-56076 45082 58193 45082
-58988 45082 64511 45082
-55011 45162 55457 45162
-56104 45162 58251 45162
-59014 45162 64511 45162
-55011 45242 55518 45242
-56184 45242 58366 45242
-59020 45242 64511 45242
-55011 45322 55567 45322
-56264 45322 58540 45322
-59020 45322 64511 45322
-55011 45402 55644 45402
-56344 45402 58332 45402
-59020 45402 64511 45402
-55011 45482 55724 45482
-59020 45482 64511 45482
-55011 45562 55804 45562
-59020 45562 64511 45562
-55011 45642 55884 45642
-59020 45642 64511 45642
-55011 45722 55964 45722
-59020 45722 64511 45722
-55011 45802 56044 45802
-59020 45802 64511 45802
-55011 45882 55811 45882
-59020 45882 64511 45882
-55011 45962 55555 45962
-59020 45962 64511 45962
-55011 46042 55473 46042
-59020 46042 64511 46042
-55011 46122 55428 46122
-59020 46122 64511 46122
-55011 46202 55400 46202
-59020 46202 64511 46202
-55011 46282 55400 46282
-59020 46282 64511 46282
-55011 46362 55414 46362
-56083 46362 58270 46362
-59020 46362 64511 46362
-55011 46442 55447 46442
-56051 46442 58412 46442
-59020 46442 64511 46442
-55011 46522 55518 46522
-55979 46522 58532 46522
-59020 46522 64511 46522
-55011 46602 55664 46602
-55832 46602 57393 46602
-57806 46602 58452 46602
-59020 46602 64511 46602
-55011 46682 57313 46682
-59006 46682 64511 46682
-55011 46762 57274 46762
-58964 46762 64511 46762
-55084 46842 57250 46842
-58890 46842 64511 46842
-55164 46922 57250 46922
-58810 46922 64511 46922
-55244 47002 57267 47002
-58730 47002 64511 47002
+56030 43002 56098 43002
+56815 43002 57111 43002
+57802 43002 58110 43002
+56106 43082 56106 43082
+56807 43082 57031 43082
+57882 43082 60748 43082
+54821 43162 54858 43162
+56186 43162 56186 43162
+56727 43162 56870 43162
+57962 43162 60828 43162
+54821 43242 54858 43242
+56124 43242 56124 43242
+56266 43242 56266 43242
+56647 43242 56790 43242
+57997 43242 60908 43242
+54821 43322 54858 43322
+56204 43322 56204 43322
+56346 43322 56346 43322
+56566 43322 56710 43322
+58030 43322 60992 43322
+54821 43402 54858 43402
+56284 43402 56284 43402
+56426 43402 56426 43402
+56486 43402 56630 43402
+58056 43402 61127 43402
+54821 43482 54858 43482
+56364 43482 56364 43482
+56407 43482 56550 43482
+58056 43482 61207 43482
+54821 43562 54858 43562
+56328 43562 56328 43562
+56444 43562 56586 43562
+58056 43562 62573 43562
+54821 43642 54858 43642
+56248 43642 56248 43642
+56389 43642 56390 43642
+56524 43642 56666 43642
+58048 43642 64511 43642
+54821 43722 54858 43722
+56168 43722 56168 43722
+56309 43722 56310 43722
+56604 43722 56746 43722
+58015 43722 64511 43722
+54821 43802 54858 43802
+56088 43802 56088 43802
+56229 43802 56230 43802
+56684 43802 56826 43802
+57981 43802 64511 43802
+54821 43882 54858 43882
+56149 43882 56150 43882
+56764 43882 56988 43882
+57926 43882 64511 43882
+54821 43962 54865 43962
+56048 43962 56051 43962
+56069 43962 56082 43962
+56831 43962 57068 43962
+57846 43962 64511 43962
+54821 44042 54914 44042
+56000 44042 56111 44042
+56802 44042 57190 44042
+57723 44042 64511 44042
+54821 44122 56291 44122
+56639 44122 64511 44122
+54821 44202 58222 44202
+58472 44202 64511 44202
+54821 44282 58099 44282
+58594 44282 64511 44282
+54821 44362 58037 44362
+58655 44362 64511 44362
+54821 44442 58004 44442
+58688 44442 64511 44442
+54821 44522 57997 44522
+58695 44522 64511 44522
+54821 44602 57999 44602
+58761 44602 64511 44602
+54821 44682 55495 44682
+55924 44682 58032 44682
+58841 44682 64511 44682
+54821 44762 55415 44762
+56004 44762 58034 44762
+58921 44762 64511 44762
+54821 44842 55381 44842
+56038 44842 58001 44842
+58985 44842 64511 44842
+54821 44922 55360 44922
+56058 44922 57997 44922
+59014 44922 64511 44922
+54821 45002 55360 45002
+56097 45002 58001 45002
+59022 45002 64511 45002
+54821 45082 55381 45082
+56177 45082 58035 45082
+59022 45082 64511 45082
+54821 45162 55416 45162
+56257 45162 58093 45162
+59022 45162 64511 45162
+54821 45242 55496 45242
+56337 45242 58208 45242
+59022 45242 64511 45242
+54821 45322 55723 45322
+56417 45322 58382 45322
+59022 45322 64511 45322
+54821 45402 55803 45402
+56497 45402 58176 45402
+59022 45402 64511 45402
+54821 45482 55883 45482
+59022 45482 64511 45482
+54821 45562 55963 45562
+59022 45562 64511 45562
+54821 45642 56043 45642
+59022 45642 64511 45642
+54821 45722 56123 45722
+59022 45722 64511 45722
+54821 45802 56203 45802
+59022 45802 64511 45802
+54821 45882 55520 45882
+59022 45882 64511 45882
+54821 45962 55435 45962
+59022 45962 64511 45962
+54821 46042 55389 46042
+59022 46042 64511 46042
+54821 46122 55360 46122
+59022 46122 64511 46122
+54821 46202 55360 46202
+59022 46202 64511 46202
+54821 46282 55373 46282
+59022 46282 64511 46282
+54821 46362 55406 46362
+56011 46362 57197 46362
+59022 46362 64511 46362
+54821 46442 55476 46442
+55941 46442 57115 46442
+59022 46442 64511 46442
+54821 46522 55619 46522
+55797 46522 56928 46522
+59022 46522 64511 46522
+54821 46602 56802 46602
+59022 46602 64511 46602
+54844 46682 56739 46682
+59022 46682 64511 46682
+54924 46762 56706 46762
+59008 46762 64511 46762
+55004 46842 56698 46842
+58964 46842 64511 46842
+55084 46922 56699 46922
+58891 46922 64511 46922
+55164 47002 56732 47002
+58811 47002 64511 47002
+58009 46342 58092 46342
+58101 46422 58205 46422
+58181 46502 58382 46502
 $endFILLSEGMENTS
 $endCZONE_OUTLINE
 $EndBOARD
diff --git a/uart/uart.sch b/uart/uart.sch
index 4db4f5e..f18f5d3 100644
--- a/uart/uart.sch
+++ b/uart/uart.sch
@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date Mon Jan 31 18:30:09 2011
+EESchema Schematic File Version 2  date Mon Jan 31 21:29:45 2011
 LIBS:power
 LIBS:device
 LIBS:conn
@@ -10,7 +10,7 @@ EELAYER END
 $Descr A4 11700 8267
 Sheet 1 1
 Title "External UART (3.3 V) as 8:10 card"
-Date "31 jan 2011"
+Date "1 feb 2011"
 Rev "20110131"
 Comp "Werner Almesberger"
 Comment1 ""
@@ -18,6 +18,10 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+	4950 4550 4950 5350
+Wire Wire Line
+	4950 5350 8050 5350
 Wire Wire Line
 	3100 3600 2700 3600
 Wire Wire Line
@@ -30,8 +34,6 @@ Wire Wire Line
 	4350 4750 4350 4550
 Wire Wire Line
 	3450 1550 3650 1550
-Wire Wire Line
-	8050 5350 5100 5350
 Wire Wire Line
 	5250 4550 5250 5850
 Wire Wire Line
@@ -98,14 +100,6 @@ Wire Wire Line
 	8050 5750 6700 5750
 Wire Wire Line
 	6700 5750 6700 3600
-Wire Wire Line
-	5100 5350 5100 4550
-Wire Wire Line
-	8050 5250 7050 5250
-Wire Wire Line
-	7050 5250 7050 2700
-Wire Wire Line
-	7050 2700 6500 2700
 Wire Wire Line
 	2850 1750 2850 1550
 Wire Wire Line
@@ -118,6 +112,13 @@ Wire Wire Line
 	2400 4950 4500 4950
 Wire Wire Line
 	4500 4950 4500 4550
+Wire Wire Line
+	8050 5250 5100 5250
+Wire Wire Line
+	5100 5250 5100 4550
+Text Label 7550 5350 0    60   ~ 0
+nSS
+NoConn ~ 6500 2700
 $Comp
 L CONN_1 P4
 U 1 1 4D47292F
@@ -177,8 +178,6 @@ F 2 "0603" H 3250 1550 60  0001 C CNN
 	1    3250 1550
 	-1   0    0    -1  
 $EndComp
-Text Label 7550 5250 0    60   ~ 0
-INT
 Text Label 7550 5550 0    60   ~ 0
 CLK
 Text Label 7550 5150 0    60   ~ 0
@@ -187,7 +186,7 @@ Text Label 7550 5750 0    60   ~ 0
 SCK
 Text Label 7550 5850 0    60   ~ 0
 MISO
-Text Label 7550 5350 0    60   ~ 0
+Text Label 7550 5250 0    60   ~ 0
 MOSI
 Text Label 5000 850  0    60   ~ 0
 nRESET
@@ -252,7 +251,6 @@ F 1 "GND" H 7250 5980 30  0001 C CNN
 	1    7250 6050
 	1    0    0    -1  
 $EndComp
-NoConn ~ 4950 4550
 NoConn ~ 4800 4550
 NoConn ~ 4650 4550
 NoConn ~ 3100 2850