diff --git a/65xx.dcm b/65xx.dcm
index da7e057..b892d47 100644
--- a/65xx.dcm
+++ b/65xx.dcm
@@ -1,20 +1,20 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP W65C02S6TPG-14
+$CMP W65C02SxxPLx-xx
+D W65C02S 8-bit CMOS General Purpose Microprocessor, PLCC-44
+K 6502 CPU uP
+F http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf
+$ENDCMP
+#
+$CMP W65C02SxxPx-xx
 D W65C02S 8-bit CMOS General Purpose Microprocessor, DIP-40
 K 6502 CPU uP
 F http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf
 $ENDCMP
 #
-$CMP W65C02S6TPLG-14
-D W65C02S 8-bit CMOS Microprocessor, 44-pin PLCC
-K MPRO 8-bit 65C02
-F http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf
-$ENDCMP
-#
-$CMP W65C02S6TQG-14
-D W65C02S 8-bit CMOS Microprocessor, 44-pin LQFP
-K MPRO 8-bit 65C02
+$CMP W65C02SxxQx-xx
+D W65C02S 8-bit CMOS General Purpose Microprocessor, PQFP-44
+K 6502 CPU uP
 F http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf
 $ENDCMP
 #
diff --git a/65xx.lib b/65xx.lib
index 8a846db..82125dc 100644
--- a/65xx.lib
+++ b/65xx.lib
@@ -1,212 +1,176 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# W65C02S6TPG-14
-#
-DEF W65C02S6TPG-14 U 0 40 Y Y 1 F N
-F0 "U" -250 1250 60 H V C CNN
-F1 "W65C02S6TPG-14" 0 0 60 V V C CNN
-F2 "" 0 150 60 H I C CNN
-F3 "" 0 150 60 H I C CNN
-$FPLIST
- DIP-40_W15.24mm
-$ENDFPLIST
-DRAW
-C -50 1200 0 0 1 0 N
-S -300 1200 300 -1200 0 1 0 f
-X ~VP 1 -1650 -200 200 L 50 50 1 1 O V
-X A1 10 900 1150 200 L 50 50 1 1 T
-X A2 11 900 1050 200 L 50 50 1 1 T
-X A3 12 900 950 200 L 50 50 1 1 T
-X A4 13 900 850 200 L 50 50 1 1 T
-X A5 14 900 750 200 L 50 50 1 1 T
-X A6 15 900 650 200 L 50 50 1 1 T
-X A7 16 900 550 200 L 50 50 1 1 T
-X A8 17 900 450 200 L 50 50 1 1 T
-X A9 18 900 350 200 L 50 50 1 1 T
-X A10 19 900 250 200 L 50 50 1 1 T
-X RDY 2 -1650 0 200 L 50 50 1 1 B
-X A11 20 900 150 200 L 50 50 1 1 T
-X Vss 21 0 -1400 200 U 50 50 1 1 W
-X A12 22 900 50 200 L 50 50 1 1 T
-X A13 23 900 -50 200 L 50 50 1 1 T
-X A14 24 900 -150 200 L 50 50 1 1 T
-X A15 25 900 -250 200 L 50 50 1 1 T
-X D7 26 900 -1150 200 L 50 50 1 1 B
-X D6 27 900 -1050 200 L 50 50 1 1 B
-X D5 28 900 -950 200 L 50 50 1 1 B
-X D4 29 900 -850 200 L 50 50 1 1 B
-X PHI1 3 -1650 400 200 L 50 50 1 1 O
-X D3 30 900 -750 200 L 50 50 1 1 B
-X D2 31 900 -650 200 L 50 50 1 1 B
-X D1 32 900 -550 200 L 50 50 1 1 B
-X D0 33 900 -450 200 L 50 50 1 1 B
-X R/~W 34 -1650 700 200 L 50 50 1 1 T
-X NC 35 -500 -1000 200 R 50 50 1 1 N X
-X BE 36 -1650 -400 200 L 50 50 1 1 I
-X PHI0 37 -1650 300 200 L 50 50 1 1 I C
-X ~SO 38 -1650 -500 200 L 50 50 1 1 I L
-X PHI2 39 -1650 500 200 L 50 50 1 1 O
-X ~IRQ 4 -500 -600 200 R 50 50 1 1 I L
-X ~RST 40 -500 -800 200 R 50 50 1 1 I L
-X ~ML 5 -1650 -300 200 L 50 50 1 1 O V
-X ~NMI 6 -500 -700 200 R 50 50 1 1 I L
-X SYNC 7 -1650 100 200 L 50 50 1 1 O
-X Vdd 8 0 1400 200 D 50 50 1 1 W
-X A0 9 900 1250 200 L 50 50 1 1 T
-ENDDRAW
-ENDDEF
-#
-# W65C02S6TPLG-14
-#
-DEF W65C02S6TPLG-14 U 0 40 Y Y 1 F N
-F0 "U" -250 1250 60 H V C CNN
-F1 "W65C02S6TPLG-14" 0 0 60 V V C CNN
-F2 "" 0 150 60 H I C CNN
-F3 "" 0 150 60 H I C CNN
-$FPLIST
- PLCC44
-$ENDFPLIST
-DRAW
-C -50 1200 0 0 1 0 N
-S -300 1200 300 -1200 0 1 0 N
-X Vss 1 -100 -1400 200 U 50 50 1 1 W
-X A0 10 -500 1100 200 R 50 50 1 1 T
-X A1 11 -500 1000 200 R 50 50 1 1 T
-X NC 12 -500 -1000 200 R 50 50 1 1 N X
-X A2 13 -500 900 200 R 50 50 1 1 T
-X A3 14 -500 800 200 R 50 50 1 1 T
-X A4 15 -500 700 200 R 50 50 1 1 T
-X A5 16 -500 600 200 R 50 50 1 1 T
-X A6 17 -500 500 200 R 50 50 1 1 T
-X A7 18 -500 400 200 R 50 50 1 1 T
-X A8 19 -500 300 200 R 50 50 1 1 T
-X ~VP 2 500 -700 200 L 50 50 1 1 O V
-X A9 20 -500 200 200 R 50 50 1 1 T
-X A10 21 -500 100 200 R 50 50 1 1 T
-X A11 22 -500 0 200 R 50 50 1 1 T
-X Vss 23 0 -1400 200 U 50 50 1 1 W
-X Vss 24 100 -1400 200 U 50 50 1 1 W
-X A12 25 -500 -100 200 R 50 50 1 1 T
-X A13 26 -500 -200 200 R 50 50 1 1 T
-X A14 27 -500 -300 200 R 50 50 1 1 T
-X A15 28 -500 -400 200 R 50 50 1 1 T
-X D7 29 500 400 200 L 50 50 1 1 B
-X RDY 3 500 -500 200 L 50 50 1 1 B
-X D6 30 500 500 200 L 50 50 1 1 B
-X D5 31 500 600 200 L 50 50 1 1 B
-X D4 32 500 700 200 L 50 50 1 1 B
-X D3 33 500 800 200 L 50 50 1 1 B
-X D2 34 500 900 200 L 50 50 1 1 B
-X D1 35 500 1000 200 L 50 50 1 1 B
-X D0 36 500 1100 200 L 50 50 1 1 B
-X Vdd 37 100 1400 200 D 50 50 1 1 W
-X R/~W 38 500 200 200 L 50 50 1 1 T
-X NC 39 -500 -1100 200 R 50 50 1 1 N X
-X PHI1 4 500 -100 200 L 50 50 1 1 O
-X BE 40 500 -900 200 L 50 50 1 1 I
-X PHI0 41 500 -200 200 L 50 50 1 1 I C
-X ~SO 42 500 -1000 200 L 50 50 1 1 I L
-X PHI2 43 500 0 200 L 50 50 1 1 O
-X ~RST 44 -500 -800 200 R 50 50 1 1 I L
-X ~IRQ 5 -500 -600 200 R 50 50 1 1 I L
-X ~ML 6 500 -800 200 L 50 50 1 1 O L
-X ~NMI 7 -500 -700 200 R 50 50 1 1 I L
-X SYNC 8 500 -400 200 L 50 50 1 1 O
-X Vdd 9 0 1400 200 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
-# W65C02S6TQG-14
-#
-DEF W65C02S6TQG-14 U 0 40 Y Y 1 F N
-F0 "U" -250 1250 60 H V C CNN
-F1 "W65C02S6TQG-14" 0 0 60 V V C CNN
-F2 "" 0 150 60 H I C CNN
-F3 "" 0 150 60 H I C CNN
-$FPLIST
- LQFP-44_10x10mm_Pitch0.8mm
-$ENDFPLIST
-DRAW
-C -50 1200 0 0 1 0 N
-S -300 1200 300 -1200 0 1 0 N
-X Vss 1 -100 -1400 200 U 50 50 1 1 W
-X A0 10 -500 1100 200 R 50 50 1 1 T
-X A1 11 -500 1000 200 R 50 50 1 1 T
-X NC 12 -500 -1000 200 R 50 50 1 1 N X
-X A2 13 -500 900 200 R 50 50 1 1 T
-X A3 14 -500 800 200 R 50 50 1 1 T
-X A4 15 -500 700 200 R 50 50 1 1 T
-X A5 16 -500 600 200 R 50 50 1 1 T
-X A6 17 -500 500 200 R 50 50 1 1 T
-X A7 18 -500 400 200 R 50 50 1 1 T
-X A8 19 -500 300 200 R 50 50 1 1 T
-X ~VP 2 500 -700 200 L 50 50 1 1 O V
-X A9 20 -500 200 200 R 50 50 1 1 T
-X A10 21 -500 100 200 R 50 50 1 1 T
-X A11 22 -500 0 200 R 50 50 1 1 T
-X Vss 23 0 -1400 200 U 50 50 1 1 W
-X Vss 24 100 -1400 200 U 50 50 1 1 W
-X A12 25 -500 -100 200 R 50 50 1 1 T
-X A13 26 -500 -200 200 R 50 50 1 1 T
-X A14 27 -500 -300 200 R 50 50 1 1 T
-X A15 28 -500 -400 200 R 50 50 1 1 T
-X D7 29 500 400 200 L 50 50 1 1 B
-X RDY 3 500 -500 200 L 50 50 1 1 B
-X D6 30 500 500 200 L 50 50 1 1 B
-X D5 31 500 600 200 L 50 50 1 1 B
-X D4 32 500 700 200 L 50 50 1 1 B
-X D3 33 500 800 200 L 50 50 1 1 B
-X D2 34 500 900 200 L 50 50 1 1 B
-X D1 35 500 1000 200 L 50 50 1 1 B
-X D0 36 500 1100 200 L 50 50 1 1 B
-X Vdd 37 100 1400 200 D 50 50 1 1 W
-X R/~W 38 500 200 200 L 50 50 1 1 T
-X NC 39 -500 -1100 200 R 50 50 1 1 N X
-X PHI1 4 500 -100 200 L 50 50 1 1 O
-X BE 40 500 -900 200 L 50 50 1 1 I
-X PHI0 41 500 -200 200 L 50 50 1 1 I C
-X ~SO 42 500 -1000 200 L 50 50 1 1 I L
-X PHI2 43 500 0 200 L 50 50 1 1 O
-X ~RST 44 -500 -800 200 R 50 50 1 1 I L
-X ~IRQ 5 -500 -600 200 R 50 50 1 1 I L
-X ~ML 6 500 -800 200 L 50 50 1 1 O L
-X ~NMI 7 -500 -700 200 R 50 50 1 1 I L
-X SYNC 8 500 -400 200 L 50 50 1 1 O
-X Vdd 9 0 1400 200 D 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # W65C02SxxPLx-xx
 #
 DEF W65C02SxxPLx-xx U 0 40 Y Y 1 F N
-F0 "U" 0 0 50 H V C CNN
-F1 "W65C02SxxPLx-xx" 0 0 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+F0 "U" -400 1400 50 H V L CNN
+F1 "W65C02SxxPLx-xx" 0 0 50 V V C CNN
+F2 "Sockets:PLCC44" 0 2000 50 H I C CNN
+F3 "http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf" 0 1900 50 H I C CNN
+$FPLIST
+ PLCC44
+$ENDFPLIST
 DRAW
+S -400 1350 400 -1350 0 1 0 f
+X VSS 1 -100 -1550 200 U 50 50 1 1 W
+X A0 10 600 1200 200 L 50 50 1 1 T
+X A1 11 600 1100 200 L 50 50 1 1 T
+X nc 12 -400 -1000 100 R 50 50 1 1 N NX
+X A2 13 600 1000 200 L 50 50 1 1 T
+X A3 14 600 900 200 L 50 50 1 1 T
+X A4 15 600 800 200 L 50 50 1 1 T
+X A5 16 600 700 200 L 50 50 1 1 T
+X A6 17 600 600 200 L 50 50 1 1 T
+X A7 18 600 500 200 L 50 50 1 1 T
+X A8 19 600 400 200 L 50 50 1 1 T
+X ~VP 2 -600 -800 200 R 50 50 1 1 O V
+X A9 20 600 300 200 L 50 50 1 1 T
+X A10 21 600 200 200 L 50 50 1 1 T
+X A11 22 600 100 200 L 50 50 1 1 T
+X VSS 23 0 -1550 200 U 50 50 1 1 W
+X VSS 24 100 -1550 200 U 50 50 1 1 W
+X A12 25 600 0 200 L 50 50 1 1 T
+X A13 26 600 -100 200 L 50 50 1 1 T
+X A14 27 600 -200 200 L 50 50 1 1 T
+X A15 28 600 -300 200 L 50 50 1 1 T
+X D7 29 600 -1200 200 L 50 50 1 1 B
+X RDY 3 -600 -300 200 R 50 50 1 1 C
+X D6 30 600 -1100 200 L 50 50 1 1 B
+X D5 31 600 -1000 200 L 50 50 1 1 B
+X D4 32 600 -900 200 L 50 50 1 1 B
+X D3 33 600 -800 200 L 50 50 1 1 B
+X D2 34 600 -700 200 L 50 50 1 1 B
+X D1 35 600 -600 200 L 50 50 1 1 B
+X D0 36 600 -500 200 L 50 50 1 1 B
+X VDD 37 0 1550 200 D 50 50 1 1 W
+X R/~W 38 -600 0 200 R 50 50 1 1 T
+X nc 39 -400 -1100 100 R 50 50 1 1 N NX
+X ϕ1 4 -600 800 200 R 50 50 1 1 O
+X BE 40 -600 -400 200 R 50 50 1 1 I
+X ϕ0 41 -600 900 200 R 50 50 1 1 I C
+X ~SO 42 -600 -1200 200 R 50 50 1 1 I L
+X ϕ2 43 -600 700 200 R 50 50 1 1 O
+X ~RES 44 -600 1200 200 R 50 50 1 1 I L
+X ~IRQ 5 -600 400 200 R 50 50 1 1 I L
+X ~ML 6 -600 -900 200 R 50 50 1 1 O V
+X ~NMI 7 -600 300 200 R 50 50 1 1 I L
+X SYNC 8 -600 -700 200 R 50 50 1 1 O
+X VDD 9 -100 1550 200 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
 # W65C02SxxPx-xx
 #
 DEF W65C02SxxPx-xx U 0 40 Y Y 1 F N
-F0 "U" 0 0 50 H V C CNN
-F1 "W65C02SxxPx-xx" 0 0 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+F0 "U" -400 1400 50 H V L CNN
+F1 "W65C02SxxPx-xx" 0 0 50 V V C CNN
+F2 "" 0 2000 50 H I C CNN
+F3 "http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf" 0 1900 50 H I C CNN
+$FPLIST
+ DIP-40_W15.24mm*
+$ENDFPLIST
 DRAW
+S -400 1350 400 -1350 0 1 0 f
+X ~VP 1 -600 -800 200 R 50 50 1 1 O V
+X A1 10 600 1100 200 L 50 50 1 1 T
+X A2 11 600 1000 200 L 50 50 1 1 T
+X A3 12 600 900 200 L 50 50 1 1 T
+X A4 13 600 800 200 L 50 50 1 1 T
+X A5 14 600 700 200 L 50 50 1 1 T
+X A6 15 600 600 200 L 50 50 1 1 T
+X A7 16 600 500 200 L 50 50 1 1 T
+X A8 17 600 400 200 L 50 50 1 1 T
+X A9 18 600 300 200 L 50 50 1 1 T
+X A10 19 600 200 200 L 50 50 1 1 T
+X RDY 2 -600 -300 200 R 50 50 1 1 C
+X A11 20 600 100 200 L 50 50 1 1 T
+X VSS 21 0 -1550 200 U 50 50 1 1 W
+X A12 22 600 0 200 L 50 50 1 1 T
+X A13 23 600 -100 200 L 50 50 1 1 T
+X A14 24 600 -200 200 L 50 50 1 1 T
+X A15 25 600 -300 200 L 50 50 1 1 T
+X D7 26 600 -1200 200 L 50 50 1 1 B
+X D6 27 600 -1100 200 L 50 50 1 1 B
+X D5 28 600 -1000 200 L 50 50 1 1 B
+X D4 29 600 -900 200 L 50 50 1 1 B
+X ϕ1 3 -600 800 200 R 50 50 1 1 O
+X D3 30 600 -800 200 L 50 50 1 1 B
+X D2 31 600 -700 200 L 50 50 1 1 B
+X D1 32 600 -600 200 L 50 50 1 1 B
+X D0 33 600 -500 200 L 50 50 1 1 B
+X R/~W 34 -600 0 200 R 50 50 1 1 T
+X nc 35 -400 -1100 100 R 50 50 1 1 N NX
+X BE 36 -600 -400 200 R 50 50 1 1 I
+X ϕ0 37 -600 900 200 R 50 50 1 1 I C
+X ~SO 38 -600 -1200 200 R 50 50 1 1 I L
+X ϕ2 39 -600 700 200 R 50 50 1 1 O
+X ~IRQ 4 -600 400 200 R 50 50 1 1 I L
+X ~RES 40 -600 1200 200 R 50 50 1 1 I L
+X ~ML 5 -600 -900 200 R 50 50 1 1 O V
+X ~NMI 6 -600 300 200 R 50 50 1 1 I L
+X SYNC 7 -600 -700 200 R 50 50 1 1 O
+X VDD 8 0 1550 200 D 50 50 1 1 W
+X A0 9 600 1200 200 L 50 50 1 1 T
 ENDDRAW
 ENDDEF
 #
 # W65C02SxxQx-xx
 #
 DEF W65C02SxxQx-xx U 0 40 Y Y 1 F N
-F0 "U" 0 0 50 H V C CNN
-F1 "W65C02SxxQx-xx" 0 0 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
+F0 "U" -400 1400 50 H V L CNN
+F1 "W65C02SxxQx-xx" 0 0 50 V V C CNN
+F2 "Housings_QFP:PQFP-44_10x10mm_Pitch0.8mm" 0 2000 50 H I C CNN
+F3 "http://www.westerndesigncenter.com/wdc/documentation/w65c02s.pdf" 0 1900 50 H I C CNN
+$FPLIST
+ PQFP-44_10x10mm_Pitch0.8mm
+$ENDFPLIST
 DRAW
+S -400 1350 400 -1350 0 1 0 f
+X ~NMI 1 -600 300 200 R 50 50 1 1 I L
+X A5 10 600 700 200 L 50 50 1 1 T
+X A6 11 600 600 200 L 50 50 1 1 T
+X A7 12 600 500 200 L 50 50 1 1 T
+X A8 13 600 400 200 L 50 50 1 1 T
+X A9 14 600 300 200 L 50 50 1 1 T
+X A10 15 600 200 200 L 50 50 1 1 T
+X A11 16 600 100 200 L 50 50 1 1 T
+X VSS 17 -100 -1550 200 U 50 50 1 1 W
+X VSS 18 0 -1550 200 U 50 50 1 1 W
+X A12 19 600 0 200 L 50 50 1 1 T
+X SYNC 2 -600 -700 200 R 50 50 1 1 O
+X A13 20 600 -100 200 L 50 50 1 1 T
+X A14 21 600 -200 200 L 50 50 1 1 T
+X A15 22 600 -300 200 L 50 50 1 1 T
+X D7 23 600 -1200 200 L 50 50 1 1 B
+X D6 24 600 -1100 200 L 50 50 1 1 B
+X D5 25 600 -1000 200 L 50 50 1 1 B
+X D4 26 600 -900 200 L 50 50 1 1 B
+X D3 27 600 -800 200 L 50 50 1 1 B
+X D2 28 600 -700 200 L 50 50 1 1 B
+X D1 29 600 -600 200 L 50 50 1 1 B
+X VDD 3 -100 1550 200 D 50 50 1 1 W
+X D0 30 600 -500 200 L 50 50 1 1 B
+X VDD 31 0 1550 200 D 50 50 1 1 W
+X R/~W 32 -600 0 200 R 50 50 1 1 T
+X nc 33 -400 -1100 100 R 50 50 1 1 N NX
+X BE 34 -600 -400 200 R 50 50 1 1 I
+X ϕ0 35 -600 900 200 R 50 50 1 1 I C
+X ~SO 36 -600 -1200 200 R 50 50 1 1 I L
+X ϕ2 37 -600 700 200 R 50 50 1 1 O
+X ~RES 38 -600 1200 200 R 50 50 1 1 I L
+X VSS 39 100 -1550 200 U 50 50 1 1 W
+X A0 4 600 1200 200 L 50 50 1 1 T
+X ~VP 40 -600 -800 200 R 50 50 1 1 O V
+X RDY 41 -600 -300 200 R 50 50 1 1 C
+X ϕ1 42 -600 800 200 R 50 50 1 1 O
+X ~IRQ 43 -600 400 200 R 50 50 1 1 I L
+X ~ML 44 -600 -900 200 R 50 50 1 1 O V
+X A1 5 600 1100 200 L 50 50 1 1 T
+X nc 6 -400 -1000 100 R 50 50 1 1 N NX
+X A2 7 600 1000 200 L 50 50 1 1 T
+X A3 8 600 900 200 L 50 50 1 1 T
+X A4 9 600 800 200 L 50 50 1 1 T
 ENDDRAW
 ENDDEF
 #