diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 97352154..7f6a4428 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Tools/ASM.T.xlsm b/.Tools/ASM.T.xlsm
index 56101b0b..46282781 100644
Binary files a/.Tools/ASM.T.xlsm and b/.Tools/ASM.T.xlsm differ
diff --git a/BIN/ASM.S.DIR.txt b/BIN/ASM.S.DIR.txt
index 46b8cfca..ffdfc734 100644
--- a/BIN/ASM.S.DIR.txt
+++ b/BIN/ASM.S.DIR.txt
@@ -146,21 +146,22 @@ DIR.DA				jsr	SRC.GetNextCharNB
 .1					jsr EXP.Eval
 					bcs .9
 					
-					ldx #0
+					ldx SRC.ACC.SIZE
+					bne .10
 
-.2					phx							
-						
-					lda SRC.ACC,x
-					jsr OUT.EmitByte
-					plx
+					ldx #2
 					
+.10					ldy #0
+
+.2					lda SRC.ACC,y
+					jsr OUT.EmitByte
 					bcs .9
 					
-					inx
-					cpx SRC.ACC.SIZE
+					iny
+					dex
 					bne .2
 					
-					jsr	SRC.GetNextChar
+.3					jsr	SRC.GetNextChar
 					bcs .8
 					cmp #' '
 					beq .8
diff --git a/BIN/ASM.S.EXP.txt b/BIN/ASM.S.EXP.txt
index e3c87db7..2817b13d 100644
--- a/BIN/ASM.S.EXP.txt
+++ b/BIN/ASM.S.EXP.txt
@@ -133,7 +133,7 @@ EXP.Eval.Next1		cmp #'.'			Local Label?
 .42					jsr SRC.IsLetter		Symbol ?
 					bcs EXP.EvalExitSYN
 
-					jsr EXP.GetSymbol
+					jsr EXP.GetSymbolValue
 					bcs EXP.EvalExitUND
 					bra EXP.EvalOperator
 					
@@ -210,13 +210,29 @@ EXP.SetAccA			sta SRC.ACC
 					sta SRC.ACC.SIZE
 					rts
 *---------------------------------------					
-EXP.GetSymbol		jsr SYM.LookupGlobal
-					bcc .9
+EXP.GetSymbolValue	jsr SYM.LookupGlobal
+					bcs .2
+					
+					ldy #SYM.Lookup+5
+					ldx #3
+					
+.1					lda (pData),y
+					sta SRC.ACC,x
+					dey
+					dex
+					bpl .1
+					
+					lda (pData),y
+					and #SYM.F.SIZE
+					sta SRC.ACC.SIZE
+*					clc
+					rts
 					
 .2					>LDA.G ASM.PASS		pass#2?
 					bne .99				yes, undefined symbol
 					
-					lda #0				Add Pending....
+					lda #0
+					sta SRC.ACC.SIZE	Add Pending
 					jsr SYM.AddGlobal
 .3					clc
 					rts	
diff --git a/BIN/ASM.S.OUT.txt b/BIN/ASM.S.OUT.txt
index 026d50d5..e1175406 100644
--- a/BIN/ASM.S.OUT.txt
+++ b/BIN/ASM.S.OUT.txt
@@ -155,7 +155,9 @@ OUT.PrintLineAcc	ldx SRC.ACC.SIZE
 					>SYSCALL PrintF.YA
 					rts
 *---------------------------------------
-OUT.EmitByte		pha
+OUT.EmitByte		phy
+					phx
+					pha
 
 					>LDA.G OUT.Buf
 					cmp #3
@@ -195,7 +197,9 @@ OUT.EmitByte		pha
 					bne .80
 					>INC.G ASM.PC+3
 							
-.80					clc
+.80					plx
+					ply
+					clc
 					rts
 *---------------------------------------
 MAN
diff --git a/BIN/ASM.S.SRC.txt b/BIN/ASM.S.SRC.txt
index f9c7d6f8..96f8d340 100644
--- a/BIN/ASM.S.SRC.txt
+++ b/BIN/ASM.S.SRC.txt
@@ -246,18 +246,18 @@ SRC.ParseLine.OpCode
 					stz SRC.AM.StrBuf
 					
 					>LDYA ZPOPtr
-					>STYA ZPPtr1
+					>STYA ZPOpDefPtr
 					
-.1					lda (ZPPtr1)		End Of OpCode List
+.1					lda (ZPOpDefPtr)	End Of OpCode List
 					ldy #1
-					ora (ZPPtr1),y
+					ora (ZPOpDefPtr),y
 					beq .9
 					
-					lda ZPPtr1
+					lda ZPOpDefPtr
 					clc
 					adc #2
 					sta ZPPtr2
-					lda ZPPtr1+1
+					lda ZPOpDefPtr+1
 					adc #0
 					sta ZPPtr2+1
 					
@@ -297,17 +297,24 @@ SRC.ParseLine.OpCode
 					
 					inc ZPLinePtr+1
 					
-.5					bra SRC.ParseLine.AM
-					
-.7					lda ZPPtr1
+.5					tya					Skip nPtr+Len+OP
 					clc
-					adc (ZPPtr1)
+					adc #3
+					adc ZPOpDefPtr
+					sta ZPOpDefPtr
+					bcc .6
+					inc ZPOpDefPtr+1
+.6					bra SRC.ParseLine.AM
+					
+.7					lda ZPOpDefPtr
+					clc
+					adc (ZPOpDefPtr)
 					tax
-					lda ZPPtr1+1
+					lda ZPOpDefPtr+1
 					ldy #1
-					adc (ZPPtr1),y
-					stx ZPPtr1
-					sta ZPPtr1+1
+					adc (ZPOpDefPtr),y
+					stx ZPOpDefPtr
+					sta ZPOpDefPtr+1
 					bra .1
 					
 .8					jmp SRC.ParseLine.AMCheck
@@ -366,15 +373,20 @@ SRC.ParseLine.AM
 					ldx SRC.AM.StrBuf
 					sta SRC.AM.StrBuf,x
 
-.74					ldx #3
+.74					ldx SRC.ACC.SIZE
+					beq .75				Pending...assume 2 bytes...
 					
-.73					lda SRC.ACC,x					
+.73					lda SRC.ACC-1,x					
 					bne .72
 					dex
 					bne .73
 					
-.72					inx
-					lda #'a'
+					inx
+					bra .72
+					
+.75					ldx #2
+					
+.72					lda #'a'
 					
 					ldy SRC.AM.StrBuf
 					
@@ -396,14 +408,120 @@ SRC.ParseLine.AM
 .99					rts
 *---------------------------------------
 SRC.ParseLine.AMCheck
-					jsr OUT.PrintLine.1
-					>PUSHW L.SRC.AM.StrBuf
-					>LDYA L.MSG.PSTRCRLF
-					>SYSCALL PrintF.YA
+*					jsr OUT.PrintLine.1
+*					>PUSHW L.SRC.AM.StrBuf
+*					>LDYA L.MSG.PSTRCRLF
+*					>SYSCALL PrintF.YA
 					
-					>DEBUG
+					lda SRC.AM.StrBuf
+					beq SRC.ParseLine.OPAMCheckFF
+					
+					>LDYA ZPAMPtr
+					>STYA ZPPtr1
+					
+					ldx #0
+					
+.1					inx
+
+					lda (ZPPtr1)
+					beq .9
+					
+					cmp SRC.AM.StrBuf 
+					bne .7
+					
+					tay
+					
+.2					lda (ZPPtr1),y				
+					cmp SRC.AM.StrBuf,y
+					bne .6
+					dey
+					bne .2
+					
+					txa
+					>STA.G SRC.AMID
+					bra SRC.ParseLine.OPAMCheck
+					
+.6					lda (ZPPtr1)
+.7					sec
+					adc ZPPtr1
+					sta ZPPtr1
+					bcc .1
+					inc ZPPtr1+1
+					bra .1
+					
+.9					lda #ERR.INV.AM
+					sec
+					rts
+*---------------------------------------
+SRC.ParseLine.OPAMCheckFF
+					lda #$ff			Default to no AM
+					>STA.G SRC.AMID
+
+SRC.ParseLine.OPAMCheck
+					lda (ZPOpDefPtr)
+.1					>CMP.G SRC.AMID
+					beq .3
+					
+					ldy #1
+					lda (ZPOpDefPtr),y
+					inc
+					sec
+					adc ZPOpDefPtr
+					sta ZPOpDefPtr
+					bcc .2
+					inc ZPOpDefPtr+1
+.2					lda (ZPOpDefPtr)
+					bne .1
+					
+					lda #ERR.INV.AM.4.OC
+					sec
+					rts
+					
+.3					stz SRC.ACCTMP			index in ACC
+
+					ldy #1
+					lda (ZPOpDefPtr),y
+					sta SRC.ACCTMP+1		Char Count in AM
+					iny
+					
+.4					lda (ZPOpDefPtr),y
+					cmp #'a
+					bcs .5
+					jsr SRC.IsDigit16
+					asl
+					asl
+					asl
+					asl
+					sta SRC.ACCTMP+2
+					iny
+					dec SRC.ACCTMP+1
+					lda (ZPOpDefPtr),y
+					jsr SRC.IsDigit16
+					ora SRC.ACCTMP+2
+
+.50					jsr OUT.EmitByte
+
+					bcs .9
+					iny
+					dec SRC.ACCTMP+1
+					bne .4
 					clc
 					rts
+					
+.5					bne .6
+					
+					ldx SRC.ACCTMP
+					lda SRC.ACC,x
+					inc SRC.ACCTMP
+					bra .50
+
+.6					cmp #'r
+					bne *
+
+
+
+.8					clc
+.9					rts
 *---------------------------------------
 SRC.GetDecimal		jsr SRC.GetChar
 					beq .99
diff --git a/BIN/ASM.S.SYM.txt b/BIN/ASM.S.SYM.txt
index cce3d480..40edfa22 100644
--- a/BIN/ASM.S.SYM.txt
+++ b/BIN/ASM.S.SYM.txt
@@ -83,7 +83,7 @@ SYM.Dump			stz ZPLinePtr
 					
 					ldy #SYM.F			Get Symbol Size
 					lda (ZPPtr1),y
-					and #7
+					and #SYM.F.SIZE
 					beq .3
 
 					pha
diff --git a/BIN/ASM.S.txt b/BIN/ASM.S.txt
index da61da88..0278b020 100644
--- a/BIN/ASM.S.txt
+++ b/BIN/ASM.S.txt
@@ -20,11 +20,13 @@ ZPTmpBuf			.EQ ZPBIN+14
 ZPAMPtr				.EQ ZPBIN+16
 ZPRPtr				.EQ ZPBIN+18
 ZPOPtr				.EQ ZPBIN+20
+ZPOpDefPtr			.EQ ZPBIN+22
 *---------------------------------------
 SYM.LEN				.EQ 0
 SYM.F				.EQ 1
 SYM.F.RESOLVED		.EQ %10000000
 SYM.F.RW			.EQ %01000000
+SYM.F.SIZE			.EQ %00000111
 SYM.V				.EQ 2
 *---------------------------------------
 ASM.T.AM			.EQ 0
@@ -46,13 +48,14 @@ ERR.INV.LABEL		.EQ $A4
 ERR.INV.DIR			.EQ $A5
 ERR.INV.OPCODE		.EQ $A6
 ERR.INV.AM.SYN		.EQ $A7
-ERR.INV.AM.4.OC		.EQ $A8
-ERR.RANGE			.EQ $A9
-ERR.UNDEF.SYMBOL	.EQ $AA
-ERR.SYMBOL.REDEF	.EQ $AB
-ERR.TOO.MANY.DO		.EQ $AC
-ERR.ELSE.WITHOUT.DO	.EQ $AD
-ERR.TOO.MANY.LOCAL	.EQ $AE
+ERR.INV.AM			.EQ $A8
+ERR.INV.AM.4.OC		.EQ $A9
+ERR.RANGE			.EQ $AA
+ERR.UNDEF.SYMBOL	.EQ $AB
+ERR.SYMBOL.REDEF	.EQ $AC
+ERR.TOO.MANY.DO		.EQ $AD
+ERR.ELSE.WITHOUT.DO	.EQ $AE
+ERR.TOO.MANY.LOCAL	.EQ $AF
 ERR.MISSING.EXP		.EQ $B0
 ERR.EXP.SYN.ERROR	.EQ $B1
 ERR.MACRO.INV.DEF	.EQ $E0
@@ -482,6 +485,7 @@ OUT.PC				.BS 4
 OUT.Buf				.BS 4
 OUT.bEquate			.BS 1
 
+SRC.AMID			.BS 1
 DS.END				.ED
 *---------------------------------------
 					.DO DS.END-DS.START>$FF
diff --git a/BIN/ASM.T.6502.A.txt b/BIN/ASM.T.6502.A.txt
index 5c970581..b042b9e9 100644
--- a/BIN/ASM.T.6502.A.txt
+++ b/BIN/ASM.T.6502.A.txt
@@ -3,6 +3,7 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.ADDR.MODES	.EQ *
+				>PSTR "#a"
 				>PSTR "(a),Y"
 				>PSTR "(a,X)"
 				>PSTR "a"
@@ -10,8 +11,6 @@ T.ADDR.MODES	.EQ *
 				>PSTR "aa"
 				>PSTR "aa,X"
 				>PSTR "aa,Y"
-				>PSTR "i"
-				>PSTR "r"
 				>PSTR "(aa)"
 				>PSTR "a,Y"
 				.HS 00
diff --git a/BIN/ASM.T.6502.O.txt b/BIN/ASM.T.6502.O.txt
index 6094a29c..00b8c6e0 100644
--- a/BIN/ASM.T.6502.O.txt
+++ b/BIN/ASM.T.6502.O.txt
@@ -6,471 +6,471 @@ T.OPCODES	.EQ *
 ADC		.DA ADC.E+1-*
 			>PSTR "ADC"
 			.HS 01
-			>PSTR "71a"
+			>PSTR "69a"
 			.HS 02
-			>PSTR "61a"
+			>PSTR "71a"
 			.HS 03
-			>PSTR "65a"
+			>PSTR "61a"
 			.HS 04
-			>PSTR "75a"
+			>PSTR "65a"
 			.HS 05
-			>PSTR "6Daa"
+			>PSTR "75a"
 			.HS 06
-			>PSTR "7Daa"
+			>PSTR "6Daa"
 			.HS 07
-			>PSTR "79aa"
+			>PSTR "7Daa"
 			.HS 08
-			>PSTR "69i"
+			>PSTR "79aa"
 ADC.E	.HS 00
 AND		.DA AND.E+1-*
 			>PSTR "AND"
 			.HS 01
-			>PSTR "31a"
+			>PSTR "29a"
 			.HS 02
-			>PSTR "21a"
+			>PSTR "31a"
 			.HS 03
-			>PSTR "25a"
+			>PSTR "21a"
 			.HS 04
-			>PSTR "35a"
+			>PSTR "25a"
 			.HS 05
-			>PSTR "2Daa"
+			>PSTR "35a"
 			.HS 06
-			>PSTR "3Daa"
+			>PSTR "2Daa"
 			.HS 07
-			>PSTR "39aa"
+			>PSTR "3Daa"
 			.HS 08
-			>PSTR "29i"
+			>PSTR "39aa"
 AND.E	.HS 00
 ASL		.DA ASL.E+1-*
 			>PSTR "ASL"
-			.HS 03
-			>PSTR "06a"
 			.HS 04
-			>PSTR "16a"
+			>PSTR "06a"
 			.HS 05
-			>PSTR "0Eaa"
+			>PSTR "16a"
 			.HS 06
+			>PSTR "0Eaa"
+			.HS 07
 			>PSTR "1Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "0A"
 ASL.E	.HS 00
 BCC		.DA BCC.E+1-*
 			>PSTR "BCC"
-			.HS 09
+			.HS 06
 			>PSTR "90r"
 BCC.E	.HS 00
 BCS		.DA BCS.E+1-*
 			>PSTR "BCS"
-			.HS 09
+			.HS 06
 			>PSTR "B0r"
 BCS.E	.HS 00
 BEQ		.DA BEQ.E+1-*
 			>PSTR "BEQ"
-			.HS 09
+			.HS 06
 			>PSTR "F0r"
 BEQ.E	.HS 00
 BIT		.DA BIT.E+1-*
 			>PSTR "BIT"
-			.HS 03
+			.HS 04
 			>PSTR "24a"
-			.HS 05
+			.HS 06
 			>PSTR "2Caa"
 BIT.E	.HS 00
 BMI		.DA BMI.E+1-*
 			>PSTR "BMI"
-			.HS 09
+			.HS 06
 			>PSTR "30r"
 BMI.E	.HS 00
 BNE		.DA BNE.E+1-*
 			>PSTR "BNE"
-			.HS 09
+			.HS 06
 			>PSTR "D0r"
 BNE.E	.HS 00
 BPL		.DA BPL.E+1-*
 			>PSTR "BPL"
-			.HS 09
+			.HS 06
 			>PSTR "10r"
 BPL.E	.HS 00
 BRK		.DA BRK.E+1-*
 			>PSTR "BRK"
-			.HS 00
+			.HS FF
 			>PSTR "00"
 BRK.E	.HS 00
 BVC		.DA BVC.E+1-*
 			>PSTR "BVC"
-			.HS 09
+			.HS 06
 			>PSTR "50r"
 BVC.E	.HS 00
 BVS		.DA BVS.E+1-*
 			>PSTR "BVS"
-			.HS 09
+			.HS 06
 			>PSTR "70r"
 BVS.E	.HS 00
 CLC		.DA CLC.E+1-*
 			>PSTR "CLC"
-			.HS 00
+			.HS FF
 			>PSTR "18"
 CLC.E	.HS 00
 CLD		.DA CLD.E+1-*
 			>PSTR "CLD"
-			.HS 00
+			.HS FF
 			>PSTR "D8"
 CLD.E	.HS 00
 CLI		.DA CLI.E+1-*
 			>PSTR "CLI"
-			.HS 00
+			.HS FF
 			>PSTR "58"
 CLI.E	.HS 00
 CLV		.DA CLV.E+1-*
 			>PSTR "CLV"
-			.HS 00
+			.HS FF
 			>PSTR "B8"
 CLV.E	.HS 00
 CMP		.DA CMP.E+1-*
 			>PSTR "CMP"
 			.HS 01
-			>PSTR "D1a"
+			>PSTR "C9a"
 			.HS 02
-			>PSTR "C1a"
+			>PSTR "D1a"
 			.HS 03
-			>PSTR "C5a"
+			>PSTR "C1a"
 			.HS 04
-			>PSTR "D5a"
+			>PSTR "C5a"
 			.HS 05
-			>PSTR "CDaa"
+			>PSTR "D5a"
 			.HS 06
-			>PSTR "DDaa"
+			>PSTR "CDaa"
 			.HS 07
-			>PSTR "D9aa"
+			>PSTR "DDaa"
 			.HS 08
-			>PSTR "C9i"
+			>PSTR "D9aa"
 CMP.E	.HS 00
 CPX		.DA CPX.E+1-*
 			>PSTR "CPX"
-			.HS 03
+			.HS 01
+			>PSTR "E0a"
+			.HS 04
 			>PSTR "E4a"
-			.HS 05
+			.HS 06
 			>PSTR "Ecaa"
-			.HS 08
-			>PSTR "E0i"
 CPX.E	.HS 00
 CPY		.DA CPY.E+1-*
 			>PSTR "CPY"
-			.HS 03
+			.HS 01
+			>PSTR "C0a"
+			.HS 04
 			>PSTR "C4a"
-			.HS 05
+			.HS 06
 			>PSTR "Ccaa"
-			.HS 08
-			>PSTR "C0i"
 CPY.E	.HS 00
 DEC		.DA DEC.E+1-*
 			>PSTR "DEC"
-			.HS 03
-			>PSTR "C6a"
 			.HS 04
-			>PSTR "D6a"
+			>PSTR "C6a"
 			.HS 05
-			>PSTR "Ceaa"
+			>PSTR "D6a"
 			.HS 06
+			>PSTR "Ceaa"
+			.HS 07
 			>PSTR "Deaa"
 DEC.E	.HS 00
 DEX		.DA DEX.E+1-*
 			>PSTR "DEX"
-			.HS 00
+			.HS FF
 			>PSTR "CA"
 DEX.E	.HS 00
 DEY		.DA DEY.E+1-*
 			>PSTR "DEY"
-			.HS 00
+			.HS FF
 			>PSTR "88"
 DEY.E	.HS 00
 EOR		.DA EOR.E+1-*
 			>PSTR "EOR"
 			.HS 01
-			>PSTR "51a"
+			>PSTR "49a"
 			.HS 02
-			>PSTR "41a"
+			>PSTR "51a"
 			.HS 03
-			>PSTR "45a"
+			>PSTR "41a"
 			.HS 04
-			>PSTR "55a"
+			>PSTR "45a"
 			.HS 05
-			>PSTR "4Daa"
+			>PSTR "55a"
 			.HS 06
-			>PSTR "5Daa"
+			>PSTR "4Daa"
 			.HS 07
-			>PSTR "59aa"
+			>PSTR "5Daa"
 			.HS 08
-			>PSTR "49i"
+			>PSTR "59aa"
 EOR.E	.HS 00
 INC		.DA INC.E+1-*
 			>PSTR "INC"
-			.HS 03
-			>PSTR "E6a"
 			.HS 04
-			>PSTR "F6a"
+			>PSTR "E6a"
 			.HS 05
-			>PSTR "Eeaa"
+			>PSTR "F6a"
 			.HS 06
+			>PSTR "Eeaa"
+			.HS 07
 			>PSTR "Feaa"
 INC.E	.HS 00
 INX		.DA INX.E+1-*
 			>PSTR "INX"
-			.HS 00
+			.HS FF
 			>PSTR "E8"
 INX.E	.HS 00
 INY		.DA INY.E+1-*
 			>PSTR "INY"
-			.HS 00
+			.HS FF
 			>PSTR "C8"
 INY.E	.HS 00
 JMP		.DA JMP.E+1-*
 			>PSTR "JMP"
-			.HS 0A
+			.HS 09
 			>PSTR "6Caa"
-			.HS 05
+			.HS 06
 			>PSTR "4Caa"
 JMP.E	.HS 00
 JSR		.DA JSR.E+1-*
 			>PSTR "JSR"
-			.HS 05
+			.HS 06
 			>PSTR "20aa"
 JSR.E	.HS 00
 LDA		.DA LDA.E+1-*
 			>PSTR "LDA"
 			.HS 01
-			>PSTR "B1a"
+			>PSTR "A9a"
 			.HS 02
-			>PSTR "A1a"
+			>PSTR "B1a"
 			.HS 03
-			>PSTR "A5a"
+			>PSTR "A1a"
 			.HS 04
-			>PSTR "B5a"
+			>PSTR "A5a"
 			.HS 05
-			>PSTR "Adaa"
+			>PSTR "B5a"
 			.HS 06
-			>PSTR "Bdaa"
+			>PSTR "Adaa"
 			.HS 07
-			>PSTR "B9aa"
+			>PSTR "Bdaa"
 			.HS 08
-			>PSTR "A9i"
+			>PSTR "B9aa"
 LDA.E	.HS 00
 LDX		.DA LDX.E+1-*
 			>PSTR "LDX"
-			.HS 03
+			.HS 01
+			>PSTR "A2a"
+			.HS 04
 			>PSTR "A6a"
-			.HS 0B
+			.HS 0A
 			>PSTR "B6a"
-			.HS 05
+			.HS 06
 			>PSTR "Aeaa"
-			.HS 07
-			>PSTR "Beaa"
 			.HS 08
-			>PSTR "A2i"
+			>PSTR "Beaa"
 LDX.E	.HS 00
 LDY		.DA LDY.E+1-*
 			>PSTR "LDY"
-			.HS 03
-			>PSTR "A4a"
+			.HS 01
+			>PSTR "A0a"
 			.HS 04
-			>PSTR "B4a"
+			>PSTR "A4a"
 			.HS 05
-			>PSTR "Acaa"
+			>PSTR "B4a"
 			.HS 06
+			>PSTR "Acaa"
+			.HS 07
 			>PSTR "Bcaa"
-			.HS 08
-			>PSTR "A0i"
 LDY.E	.HS 00
 LSR		.DA LSR.E+1-*
 			>PSTR "LSR"
-			.HS 03
-			>PSTR "46a"
 			.HS 04
-			>PSTR "56a"
+			>PSTR "46a"
 			.HS 05
-			>PSTR "4Eaa"
+			>PSTR "56a"
 			.HS 06
+			>PSTR "4Eaa"
+			.HS 07
 			>PSTR "5Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "4A"
 LSR.E	.HS 00
 NOP		.DA NOP.E+1-*
 			>PSTR "NOP"
-			.HS 00
+			.HS FF
 			>PSTR "EA"
 NOP.E	.HS 00
 ORA		.DA ORA.E+1-*
 			>PSTR "ORA"
 			.HS 01
-			>PSTR "11a"
+			>PSTR "09a"
 			.HS 02
-			>PSTR "01a"
+			>PSTR "11a"
 			.HS 03
-			>PSTR "05a"
+			>PSTR "01a"
 			.HS 04
-			>PSTR "15a"
+			>PSTR "05a"
 			.HS 05
-			>PSTR "0Daa"
+			>PSTR "15a"
 			.HS 06
-			>PSTR "1Daa"
+			>PSTR "0Daa"
 			.HS 07
-			>PSTR "19aa"
+			>PSTR "1Daa"
 			.HS 08
-			>PSTR "09i"
+			>PSTR "19aa"
 ORA.E	.HS 00
 PHA		.DA PHA.E+1-*
 			>PSTR "PHA"
-			.HS 00
+			.HS FF
 			>PSTR "48"
 PHA.E	.HS 00
 PHP		.DA PHP.E+1-*
 			>PSTR "PHP"
-			.HS 00
+			.HS FF
 			>PSTR "08"
 PHP.E	.HS 00
 PLA		.DA PLA.E+1-*
 			>PSTR "PLA"
-			.HS 00
+			.HS FF
 			>PSTR "68"
 PLA.E	.HS 00
 PLP		.DA PLP.E+1-*
 			>PSTR "PLP"
-			.HS 00
+			.HS FF
 			>PSTR "28"
 PLP.E	.HS 00
 ROL		.DA ROL.E+1-*
 			>PSTR "ROL"
-			.HS 03
-			>PSTR "26a"
 			.HS 04
-			>PSTR "36a"
+			>PSTR "26a"
 			.HS 05
-			>PSTR "2Eaa"
+			>PSTR "36a"
 			.HS 06
+			>PSTR "2Eaa"
+			.HS 07
 			>PSTR "3Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "2A"
 ROL.E	.HS 00
 ROR		.DA ROR.E+1-*
 			>PSTR "ROR"
-			.HS 03
-			>PSTR "66a"
 			.HS 04
-			>PSTR "76a"
+			>PSTR "66a"
 			.HS 05
-			>PSTR "6Eaa"
+			>PSTR "76a"
 			.HS 06
+			>PSTR "6Eaa"
+			.HS 07
 			>PSTR "7Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "6A"
 ROR.E	.HS 00
 RTI		.DA RTI.E+1-*
 			>PSTR "RTI"
-			.HS 00
+			.HS FF
 			>PSTR "40"
 RTI.E	.HS 00
 RTS		.DA RTS.E+1-*
 			>PSTR "RTS"
-			.HS 00
+			.HS FF
 			>PSTR "60"
 RTS.E	.HS 00
 SBC		.DA SBC.E+1-*
 			>PSTR "SBC"
 			.HS 01
-			>PSTR "F1a"
+			>PSTR "E9a"
 			.HS 02
-			>PSTR "E1a"
+			>PSTR "F1a"
 			.HS 03
-			>PSTR "E5a"
+			>PSTR "E1a"
 			.HS 04
-			>PSTR "F5a"
+			>PSTR "E5a"
 			.HS 05
-			>PSTR "Edaa"
+			>PSTR "F5a"
 			.HS 06
-			>PSTR "Fdaa"
+			>PSTR "Edaa"
 			.HS 07
-			>PSTR "F9aa"
+			>PSTR "Fdaa"
 			.HS 08
-			>PSTR "E9i"
+			>PSTR "F9aa"
 SBC.E	.HS 00
 SEC		.DA SEC.E+1-*
 			>PSTR "SEC"
-			.HS 00
+			.HS FF
 			>PSTR "38"
 SEC.E	.HS 00
 SED		.DA SED.E+1-*
 			>PSTR "SED"
-			.HS 00
+			.HS FF
 			>PSTR "F8"
 SED.E	.HS 00
 SEI		.DA SEI.E+1-*
 			>PSTR "SEI"
-			.HS 00
+			.HS FF
 			>PSTR "78"
 SEI.E	.HS 00
 STA		.DA STA.E+1-*
 			>PSTR "STA"
-			.HS 01
-			>PSTR "91a"
 			.HS 02
-			>PSTR "81a"
+			>PSTR "91a"
 			.HS 03
-			>PSTR "85a"
+			>PSTR "81a"
 			.HS 04
-			>PSTR "95a"
+			>PSTR "85a"
 			.HS 05
-			>PSTR "8Daa"
+			>PSTR "95a"
 			.HS 06
-			>PSTR "9Daa"
+			>PSTR "8Daa"
 			.HS 07
+			>PSTR "9Daa"
+			.HS 08
 			>PSTR "99aa"
 STA.E	.HS 00
 STX		.DA STX.E+1-*
 			>PSTR "STX"
-			.HS 03
+			.HS 04
 			>PSTR "86a"
-			.HS 0B
+			.HS 0A
 			>PSTR "96a"
-			.HS 05
+			.HS 06
 			>PSTR "8Eaa"
 STX.E	.HS 00
 STY		.DA STY.E+1-*
 			>PSTR "STY"
-			.HS 03
-			>PSTR "84a"
 			.HS 04
-			>PSTR "94a"
+			>PSTR "84a"
 			.HS 05
+			>PSTR "94a"
+			.HS 06
 			>PSTR "8Caa"
 STY.E	.HS 00
 TAX		.DA TAX.E+1-*
 			>PSTR "TAX"
-			.HS 00
+			.HS FF
 			>PSTR "AA"
 TAX.E	.HS 00
 TAY		.DA TAY.E+1-*
 			>PSTR "TAY"
-			.HS 00
+			.HS FF
 			>PSTR "A8"
 TAY.E	.HS 00
 TSX		.DA TSX.E+1-*
 			>PSTR "TSX"
-			.HS 00
+			.HS FF
 			>PSTR "BA"
 TSX.E	.HS 00
 TXA		.DA TXA.E+1-*
 			>PSTR "TXA"
-			.HS 00
+			.HS FF
 			>PSTR "8A"
 TXA.E	.HS 00
 TXS		.DA TXS.E+1-*
 			>PSTR "TXS"
-			.HS 00
+			.HS FF
 			>PSTR "9A"
 TXS.E	.HS 00
 TYA		.DA TYA.E+1-*
 			>PSTR "TYA"
-			.HS 00
+			.HS FF
 			>PSTR "98"
 TYA.E		.HS 00
 			.HS 0000
diff --git a/BIN/ASM.T.65816.A.txt b/BIN/ASM.T.65816.A.txt
index cf1424f4..9f55124a 100644
--- a/BIN/ASM.T.65816.A.txt
+++ b/BIN/ASM.T.65816.A.txt
@@ -3,6 +3,7 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.ADDR.MODES	.EQ *
+				>PSTR "#a"
 				>PSTR "(a)"
 				>PSTR "(a),Y"
 				>PSTR "(a,S),Y"
@@ -10,21 +11,18 @@ T.ADDR.MODES	.EQ *
 				>PSTR "[a]"
 				>PSTR "[a],Y"
 				>PSTR "a"
+				>PSTR "a,S"
 				>PSTR "a,X"
 				>PSTR "aa"
 				>PSTR "aa,X"
 				>PSTR "aa,Y"
 				>PSTR "aaa"
 				>PSTR "aaa,X"
-				>PSTR "i"
-				>PSTR "a,S"
-				>PSTR "r"
-				>PSTR "rr"
 				>PSTR "(aa)"
 				>PSTR "(aa,X)"
 				>PSTR "[aa]"
 				>PSTR "a,Y"
-				>PSTR "a,a"
+				>PSTR "a,b"
 				.HS 00
 *---------------------------------------
 T.REGISTERS		.EQ *
diff --git a/BIN/ASM.T.65816.O.txt b/BIN/ASM.T.65816.O.txt
index 054cd188..9a63b9f5 100644
--- a/BIN/ASM.T.65816.O.txt
+++ b/BIN/ASM.T.65816.O.txt
@@ -6,783 +6,783 @@ T.OPCODES	.EQ *
 ADC		.DA ADC.E+1-*
 			>PSTR "ADC"
 			.HS 01
-			>PSTR "72a"
+			>PSTR "69a"
 			.HS 02
-			>PSTR "71a"
+			>PSTR "72a"
 			.HS 03
-			>PSTR "73a"
+			>PSTR "71a"
 			.HS 04
-			>PSTR "61a"
+			>PSTR "73a"
 			.HS 05
-			>PSTR "67a"
+			>PSTR "61a"
 			.HS 06
-			>PSTR "77a"
+			>PSTR "67a"
 			.HS 07
-			>PSTR "65a"
+			>PSTR "77a"
 			.HS 08
-			>PSTR "75a"
+			>PSTR "65a"
 			.HS 09
-			>PSTR "6Daa"
-			.HS 0A
-			>PSTR "7Daa"
-			.HS 0B
-			>PSTR "79aa"
-			.HS 0C
-			>PSTR "6Faaa"
-			.HS 0D
-			>PSTR "7Faaa"
-			.HS 0E
-			>PSTR "69i"
-			.HS 0F
 			>PSTR "63a"
+			.HS 0A
+			>PSTR "75a"
+			.HS 0B
+			>PSTR "6Daa"
+			.HS 0C
+			>PSTR "7Daa"
+			.HS 0D
+			>PSTR "79aa"
+			.HS 0E
+			>PSTR "6Faaa"
+			.HS 0F
+			>PSTR "7Faaa"
 ADC.E	.HS 00
 AND		.DA AND.E+1-*
 			>PSTR "AND"
 			.HS 01
-			>PSTR "32a"
+			>PSTR "29a"
 			.HS 02
-			>PSTR "31a"
+			>PSTR "32a"
 			.HS 03
-			>PSTR "33a"
+			>PSTR "31a"
 			.HS 04
-			>PSTR "21a"
+			>PSTR "33a"
 			.HS 05
-			>PSTR "27a"
+			>PSTR "21a"
 			.HS 06
-			>PSTR "37a"
+			>PSTR "27a"
 			.HS 07
-			>PSTR "25a"
+			>PSTR "37a"
 			.HS 08
-			>PSTR "35a"
+			>PSTR "25a"
 			.HS 09
-			>PSTR "2Daa"
-			.HS 0A
-			>PSTR "3Daa"
-			.HS 0B
-			>PSTR "39aa"
-			.HS 0C
-			>PSTR "2Faaa"
-			.HS 0D
-			>PSTR "3Faaa"
-			.HS 0E
-			>PSTR "29i"
-			.HS 0F
 			>PSTR "23a"
+			.HS 0A
+			>PSTR "35a"
+			.HS 0B
+			>PSTR "2Daa"
+			.HS 0C
+			>PSTR "3Daa"
+			.HS 0D
+			>PSTR "39aa"
+			.HS 0E
+			>PSTR "2Faaa"
+			.HS 0F
+			>PSTR "3Faaa"
 AND.E	.HS 00
 ASL		.DA ASL.E+1-*
 			>PSTR "ASL"
-			.HS 07
-			>PSTR "06a"
 			.HS 08
-			>PSTR "16a"
-			.HS 09
-			>PSTR "0Eaa"
+			>PSTR "06a"
 			.HS 0A
+			>PSTR "16a"
+			.HS 0B
+			>PSTR "0Eaa"
+			.HS 0C
 			>PSTR "1Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "0A"
 ASL.E	.HS 00
 BCC		.DA BCC.E+1-*
 			>PSTR "BCC"
-			.HS 10
+			.HS 0B
 			>PSTR "90r"
 BCC.E	.HS 00
 BCS		.DA BCS.E+1-*
 			>PSTR "BCS"
-			.HS 10
+			.HS 0B
 			>PSTR "B0r"
 BCS.E	.HS 00
 BEQ		.DA BEQ.E+1-*
 			>PSTR "BEQ"
-			.HS 10
+			.HS 0B
 			>PSTR "F0r"
 BEQ.E	.HS 00
 BIT		.DA BIT.E+1-*
 			>PSTR "BIT"
-			.HS 07
-			>PSTR "24a"
+			.HS 01
+			>PSTR "89a"
 			.HS 08
-			>PSTR "34a"
-			.HS 09
-			>PSTR "2Caa"
+			>PSTR "24a"
 			.HS 0A
+			>PSTR "34a"
+			.HS 0B
+			>PSTR "2Caa"
+			.HS 0C
 			>PSTR "3Caa"
-			.HS 0E
-			>PSTR "89i"
 BIT.E	.HS 00
 BMI		.DA BMI.E+1-*
 			>PSTR "BMI"
-			.HS 10
+			.HS 0B
 			>PSTR "30r"
 BMI.E	.HS 00
 BNE		.DA BNE.E+1-*
 			>PSTR "BNE"
-			.HS 10
+			.HS 0B
 			>PSTR "D0r"
 BNE.E	.HS 00
 BPL		.DA BPL.E+1-*
 			>PSTR "BPL"
-			.HS 10
+			.HS 0B
 			>PSTR "10r"
 BPL.E	.HS 00
 BRA		.DA BRA.E+1-*
 			>PSTR "BRA"
-			.HS 10
+			.HS 0B
 			>PSTR "80r"
 BRA.E	.HS 00
 BRK		.DA BRK.E+1-*
 			>PSTR "BRK"
-			.HS 00
+			.HS FF
 			>PSTR "00"
 BRK.E	.HS 00
 BRL		.DA BRL.E+1-*
 			>PSTR "BRL"
-			.HS 11
+			.HS 0B
 			>PSTR "82rr"
 BRL.E	.HS 00
 BVC		.DA BVC.E+1-*
 			>PSTR "BVC"
-			.HS 10
+			.HS 0B
 			>PSTR "50r"
 BVC.E	.HS 00
 BVS		.DA BVS.E+1-*
 			>PSTR "BVS"
-			.HS 10
+			.HS 0B
 			>PSTR "70r"
 BVS.E	.HS 00
 CLC		.DA CLC.E+1-*
 			>PSTR "CLC"
-			.HS 00
+			.HS FF
 			>PSTR "18"
 CLC.E	.HS 00
 CLD		.DA CLD.E+1-*
 			>PSTR "CLD"
-			.HS 00
+			.HS FF
 			>PSTR "D8"
 CLD.E	.HS 00
 CLI		.DA CLI.E+1-*
 			>PSTR "CLI"
-			.HS 00
+			.HS FF
 			>PSTR "58"
 CLI.E	.HS 00
 CLV		.DA CLV.E+1-*
 			>PSTR "CLV"
-			.HS 00
+			.HS FF
 			>PSTR "B8"
 CLV.E	.HS 00
 CMP		.DA CMP.E+1-*
 			>PSTR "CMP"
 			.HS 01
-			>PSTR "D2a"
+			>PSTR "C9a"
 			.HS 02
-			>PSTR "D1a"
+			>PSTR "D2a"
 			.HS 03
-			>PSTR "D3a"
+			>PSTR "D1a"
 			.HS 04
-			>PSTR "C1a"
+			>PSTR "D3a"
 			.HS 05
-			>PSTR "C7a"
+			>PSTR "C1a"
 			.HS 06
-			>PSTR "D7a"
+			>PSTR "C7a"
 			.HS 07
-			>PSTR "C5a"
+			>PSTR "D7a"
 			.HS 08
-			>PSTR "D5a"
+			>PSTR "C5a"
 			.HS 09
-			>PSTR "CDaa"
-			.HS 0A
-			>PSTR "DDaa"
-			.HS 0B
-			>PSTR "D9aa"
-			.HS 0C
-			>PSTR "CFaaa"
-			.HS 0D
-			>PSTR "DFaaa"
-			.HS 0E
-			>PSTR "C9i"
-			.HS 0F
 			>PSTR "C3a"
+			.HS 0A
+			>PSTR "D5a"
+			.HS 0B
+			>PSTR "CDaa"
+			.HS 0C
+			>PSTR "DDaa"
+			.HS 0D
+			>PSTR "D9aa"
+			.HS 0E
+			>PSTR "CFaaa"
+			.HS 0F
+			>PSTR "DFaaa"
 CMP.E	.HS 00
 COP		.DA COP.E+1-*
 			>PSTR "COP"
-			.HS 0E
-			>PSTR "02i"
+			.HS 01
+			>PSTR "02a"
 COP.E	.HS 00
 CPX		.DA CPX.E+1-*
 			>PSTR "CPX"
-			.HS 07
+			.HS 01
+			>PSTR "E0a"
+			.HS 08
 			>PSTR "E4a"
-			.HS 09
+			.HS 0B
 			>PSTR "ECaa"
-			.HS 0E
-			>PSTR "E0i"
 CPX.E	.HS 00
 CPY		.DA CPY.E+1-*
 			>PSTR "CPY"
-			.HS 07
+			.HS 01
+			>PSTR "C0a"
+			.HS 08
 			>PSTR "C4a"
-			.HS 09
+			.HS 0B
 			>PSTR "CCaa"
-			.HS 0E
-			>PSTR "C0i"
 CPY.E	.HS 00
 DEC		.DA DEC.E+1-*
 			>PSTR "DEC"
-			.HS 07
-			>PSTR "C6a"
 			.HS 08
-			>PSTR "D6a"
-			.HS 09
-			>PSTR "CEaa"
+			>PSTR "C6a"
 			.HS 0A
+			>PSTR "D6a"
+			.HS 0B
+			>PSTR "CEaa"
+			.HS 0C
 			>PSTR "DEaa"
-			.HS 00
+			.HS FF
 			>PSTR "3A"
 DEC.E	.HS 00
 DEX		.DA DEX.E+1-*
 			>PSTR "DEX"
-			.HS 00
+			.HS FF
 			>PSTR "CA"
 DEX.E	.HS 00
 DEY		.DA DEY.E+1-*
 			>PSTR "DEY"
-			.HS 00
+			.HS FF
 			>PSTR "88"
 DEY.E	.HS 00
 EOR		.DA EOR.E+1-*
 			>PSTR "EOR"
 			.HS 01
-			>PSTR "52a"
+			>PSTR "49a"
 			.HS 02
-			>PSTR "51a"
+			>PSTR "52a"
 			.HS 03
-			>PSTR "53a"
+			>PSTR "51a"
 			.HS 04
-			>PSTR "41a"
+			>PSTR "53a"
 			.HS 05
-			>PSTR "47a"
+			>PSTR "41a"
 			.HS 06
-			>PSTR "57a"
+			>PSTR "47a"
 			.HS 07
-			>PSTR "45a"
+			>PSTR "57a"
 			.HS 08
-			>PSTR "55a"
+			>PSTR "45a"
 			.HS 09
-			>PSTR "4Daa"
-			.HS 0A
-			>PSTR "5Daa"
-			.HS 0B
-			>PSTR "59aa"
-			.HS 0C
-			>PSTR "4Faaa"
-			.HS 0D
-			>PSTR "5Faaa"
-			.HS 0E
-			>PSTR "49i"
-			.HS 0F
 			>PSTR "43a"
+			.HS 0A
+			>PSTR "55a"
+			.HS 0B
+			>PSTR "4Daa"
+			.HS 0C
+			>PSTR "5Daa"
+			.HS 0D
+			>PSTR "59aa"
+			.HS 0E
+			>PSTR "4Faaa"
+			.HS 0F
+			>PSTR "5Faaa"
 EOR.E	.HS 00
 INC		.DA INC.E+1-*
 			>PSTR "INC"
-			.HS 07
-			>PSTR "E6a"
 			.HS 08
-			>PSTR "F6a"
-			.HS 09
-			>PSTR "EEaa"
+			>PSTR "E6a"
 			.HS 0A
+			>PSTR "F6a"
+			.HS 0B
+			>PSTR "EEaa"
+			.HS 0C
 			>PSTR "FEaa"
-			.HS 00
+			.HS FF
 			>PSTR "1A"
 INC.E	.HS 00
 INX		.DA INX.E+1-*
 			>PSTR "INX"
-			.HS 00
+			.HS FF
 			>PSTR "E8"
 INX.E	.HS 00
 INY		.DA INY.E+1-*
 			>PSTR "INY"
-			.HS 00
+			.HS FF
 			>PSTR "C8"
 INY.E	.HS 00
 JMP		.DA JMP.E+1-*
 			>PSTR "JMP"
-			.HS 12
+			.HS 10
 			>PSTR "6Caa"
-			.HS 13
+			.HS 11
 			>PSTR "7Caa"
-			.HS 14
+			.HS 12
 			>PSTR "DCaa"
-			.HS 09
+			.HS 0B
 			>PSTR "4Caa"
-			.HS 0C
+			.HS 0E
 			>PSTR "5Caaa"
 JMP.E	.HS 00
 JSR		.DA JSR.E+1-*
 			>PSTR "JSR"
-			.HS 13
+			.HS 11
 			>PSTR "FCaa"
-			.HS 09
+			.HS 0B
 			>PSTR "20aa"
-			.HS 0C
+			.HS 0E
 			>PSTR "22aaa"
 JSR.E	.HS 00
 LDA		.DA LDA.E+1-*
 			>PSTR "LDA"
 			.HS 01
-			>PSTR "B2a"
+			>PSTR "A9a"
 			.HS 02
-			>PSTR "B1a"
+			>PSTR "B2a"
 			.HS 03
-			>PSTR "B3a"
+			>PSTR "B1a"
 			.HS 04
-			>PSTR "A1a"
+			>PSTR "B3a"
 			.HS 05
-			>PSTR "A7a"
+			>PSTR "A1a"
 			.HS 06
-			>PSTR "B7a"
+			>PSTR "A7a"
 			.HS 07
-			>PSTR "A5a"
+			>PSTR "B7a"
 			.HS 08
-			>PSTR "B5a"
+			>PSTR "A5a"
 			.HS 09
-			>PSTR "ADaa"
-			.HS 0A
-			>PSTR "BDaa"
-			.HS 0B
-			>PSTR "B9aa"
-			.HS 0C
-			>PSTR "AFaaa"
-			.HS 0D
-			>PSTR "BFaaa"
-			.HS 0E
-			>PSTR "A9i"
-			.HS 0F
 			>PSTR "A3a"
+			.HS 0A
+			>PSTR "B5a"
+			.HS 0B
+			>PSTR "ADaa"
+			.HS 0C
+			>PSTR "BDaa"
+			.HS 0D
+			>PSTR "B9aa"
+			.HS 0E
+			>PSTR "AFaaa"
+			.HS 0F
+			>PSTR "BFaaa"
 LDA.E	.HS 00
 LDX		.DA LDX.E+1-*
 			>PSTR "LDX"
-			.HS 07
+			.HS 01
+			>PSTR "A2a"
+			.HS 08
 			>PSTR "A6a"
-			.HS 15
+			.HS 13
 			>PSTR "B6a"
-			.HS 09
-			>PSTR "AEaa"
 			.HS 0B
+			>PSTR "AEaa"
+			.HS 0D
 			>PSTR "BEaa"
-			.HS 0E
-			>PSTR "A2i"
 LDX.E	.HS 00
 LDY		.DA LDY.E+1-*
 			>PSTR "LDY"
-			.HS 07
-			>PSTR "A4a"
+			.HS 01
+			>PSTR "A0a"
 			.HS 08
-			>PSTR "B4a"
-			.HS 09
-			>PSTR "ACaa"
+			>PSTR "A4a"
 			.HS 0A
+			>PSTR "B4a"
+			.HS 0B
+			>PSTR "ACaa"
+			.HS 0C
 			>PSTR "BCaa"
-			.HS 0E
-			>PSTR "A0i"
 LDY.E	.HS 00
 LSR		.DA LSR.E+1-*
 			>PSTR "LSR"
-			.HS 07
-			>PSTR "46a"
 			.HS 08
-			>PSTR "56a"
-			.HS 09
-			>PSTR "4Eaa"
+			>PSTR "46a"
 			.HS 0A
+			>PSTR "56a"
+			.HS 0B
+			>PSTR "4Eaa"
+			.HS 0C
 			>PSTR "5Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "4A"
 LSR.E	.HS 00
 MVN		.DA MVN.E+1-*
 			>PSTR "MVN"
-			.HS 16
-			>PSTR "54aa"
+			.HS 14
+			>PSTR "54ab"
 MVN.E	.HS 00
 MVP		.DA MVP.E+1-*
 			>PSTR "MVP"
-			.HS 16
-			>PSTR "44aa"
+			.HS 14
+			>PSTR "44ab"
 MVP.E	.HS 00
 NOP		.DA NOP.E+1-*
 			>PSTR "NOP"
-			.HS 00
+			.HS FF
 			>PSTR "EA"
 NOP.E	.HS 00
 ORA		.DA ORA.E+1-*
 			>PSTR "ORA"
 			.HS 01
-			>PSTR "12a"
+			>PSTR "09a"
 			.HS 02
-			>PSTR "11a"
+			>PSTR "12a"
 			.HS 03
-			>PSTR "13a"
+			>PSTR "11a"
 			.HS 04
-			>PSTR "01a"
+			>PSTR "13a"
 			.HS 05
-			>PSTR "07a"
+			>PSTR "01a"
 			.HS 06
-			>PSTR "17a"
+			>PSTR "07a"
 			.HS 07
-			>PSTR "05a"
+			>PSTR "17a"
 			.HS 08
-			>PSTR "15a"
+			>PSTR "05a"
 			.HS 09
-			>PSTR "0Daa"
-			.HS 0A
-			>PSTR "1Daa"
-			.HS 0B
-			>PSTR "19aa"
-			.HS 0C
-			>PSTR "0Faaa"
-			.HS 0D
-			>PSTR "1Faaa"
-			.HS 0E
-			>PSTR "09i"
-			.HS 0F
 			>PSTR "03a"
+			.HS 0A
+			>PSTR "15a"
+			.HS 0B
+			>PSTR "0Daa"
+			.HS 0C
+			>PSTR "1Daa"
+			.HS 0D
+			>PSTR "19aa"
+			.HS 0E
+			>PSTR "0Faaa"
+			.HS 0F
+			>PSTR "1Faaa"
 ORA.E	.HS 00
 PEA		.DA PEA.E+1-*
 			>PSTR "PEA"
-			.HS 09
+			.HS 0B
 			>PSTR "F4aa"
 PEA.E	.HS 00
 PEI		.DA PEI.E+1-*
 			>PSTR "PEI"
-			.HS 01
+			.HS 02
 			>PSTR "D4a"
 PEI.E	.HS 00
 PER		.DA PER.E+1-*
 			>PSTR "PER"
-			.HS 11
+			.HS 0B
 			>PSTR "62rr"
 PER.E	.HS 00
 PHA		.DA PHA.E+1-*
 			>PSTR "PHA"
-			.HS 00
+			.HS FF
 			>PSTR "48"
 PHA.E	.HS 00
 PHB		.DA PHB.E+1-*
 			>PSTR "PHB"
-			.HS 00
+			.HS FF
 			>PSTR "8B"
 PHB.E	.HS 00
 PHD		.DA PHD.E+1-*
 			>PSTR "PHD"
-			.HS 00
+			.HS FF
 			>PSTR "0B"
 PHD.E	.HS 00
 PHK		.DA PHK.E+1-*
 			>PSTR "PHK"
-			.HS 00
+			.HS FF
 			>PSTR "4B"
 PHK.E	.HS 00
 PHP		.DA PHP.E+1-*
 			>PSTR "PHP"
-			.HS 00
+			.HS FF
 			>PSTR "08"
 PHP.E	.HS 00
 PHX		.DA PHX.E+1-*
 			>PSTR "PHX"
-			.HS 00
+			.HS FF
 			>PSTR "DA"
 PHX.E	.HS 00
 PHY		.DA PHY.E+1-*
 			>PSTR "PHY"
-			.HS 00
+			.HS FF
 			>PSTR "5A"
 PHY.E	.HS 00
 PLA		.DA PLA.E+1-*
 			>PSTR "PLA"
-			.HS 00
+			.HS FF
 			>PSTR "68"
 PLA.E	.HS 00
 PLB		.DA PLB.E+1-*
 			>PSTR "PLB"
-			.HS 00
+			.HS FF
 			>PSTR "AB"
 PLB.E	.HS 00
 PLD		.DA PLD.E+1-*
 			>PSTR "PLD"
-			.HS 00
+			.HS FF
 			>PSTR "2B"
 PLD.E	.HS 00
 PLP		.DA PLP.E+1-*
 			>PSTR "PLP"
-			.HS 00
+			.HS FF
 			>PSTR "28"
 PLP.E	.HS 00
 PLX		.DA PLX.E+1-*
 			>PSTR "PLX"
-			.HS 00
+			.HS FF
 			>PSTR "FA"
 PLX.E	.HS 00
 PLY		.DA PLY.E+1-*
 			>PSTR "PLY"
-			.HS 00
+			.HS FF
 			>PSTR "7A"
 PLY.E	.HS 00
 REP		.DA REP.E+1-*
 			>PSTR "REP"
-			.HS 0E
-			>PSTR "C2i"
+			.HS 01
+			>PSTR "C2a"
 REP.E	.HS 00
 ROL		.DA ROL.E+1-*
 			>PSTR "ROL"
-			.HS 07
-			>PSTR "26a"
 			.HS 08
-			>PSTR "36a"
-			.HS 09
-			>PSTR "2Eaa"
+			>PSTR "26a"
 			.HS 0A
+			>PSTR "36a"
+			.HS 0B
+			>PSTR "2Eaa"
+			.HS 0C
 			>PSTR "3Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "2A"
 ROL.E	.HS 00
 ROR		.DA ROR.E+1-*
 			>PSTR "ROR"
-			.HS 07
-			>PSTR "66a"
 			.HS 08
-			>PSTR "76a"
-			.HS 09
-			>PSTR "6Eaa"
+			>PSTR "66a"
 			.HS 0A
+			>PSTR "76a"
+			.HS 0B
+			>PSTR "6Eaa"
+			.HS 0C
 			>PSTR "7Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "6A"
 ROR.E	.HS 00
 RTI		.DA RTI.E+1-*
 			>PSTR "RTI"
-			.HS 00
+			.HS FF
 			>PSTR "40"
 RTI.E	.HS 00
 RTL		.DA RTL.E+1-*
 			>PSTR "RTL"
-			.HS 00
+			.HS FF
 			>PSTR "6B"
 RTL.E	.HS 00
 RTS		.DA RTS.E+1-*
 			>PSTR "RTS"
-			.HS 00
+			.HS FF
 			>PSTR "60"
 RTS.E	.HS 00
 SBC		.DA SBC.E+1-*
 			>PSTR "SBC"
 			.HS 01
-			>PSTR "F2a"
+			>PSTR "E9a"
 			.HS 02
-			>PSTR "F1a"
+			>PSTR "F2a"
 			.HS 03
-			>PSTR "F3a"
+			>PSTR "F1a"
 			.HS 04
-			>PSTR "E1a"
+			>PSTR "F3a"
 			.HS 05
-			>PSTR "E7a"
+			>PSTR "E1a"
 			.HS 06
-			>PSTR "F7a"
+			>PSTR "E7a"
 			.HS 07
-			>PSTR "E5a"
+			>PSTR "F7a"
 			.HS 08
-			>PSTR "F5a"
+			>PSTR "E5a"
 			.HS 09
-			>PSTR "EDaa"
-			.HS 0A
-			>PSTR "FDaa"
-			.HS 0B
-			>PSTR "F9aa"
-			.HS 0C
-			>PSTR "EFaaa"
-			.HS 0D
-			>PSTR "FFaaa"
-			.HS 0E
-			>PSTR "E9i"
-			.HS 0F
 			>PSTR "E3a"
+			.HS 0A
+			>PSTR "F5a"
+			.HS 0B
+			>PSTR "EDaa"
+			.HS 0C
+			>PSTR "FDaa"
+			.HS 0D
+			>PSTR "F9aa"
+			.HS 0E
+			>PSTR "EFaaa"
+			.HS 0F
+			>PSTR "FFaaa"
 SBC.E	.HS 00
 SEC		.DA SEC.E+1-*
 			>PSTR "SEC"
-			.HS 00
+			.HS FF
 			>PSTR "38"
 SEC.E	.HS 00
 SED		.DA SED.E+1-*
 			>PSTR "SED"
-			.HS 00
+			.HS FF
 			>PSTR "F8"
 SED.E	.HS 00
 SEI		.DA SEI.E+1-*
 			>PSTR "SEI"
-			.HS 00
+			.HS FF
 			>PSTR "78"
 SEI.E	.HS 00
 SEP		.DA SEP.E+1-*
 			>PSTR "SEP"
-			.HS 00
+			.HS FF
 			>PSTR "E2"
 SEP.E	.HS 00
 STA		.DA STA.E+1-*
 			>PSTR "STA"
-			.HS 01
-			>PSTR "92a"
 			.HS 02
-			>PSTR "91a"
+			>PSTR "92a"
 			.HS 03
-			>PSTR "93a"
+			>PSTR "91a"
 			.HS 04
-			>PSTR "81a"
+			>PSTR "93a"
 			.HS 05
-			>PSTR "87a"
+			>PSTR "81a"
 			.HS 06
-			>PSTR "97a"
+			>PSTR "87a"
 			.HS 07
-			>PSTR "85a"
+			>PSTR "97a"
 			.HS 08
-			>PSTR "95a"
+			>PSTR "85a"
 			.HS 09
-			>PSTR "8Daa"
-			.HS 0A
-			>PSTR "9Daa"
-			.HS 0B
-			>PSTR "99aa"
-			.HS 0C
-			>PSTR "8Faaa"
-			.HS 0D
-			>PSTR "9Faaa"
-			.HS 0F
 			>PSTR "83a"
+			.HS 0A
+			>PSTR "95a"
+			.HS 0B
+			>PSTR "8Daa"
+			.HS 0C
+			>PSTR "9Daa"
+			.HS 0D
+			>PSTR "99aa"
+			.HS 0E
+			>PSTR "8Faaa"
+			.HS 0F
+			>PSTR "9Faaa"
 STA.E	.HS 00
 STP		.DA STP.E+1-*
 			>PSTR "STP"
-			.HS 00
+			.HS FF
 			>PSTR "DB"
 STP.E	.HS 00
 STX		.DA STX.E+1-*
 			>PSTR "STX"
-			.HS 07
+			.HS 08
 			>PSTR "86a"
-			.HS 15
+			.HS 13
 			>PSTR "96a"
-			.HS 09
+			.HS 0B
 			>PSTR "8Eaa"
 STX.E	.HS 00
 STY		.DA STY.E+1-*
 			>PSTR "STY"
-			.HS 07
-			>PSTR "84a"
 			.HS 08
+			>PSTR "84a"
+			.HS 0A
 			>PSTR "94a"
-			.HS 09
+			.HS 0B
 			>PSTR "8Caa"
 STY.E	.HS 00
 STZ		.DA STZ.E+1-*
 			>PSTR "STZ"
-			.HS 07
-			>PSTR "64a"
 			.HS 08
-			>PSTR "74a"
-			.HS 09
-			>PSTR "9Caa"
+			>PSTR "64a"
 			.HS 0A
+			>PSTR "74a"
+			.HS 0B
+			>PSTR "9Caa"
+			.HS 0C
 			>PSTR "9Eaa"
 STZ.E	.HS 00
 TAX		.DA TAX.E+1-*
 			>PSTR "TAX"
-			.HS 00
+			.HS FF
 			>PSTR "AA"
 TAX.E	.HS 00
 TAY		.DA TAY.E+1-*
 			>PSTR "TAY"
-			.HS 00
+			.HS FF
 			>PSTR "A8"
 TAY.E	.HS 00
 TCD		.DA TCD.E+1-*
 			>PSTR "TCD"
-			.HS 00
+			.HS FF
 			>PSTR "5B"
 TCD.E	.HS 00
 TCS		.DA TCS.E+1-*
 			>PSTR "TCS"
-			.HS 00
+			.HS FF
 			>PSTR "1B"
 TCS.E	.HS 00
 TDC		.DA TDC.E+1-*
 			>PSTR "TDC"
-			.HS 00
+			.HS FF
 			>PSTR "7B"
 TDC.E	.HS 00
 TRB		.DA TRB.E+1-*
 			>PSTR "TRB"
-			.HS 07
+			.HS 08
 			>PSTR "14a"
-			.HS 09
+			.HS 0B
 			>PSTR "1Caa"
 TRB.E	.HS 00
 TSB		.DA TSB.E+1-*
 			>PSTR "TSB"
-			.HS 07
+			.HS 08
 			>PSTR "04a"
-			.HS 09
+			.HS 0B
 			>PSTR "0Caa"
 TSB.E	.HS 00
 TSC		.DA TSC.E+1-*
 			>PSTR "TSC"
-			.HS 00
+			.HS FF
 			>PSTR "3B"
 TSC.E	.HS 00
 TSX		.DA TSX.E+1-*
 			>PSTR "TSX"
-			.HS 00
+			.HS FF
 			>PSTR "BA"
 TSX.E	.HS 00
 TXA		.DA TXA.E+1-*
 			>PSTR "TXA"
-			.HS 00
+			.HS FF
 			>PSTR "8A"
 TXA.E	.HS 00
 TXS		.DA TXS.E+1-*
 			>PSTR "TXS"
-			.HS 00
+			.HS FF
 			>PSTR "9A"
 TXS.E	.HS 00
 TXY		.DA TXY.E+1-*
 			>PSTR "TXY"
-			.HS 00
+			.HS FF
 			>PSTR "9B"
 TXY.E	.HS 00
 TYA		.DA TYA.E+1-*
 			>PSTR "TYA"
-			.HS 00
+			.HS FF
 			>PSTR "98"
 TYA.E	.HS 00
 TYX		.DA TYX.E+1-*
 			>PSTR "TYX"
-			.HS 00
+			.HS FF
 			>PSTR "BB"
 TYX.E	.HS 00
 WAI		.DA WAI.E+1-*
 			>PSTR "WAI"
-			.HS 00
+			.HS FF
 			>PSTR "CB"
 WAI.E	.HS 00
 WDM		.DA WDM.E+1-*
 			>PSTR "WDM"
-			.HS 00
+			.HS FF
 			>PSTR "42"
 WDM.E	.HS 00
 XBA		.DA XBA.E+1-*
 			>PSTR "XBA"
-			.HS 00
+			.HS FF
 			>PSTR "EB"
 XBA.E	.HS 00
 XCE		.DA XCE.E+1-*
 			>PSTR "XCE"
-			.HS 00
+			.HS FF
 			>PSTR "FB"
 XCE.E		.HS 00
 			.HS 0000
diff --git a/BIN/ASM.T.65C02.A.txt b/BIN/ASM.T.65C02.A.txt
index c762e14b..86c0dc18 100644
--- a/BIN/ASM.T.65C02.A.txt
+++ b/BIN/ASM.T.65C02.A.txt
@@ -3,6 +3,7 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.ADDR.MODES	.EQ *
+				>PSTR "#a"
 				>PSTR "(a)"
 				>PSTR "(a),Y"
 				>PSTR "(a,X)"
@@ -11,8 +12,6 @@ T.ADDR.MODES	.EQ *
 				>PSTR "aa"
 				>PSTR "aa,X"
 				>PSTR "aa,Y"
-				>PSTR "i"
-				>PSTR "r"
 				>PSTR "(aa)"
 				>PSTR "(aa,X)"
 				>PSTR "a,Y"
diff --git a/BIN/ASM.T.65C02.O.txt b/BIN/ASM.T.65C02.O.txt
index bf1f60ac..cebd400f 100644
--- a/BIN/ASM.T.65C02.O.txt
+++ b/BIN/ASM.T.65C02.O.txt
@@ -6,551 +6,561 @@ T.OPCODES	.EQ *
 ADC		.DA ADC.E+1-*
 			>PSTR "ADC"
 			.HS 01
-			>PSTR "72a"
+			>PSTR "69a"
 			.HS 02
-			>PSTR "71a"
+			>PSTR "72a"
 			.HS 03
-			>PSTR "61a"
+			>PSTR "71a"
 			.HS 04
-			>PSTR "65a"
+			>PSTR "61a"
 			.HS 05
-			>PSTR "75a"
+			>PSTR "65a"
 			.HS 06
-			>PSTR "6Daa"
+			>PSTR "75a"
 			.HS 07
-			>PSTR "7Daa"
+			>PSTR "6Daa"
 			.HS 08
-			>PSTR "79aa"
+			>PSTR "7Daa"
 			.HS 09
-			>PSTR "69i"
+			>PSTR "79aa"
 ADC.E	.HS 00
 AND		.DA AND.E+1-*
 			>PSTR "AND"
 			.HS 01
-			>PSTR "32a"
+			>PSTR "29a"
 			.HS 02
-			>PSTR "31a"
+			>PSTR "32a"
 			.HS 03
-			>PSTR "21a"
+			>PSTR "31a"
 			.HS 04
-			>PSTR "25a"
+			>PSTR "21a"
 			.HS 05
-			>PSTR "35a"
+			>PSTR "25a"
 			.HS 06
-			>PSTR "2Daa"
+			>PSTR "35a"
 			.HS 07
-			>PSTR "3Daa"
+			>PSTR "2Daa"
 			.HS 08
-			>PSTR "39aa"
+			>PSTR "3Daa"
 			.HS 09
-			>PSTR "29i"
+			>PSTR "39aa"
 AND.E	.HS 00
 ASL		.DA ASL.E+1-*
 			>PSTR "ASL"
-			.HS 04
-			>PSTR "06a"
 			.HS 05
-			>PSTR "16a"
+			>PSTR "06a"
 			.HS 06
-			>PSTR "0Eaa"
+			>PSTR "16a"
 			.HS 07
+			>PSTR "0Eaa"
+			.HS 08
 			>PSTR "1Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "0A"
 ASL.E	.HS 00
 BCC		.DA BCC.E+1-*
 			>PSTR "BCC"
-			.HS 0A
+			.HS 07
 			>PSTR "90r"
 BCC.E	.HS 00
 BCS		.DA BCS.E+1-*
 			>PSTR "BCS"
-			.HS 0A
+			.HS 07
 			>PSTR "B0r"
 BCS.E	.HS 00
 BEQ		.DA BEQ.E+1-*
 			>PSTR "BEQ"
-			.HS 0A
+			.HS 07
 			>PSTR "F0r"
 BEQ.E	.HS 00
 BIT		.DA BIT.E+1-*
 			>PSTR "BIT"
-			.HS 04
-			>PSTR "24a"
+			.HS 01
+			>PSTR "89a"
 			.HS 05
-			>PSTR "34a"
+			>PSTR "24a"
 			.HS 06
-			>PSTR "2Caa"
+			>PSTR "34a"
 			.HS 07
+			>PSTR "2Caa"
+			.HS 08
 			>PSTR "3Caa"
-			.HS 09
-			>PSTR "89i"
 BIT.E	.HS 00
 BMI		.DA BMI.E+1-*
 			>PSTR "BMI"
-			.HS 0A
+			.HS 07
 			>PSTR "30r"
 BMI.E	.HS 00
 BNE		.DA BNE.E+1-*
 			>PSTR "BNE"
-			.HS 0A
+			.HS 07
 			>PSTR "D0r"
 BNE.E	.HS 00
 BPL		.DA BPL.E+1-*
 			>PSTR "BPL"
-			.HS 0A
+			.HS 07
 			>PSTR "10r"
 BPL.E	.HS 00
 BRA		.DA BRA.E+1-*
 			>PSTR "BRA"
-			.HS 0A
+			.HS 07
 			>PSTR "80r"
 BRA.E	.HS 00
 BRK		.DA BRK.E+1-*
 			>PSTR "BRK"
-			.HS 00
+			.HS FF
 			>PSTR "00"
 BRK.E	.HS 00
 BVC		.DA BVC.E+1-*
 			>PSTR "BVC"
-			.HS 0A
+			.HS 07
 			>PSTR "50r"
 BVC.E	.HS 00
 BVS		.DA BVS.E+1-*
 			>PSTR "BVS"
-			.HS 0A
+			.HS 07
 			>PSTR "70r"
 BVS.E	.HS 00
 CLC		.DA CLC.E+1-*
 			>PSTR "CLC"
-			.HS 00
+			.HS FF
 			>PSTR "18"
 CLC.E	.HS 00
 CLD		.DA CLD.E+1-*
 			>PSTR "CLD"
-			.HS 00
+			.HS FF
 			>PSTR "D8"
 CLD.E	.HS 00
 CLI		.DA CLI.E+1-*
 			>PSTR "CLI"
-			.HS 00
+			.HS FF
 			>PSTR "58"
 CLI.E	.HS 00
 CLV		.DA CLV.E+1-*
 			>PSTR "CLV"
-			.HS 00
+			.HS FF
 			>PSTR "B8"
 CLV.E	.HS 00
 CMP		.DA CMP.E+1-*
 			>PSTR "CMP"
 			.HS 01
-			>PSTR "D2a"
+			>PSTR "C9a"
 			.HS 02
-			>PSTR "D1a"
+			>PSTR "D2a"
 			.HS 03
-			>PSTR "C1a"
+			>PSTR "D1a"
 			.HS 04
-			>PSTR "C5a"
+			>PSTR "C1a"
 			.HS 05
-			>PSTR "D5a"
+			>PSTR "C5a"
 			.HS 06
-			>PSTR "CDaa"
+			>PSTR "D5a"
 			.HS 07
-			>PSTR "DDaa"
+			>PSTR "CDaa"
 			.HS 08
-			>PSTR "D9aa"
+			>PSTR "DDaa"
 			.HS 09
-			>PSTR "C9i"
+			>PSTR "D9aa"
 CMP.E	.HS 00
 CPX		.DA CPX.E+1-*
 			>PSTR "CPX"
-			.HS 04
+			.HS 01
+			>PSTR "E0a"
+			.HS 05
 			>PSTR "E4a"
-			.HS 06
-			>PSTR "Ecaa"
-			.HS 09
-			>PSTR "E0i"
+			.HS 07
+			>PSTR "ECaa"
 CPX.E	.HS 00
 CPY		.DA CPY.E+1-*
 			>PSTR "CPY"
-			.HS 04
+			.HS 01
+			>PSTR "C0a"
+			.HS 05
 			>PSTR "C4a"
-			.HS 06
-			>PSTR "Ccaa"
-			.HS 09
-			>PSTR "C0i"
+			.HS 07
+			>PSTR "CCaa"
 CPY.E	.HS 00
 DEC		.DA DEC.E+1-*
 			>PSTR "DEC"
-			.HS 00
-			>PSTR "3A"
-			.HS 04
-			>PSTR "C6a"
 			.HS 05
-			>PSTR "D6a"
+			>PSTR "C6a"
 			.HS 06
-			>PSTR "Ceaa"
+			>PSTR "D6a"
 			.HS 07
-			>PSTR "Deaa"
+			>PSTR "CEaa"
+			.HS 08
+			>PSTR "DEaa"
+			.HS FF
+			>PSTR "3A"
 DEC.E	.HS 00
 DEX		.DA DEX.E+1-*
 			>PSTR "DEX"
-			.HS 00
+			.HS FF
 			>PSTR "CA"
 DEX.E	.HS 00
 DEY		.DA DEY.E+1-*
 			>PSTR "DEY"
-			.HS 00
+			.HS FF
 			>PSTR "88"
 DEY.E	.HS 00
 EOR		.DA EOR.E+1-*
 			>PSTR "EOR"
 			.HS 01
-			>PSTR "52a"
+			>PSTR "49a"
 			.HS 02
-			>PSTR "51a"
+			>PSTR "52a"
 			.HS 03
-			>PSTR "41a"
+			>PSTR "51a"
 			.HS 04
-			>PSTR "45a"
+			>PSTR "41a"
 			.HS 05
-			>PSTR "55a"
+			>PSTR "45a"
 			.HS 06
-			>PSTR "4Daa"
+			>PSTR "55a"
 			.HS 07
-			>PSTR "5Daa"
+			>PSTR "4Daa"
 			.HS 08
-			>PSTR "59aa"
+			>PSTR "5Daa"
 			.HS 09
-			>PSTR "49i"
+			>PSTR "59aa"
 EOR.E	.HS 00
 INC		.DA INC.E+1-*
 			>PSTR "INC"
-			.HS 00
-			>PSTR "1A"
-			.HS 04
-			>PSTR "E6a"
 			.HS 05
-			>PSTR "F6a"
+			>PSTR "E6a"
 			.HS 06
-			>PSTR "Eeaa"
+			>PSTR "F6a"
 			.HS 07
-			>PSTR "Feaa"
+			>PSTR "EEaa"
+			.HS 08
+			>PSTR "FEaa"
+			.HS FF
+			>PSTR "1A"
 INC.E	.HS 00
 INX		.DA INX.E+1-*
 			>PSTR "INX"
-			.HS 00
+			.HS FF
 			>PSTR "E8"
 INX.E	.HS 00
 INY		.DA INY.E+1-*
 			>PSTR "INY"
-			.HS 00
+			.HS FF
 			>PSTR "C8"
 INY.E	.HS 00
 JMP		.DA JMP.E+1-*
 			>PSTR "JMP"
-			.HS 0B
+			.HS 0A
 			>PSTR "6Caa"
-			.HS 0C
+			.HS 0B
 			>PSTR "7Caa"
-			.HS 06
+			.HS 07
 			>PSTR "4Caa"
 JMP.E	.HS 00
 JSR		.DA JSR.E+1-*
 			>PSTR "JSR"
-			.HS 06
+			.HS 07
 			>PSTR "20aa"
 JSR.E	.HS 00
 LDA		.DA LDA.E+1-*
 			>PSTR "LDA"
 			.HS 01
-			>PSTR "B2a"
+			>PSTR "A9a"
 			.HS 02
-			>PSTR "B1a"
+			>PSTR "B2a"
 			.HS 03
-			>PSTR "A1a"
+			>PSTR "B1a"
 			.HS 04
-			>PSTR "A5a"
+			>PSTR "A1a"
 			.HS 05
-			>PSTR "B5a"
+			>PSTR "A5a"
 			.HS 06
-			>PSTR "Adaa"
+			>PSTR "B5a"
 			.HS 07
-			>PSTR "Bdaa"
+			>PSTR "ADaa"
 			.HS 08
-			>PSTR "B9aa"
+			>PSTR "BDaa"
 			.HS 09
-			>PSTR "A9i"
+			>PSTR "B9aa"
 LDA.E	.HS 00
 LDX		.DA LDX.E+1-*
 			>PSTR "LDX"
-			.HS 04
+			.HS 01
+			>PSTR "A2a"
+			.HS 05
 			>PSTR "A6a"
-			.HS 0D
+			.HS 0C
 			>PSTR "B6a"
-			.HS 06
-			>PSTR "Aeaa"
-			.HS 08
-			>PSTR "Beaa"
+			.HS 07
+			>PSTR "AEaa"
 			.HS 09
-			>PSTR "A2i"
+			>PSTR "BEaa"
 LDX.E	.HS 00
 LDY		.DA LDY.E+1-*
 			>PSTR "LDY"
-			.HS 04
-			>PSTR "A4a"
+			.HS 01
+			>PSTR "A0a"
 			.HS 05
-			>PSTR "B4a"
+			>PSTR "A4a"
 			.HS 06
-			>PSTR "Acaa"
+			>PSTR "B4a"
 			.HS 07
-			>PSTR "Bcaa"
-			.HS 09
-			>PSTR "A0i"
+			>PSTR "ACaa"
+			.HS 08
+			>PSTR "BCaa"
 LDY.E	.HS 00
 LSR		.DA LSR.E+1-*
 			>PSTR "LSR"
-			.HS 04
-			>PSTR "46a"
 			.HS 05
-			>PSTR "56a"
+			>PSTR "46a"
 			.HS 06
-			>PSTR "4Eaa"
+			>PSTR "56a"
 			.HS 07
+			>PSTR "4Eaa"
+			.HS 08
 			>PSTR "5Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "4A"
 LSR.E	.HS 00
 NOP		.DA NOP.E+1-*
 			>PSTR "NOP"
-			.HS 00
+			.HS FF
 			>PSTR "EA"
 NOP.E	.HS 00
 ORA		.DA ORA.E+1-*
 			>PSTR "ORA"
 			.HS 01
-			>PSTR "12a"
+			>PSTR "09a"
 			.HS 02
-			>PSTR "11a"
+			>PSTR "12a"
 			.HS 03
-			>PSTR "01a"
+			>PSTR "11a"
 			.HS 04
-			>PSTR "05a"
+			>PSTR "01a"
 			.HS 05
-			>PSTR "15a"
+			>PSTR "05a"
 			.HS 06
-			>PSTR "0Daa"
+			>PSTR "15a"
 			.HS 07
-			>PSTR "1Daa"
+			>PSTR "0Daa"
 			.HS 08
-			>PSTR "19aa"
+			>PSTR "1Daa"
 			.HS 09
-			>PSTR "09i"
+			>PSTR "19aa"
 ORA.E	.HS 00
 PHA		.DA PHA.E+1-*
 			>PSTR "PHA"
-			.HS 00
+			.HS FF
 			>PSTR "48"
 PHA.E	.HS 00
 PHP		.DA PHP.E+1-*
 			>PSTR "PHP"
-			.HS 00
+			.HS FF
 			>PSTR "08"
 PHP.E	.HS 00
 PHX		.DA PHX.E+1-*
 			>PSTR "PHX"
-			.HS 00
+			.HS FF
 			>PSTR "DA"
 PHX.E	.HS 00
 PHY		.DA PHY.E+1-*
 			>PSTR "PHY"
-			.HS 00
+			.HS FF
 			>PSTR "5A"
 PHY.E	.HS 00
 PLA		.DA PLA.E+1-*
 			>PSTR "PLA"
-			.HS 00
+			.HS FF
 			>PSTR "68"
 PLA.E	.HS 00
 PLP		.DA PLP.E+1-*
 			>PSTR "PLP"
-			.HS 00
+			.HS FF
 			>PSTR "28"
 PLP.E	.HS 00
 PLX		.DA PLX.E+1-*
 			>PSTR "PLX"
-			.HS 00
+			.HS FF
 			>PSTR "FA"
 PLX.E	.HS 00
 PLY		.DA PLY.E+1-*
 			>PSTR "PLY"
-			.HS 00
+			.HS FF
 			>PSTR "7A"
 PLY.E	.HS 00
 ROL		.DA ROL.E+1-*
 			>PSTR "ROL"
-			.HS 04
-			>PSTR "26a"
 			.HS 05
-			>PSTR "36a"
+			>PSTR "26a"
 			.HS 06
-			>PSTR "2Eaa"
+			>PSTR "36a"
 			.HS 07
+			>PSTR "2Eaa"
+			.HS 08
 			>PSTR "3Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "2A"
 ROL.E	.HS 00
 ROR		.DA ROR.E+1-*
 			>PSTR "ROR"
-			.HS 04
-			>PSTR "66a"
 			.HS 05
-			>PSTR "76a"
+			>PSTR "66a"
 			.HS 06
-			>PSTR "6Eaa"
+			>PSTR "76a"
 			.HS 07
+			>PSTR "6Eaa"
+			.HS 08
 			>PSTR "7Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "6A"
 ROR.E	.HS 00
 RTI		.DA RTI.E+1-*
 			>PSTR "RTI"
-			.HS 00
+			.HS FF
 			>PSTR "40"
 RTI.E	.HS 00
 RTS		.DA RTS.E+1-*
 			>PSTR "RTS"
-			.HS 00
+			.HS FF
 			>PSTR "60"
 RTS.E	.HS 00
 SBC		.DA SBC.E+1-*
 			>PSTR "SBC"
 			.HS 01
-			>PSTR "F2a"
+			>PSTR "E9a"
 			.HS 02
-			>PSTR "F1a"
+			>PSTR "F2a"
 			.HS 03
-			>PSTR "E1a"
+			>PSTR "F1a"
 			.HS 04
-			>PSTR "E5a"
+			>PSTR "E1a"
 			.HS 05
-			>PSTR "F5a"
+			>PSTR "E5a"
 			.HS 06
-			>PSTR "Edaa"
+			>PSTR "F5a"
 			.HS 07
-			>PSTR "Fdaa"
+			>PSTR "EDaa"
 			.HS 08
-			>PSTR "F9aa"
+			>PSTR "FDaa"
 			.HS 09
-			>PSTR "E9i"
+			>PSTR "F9aa"
 SBC.E	.HS 00
 SEC		.DA SEC.E+1-*
 			>PSTR "SEC"
-			.HS 00
+			.HS FF
 			>PSTR "38"
 SEC.E	.HS 00
 SED		.DA SED.E+1-*
 			>PSTR "SED"
-			.HS 00
+			.HS FF
 			>PSTR "F8"
 SED.E	.HS 00
 SEI		.DA SEI.E+1-*
 			>PSTR "SEI"
-			.HS 00
+			.HS FF
 			>PSTR "78"
 SEI.E	.HS 00
 STA		.DA STA.E+1-*
 			>PSTR "STA"
-			.HS 01
-			>PSTR "92a"
 			.HS 02
-			>PSTR "91a"
+			>PSTR "92a"
 			.HS 03
-			>PSTR "81a"
+			>PSTR "91a"
 			.HS 04
-			>PSTR "85a"
+			>PSTR "81a"
 			.HS 05
-			>PSTR "95a"
+			>PSTR "85a"
 			.HS 06
-			>PSTR "8Daa"
+			>PSTR "95a"
 			.HS 07
-			>PSTR "9Daa"
+			>PSTR "8Daa"
 			.HS 08
+			>PSTR "9Daa"
+			.HS 09
 			>PSTR "99aa"
 STA.E	.HS 00
+STP		.DA STP.E+1-*
+			>PSTR "STP"
+			.HS FF
+			>PSTR "DB"
+STP.E	.HS 00
 STX		.DA STX.E+1-*
 			>PSTR "STX"
-			.HS 04
+			.HS 05
 			>PSTR "86a"
-			.HS 0D
+			.HS 0C
 			>PSTR "96a"
-			.HS 06
+			.HS 07
 			>PSTR "8Eaa"
 STX.E	.HS 00
 STY		.DA STY.E+1-*
 			>PSTR "STY"
-			.HS 04
-			>PSTR "84a"
 			.HS 05
-			>PSTR "94a"
+			>PSTR "84a"
 			.HS 06
+			>PSTR "94a"
+			.HS 07
 			>PSTR "8Caa"
 STY.E	.HS 00
 STZ		.DA STZ.E+1-*
 			>PSTR "STZ"
-			.HS 04
-			>PSTR "64a"
 			.HS 05
-			>PSTR "74a"
+			>PSTR "64a"
 			.HS 06
-			>PSTR "9Caa"
+			>PSTR "74a"
 			.HS 07
+			>PSTR "9Caa"
+			.HS 08
 			>PSTR "9Eaa"
 STZ.E	.HS 00
 TAX		.DA TAX.E+1-*
 			>PSTR "TAX"
-			.HS 00
+			.HS FF
 			>PSTR "AA"
 TAX.E	.HS 00
 TAY		.DA TAY.E+1-*
 			>PSTR "TAY"
-			.HS 00
+			.HS FF
 			>PSTR "A8"
 TAY.E	.HS 00
 TRB		.DA TRB.E+1-*
 			>PSTR "TRB"
-			.HS 04
+			.HS 05
 			>PSTR "14a"
-			.HS 06
+			.HS 07
 			>PSTR "1Caa"
 TRB.E	.HS 00
 TSB		.DA TSB.E+1-*
 			>PSTR "TSB"
-			.HS 04
+			.HS 05
 			>PSTR "04a"
-			.HS 06
+			.HS 07
 			>PSTR "0Caa"
 TSB.E	.HS 00
 TSX		.DA TSX.E+1-*
 			>PSTR "TSX"
-			.HS 00
+			.HS FF
 			>PSTR "BA"
 TSX.E	.HS 00
 TXA		.DA TXA.E+1-*
 			>PSTR "TXA"
-			.HS 00
+			.HS FF
 			>PSTR "8A"
 TXA.E	.HS 00
 TXS		.DA TXS.E+1-*
 			>PSTR "TXS"
-			.HS 00
+			.HS FF
 			>PSTR "9A"
 TXS.E	.HS 00
 TYA		.DA TYA.E+1-*
 			>PSTR "TYA"
-			.HS 00
+			.HS FF
 			>PSTR "98"
-TYA.E		.HS 00
+TYA.E	.HS 00
+WAI		.DA WAI.E+1-*
+			>PSTR "WAI"
+			.HS FF
+			>PSTR "CB"
+WAI.E		.HS 00
 			.HS 0000
 *---------------------------------------
 MAN
diff --git a/BIN/ASM.T.65R02.A.txt b/BIN/ASM.T.65R02.A.txt
index 0bb8a475..3e4f8934 100644
--- a/BIN/ASM.T.65R02.A.txt
+++ b/BIN/ASM.T.65R02.A.txt
@@ -3,6 +3,7 @@ PREFIX /A2OSX.BUILD
 AUTO 4,1
 *---------------------------------------
 T.ADDR.MODES	.EQ *
+				>PSTR "#a"
 				>PSTR "(a)"
 				>PSTR "(a),Y"
 				>PSTR "(a,X)"
@@ -11,9 +12,7 @@ T.ADDR.MODES	.EQ *
 				>PSTR "aa"
 				>PSTR "aa,X"
 				>PSTR "aa,Y"
-				>PSTR "i"
-				>PSTR "a,r"
-				>PSTR "r"
+				>PSTR "a,bb"
 				>PSTR "(aa)"
 				>PSTR "(aa,x)"
 				>PSTR "a,Y"
diff --git a/BIN/ASM.T.65R02.O.txt b/BIN/ASM.T.65R02.O.txt
index b061bf8b..ec390c64 100644
--- a/BIN/ASM.T.65R02.O.txt
+++ b/BIN/ASM.T.65R02.O.txt
@@ -6,56 +6,56 @@ T.OPCODES	.EQ *
 ADC		.DA ADC.E+1-*
 			>PSTR "ADC"
 			.HS 01
-			>PSTR "72a"
+			>PSTR "69a"
 			.HS 02
-			>PSTR "71a"
+			>PSTR "72a"
 			.HS 03
-			>PSTR "61a"
+			>PSTR "71a"
 			.HS 04
-			>PSTR "65a"
+			>PSTR "61a"
 			.HS 05
-			>PSTR "75a"
+			>PSTR "65a"
 			.HS 06
-			>PSTR "6Daa"
+			>PSTR "75a"
 			.HS 07
-			>PSTR "7Daa"
+			>PSTR "6Daa"
 			.HS 08
-			>PSTR "79aa"
+			>PSTR "7Daa"
 			.HS 09
-			>PSTR "69i"
+			>PSTR "79aa"
 ADC.E	.HS 00
 AND		.DA AND.E+1-*
 			>PSTR "AND"
 			.HS 01
-			>PSTR "32a"
+			>PSTR "29a"
 			.HS 02
-			>PSTR "31a"
+			>PSTR "32a"
 			.HS 03
-			>PSTR "21a"
+			>PSTR "31a"
 			.HS 04
-			>PSTR "25a"
+			>PSTR "21a"
 			.HS 05
-			>PSTR "35a"
+			>PSTR "25a"
 			.HS 06
-			>PSTR "2Daa"
+			>PSTR "35a"
 			.HS 07
-			>PSTR "3Daa"
+			>PSTR "2Daa"
 			.HS 08
-			>PSTR "39aa"
+			>PSTR "3Daa"
 			.HS 09
-			>PSTR "29i"
+			>PSTR "39aa"
 AND.E	.HS 00
 ASL		.DA ASL.E+1-*
 			>PSTR "ASL"
-			.HS 04
-			>PSTR "06a"
 			.HS 05
-			>PSTR "16a"
+			>PSTR "06a"
 			.HS 06
-			>PSTR "0Eaa"
+			>PSTR "16a"
 			.HS 07
+			>PSTR "0Eaa"
+			.HS 08
 			>PSTR "1Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "0A"
 ASL.E	.HS 00
 BBR0		.DA BBR0.E+1-*
@@ -140,575 +140,575 @@ BBS7		.DA BBS7.E+1-*
 BBS7.E	.HS 00
 BCC		.DA BCC.E+1-*
 			>PSTR "BCC"
-			.HS 0B
+			.HS 07
 			>PSTR "90r"
 BCC.E	.HS 00
 BCS		.DA BCS.E+1-*
 			>PSTR "BCS"
-			.HS 0B
+			.HS 07
 			>PSTR "B0r"
 BCS.E	.HS 00
 BEQ		.DA BEQ.E+1-*
 			>PSTR "BEQ"
-			.HS 0B
+			.HS 07
 			>PSTR "F0r"
 BEQ.E	.HS 00
 BIT		.DA BIT.E+1-*
 			>PSTR "BIT"
-			.HS 04
-			>PSTR "24a"
+			.HS 01
+			>PSTR "89a"
 			.HS 05
-			>PSTR "34a"
+			>PSTR "24a"
 			.HS 06
-			>PSTR "2Caa"
+			>PSTR "34a"
 			.HS 07
+			>PSTR "2Caa"
+			.HS 08
 			>PSTR "3Caa"
-			.HS 09
-			>PSTR "89i"
 BIT.E	.HS 00
 BMI		.DA BMI.E+1-*
 			>PSTR "BMI"
-			.HS 0B
+			.HS 07
 			>PSTR "30r"
 BMI.E	.HS 00
 BNE		.DA BNE.E+1-*
 			>PSTR "BNE"
-			.HS 0B
+			.HS 07
 			>PSTR "D0r"
 BNE.E	.HS 00
 BPL		.DA BPL.E+1-*
 			>PSTR "BPL"
-			.HS 0B
+			.HS 07
 			>PSTR "10r"
 BPL.E	.HS 00
 BRA		.DA BRA.E+1-*
 			>PSTR "BRA"
-			.HS 0B
+			.HS 07
 			>PSTR "80r"
 BRA.E	.HS 00
 BRK		.DA BRK.E+1-*
 			>PSTR "BRK"
-			.HS 00
+			.HS FF
 			>PSTR "00"
 BRK.E	.HS 00
 BVC		.DA BVC.E+1-*
 			>PSTR "BVC"
-			.HS 0B
+			.HS 07
 			>PSTR "50r"
 BVC.E	.HS 00
 BVS		.DA BVS.E+1-*
 			>PSTR "BVS"
-			.HS 0B
+			.HS 07
 			>PSTR "70r"
 BVS.E	.HS 00
 CLC		.DA CLC.E+1-*
 			>PSTR "CLC"
-			.HS 00
+			.HS FF
 			>PSTR "18"
 CLC.E	.HS 00
 CLD		.DA CLD.E+1-*
 			>PSTR "CLD"
-			.HS 00
+			.HS FF
 			>PSTR "D8"
 CLD.E	.HS 00
 CLI		.DA CLI.E+1-*
 			>PSTR "CLI"
-			.HS 00
+			.HS FF
 			>PSTR "58"
 CLI.E	.HS 00
 CLV		.DA CLV.E+1-*
 			>PSTR "CLV"
-			.HS 00
+			.HS FF
 			>PSTR "B8"
 CLV.E	.HS 00
 CMP		.DA CMP.E+1-*
 			>PSTR "CMP"
 			.HS 01
-			>PSTR "D2a"
+			>PSTR "C9a"
 			.HS 02
-			>PSTR "D1a"
+			>PSTR "D2a"
 			.HS 03
-			>PSTR "C1a"
+			>PSTR "D1a"
 			.HS 04
-			>PSTR "C5a"
+			>PSTR "C1a"
 			.HS 05
-			>PSTR "D5a"
+			>PSTR "C5a"
 			.HS 06
-			>PSTR "CDaa"
+			>PSTR "D5a"
 			.HS 07
-			>PSTR "DDaa"
+			>PSTR "CDaa"
 			.HS 08
-			>PSTR "D9aa"
+			>PSTR "DDaa"
 			.HS 09
-			>PSTR "C9i"
+			>PSTR "D9aa"
 CMP.E	.HS 00
 CPX		.DA CPX.E+1-*
 			>PSTR "CPX"
-			.HS 04
+			.HS 01
+			>PSTR "E0a"
+			.HS 05
 			>PSTR "E4a"
-			.HS 06
+			.HS 07
 			>PSTR "Ecaa"
-			.HS 09
-			>PSTR "E0i"
 CPX.E	.HS 00
 CPY		.DA CPY.E+1-*
 			>PSTR "CPY"
-			.HS 04
+			.HS 01
+			>PSTR "C0a"
+			.HS 05
 			>PSTR "C4a"
-			.HS 06
+			.HS 07
 			>PSTR "Ccaa"
-			.HS 09
-			>PSTR "C0i"
 CPY.E	.HS 00
 DEC		.DA DEC.E+1-*
 			>PSTR "DEC"
-			.HS 00
-			>PSTR "3A"
-			.HS 04
-			>PSTR "C6a"
 			.HS 05
-			>PSTR "D6a"
+			>PSTR "C6a"
 			.HS 06
-			>PSTR "Ceaa"
+			>PSTR "D6a"
 			.HS 07
+			>PSTR "Ceaa"
+			.HS 08
 			>PSTR "Deaa"
+			.HS FF
+			>PSTR "3A"
 DEC.E	.HS 00
 DEX		.DA DEX.E+1-*
 			>PSTR "DEX"
-			.HS 00
+			.HS FF
 			>PSTR "CA"
 DEX.E	.HS 00
 DEY		.DA DEY.E+1-*
 			>PSTR "DEY"
-			.HS 00
+			.HS FF
 			>PSTR "88"
 DEY.E	.HS 00
 EOR		.DA EOR.E+1-*
 			>PSTR "EOR"
 			.HS 01
-			>PSTR "52a"
+			>PSTR "49a"
 			.HS 02
-			>PSTR "51a"
+			>PSTR "52a"
 			.HS 03
-			>PSTR "41a"
+			>PSTR "51a"
 			.HS 04
-			>PSTR "45a"
+			>PSTR "41a"
 			.HS 05
-			>PSTR "55a"
+			>PSTR "45a"
 			.HS 06
-			>PSTR "4Daa"
+			>PSTR "55a"
 			.HS 07
-			>PSTR "5Daa"
+			>PSTR "4Daa"
 			.HS 08
-			>PSTR "59aa"
+			>PSTR "5Daa"
 			.HS 09
-			>PSTR "49i"
+			>PSTR "59aa"
 EOR.E	.HS 00
 INC		.DA INC.E+1-*
 			>PSTR "INC"
-			.HS 00
-			>PSTR "1A"
-			.HS 04
-			>PSTR "E6a"
 			.HS 05
-			>PSTR "F6a"
+			>PSTR "E6a"
 			.HS 06
-			>PSTR "Eeaa"
+			>PSTR "F6a"
 			.HS 07
+			>PSTR "Eeaa"
+			.HS 08
 			>PSTR "Feaa"
+			.HS FF
+			>PSTR "1A"
 INC.E	.HS 00
 INX		.DA INX.E+1-*
 			>PSTR "INX"
-			.HS 00
+			.HS FF
 			>PSTR "E8"
 INX.E	.HS 00
 INY		.DA INY.E+1-*
 			>PSTR "INY"
-			.HS 00
+			.HS FF
 			>PSTR "C8"
 INY.E	.HS 00
 JMP		.DA JMP.E+1-*
 			>PSTR "JMP"
-			.HS 0C
+			.HS 0B
 			>PSTR "6Caa"
-			.HS 0D
+			.HS 0C
 			>PSTR "7Caa"
-			.HS 06
+			.HS 07
 			>PSTR "4Caa"
 JMP.E	.HS 00
 JSR		.DA JSR.E+1-*
 			>PSTR "JSR"
-			.HS 06
+			.HS 07
 			>PSTR "20aa"
 JSR.E	.HS 00
 LDA		.DA LDA.E+1-*
 			>PSTR "LDA"
 			.HS 01
-			>PSTR "B2a"
+			>PSTR "A9a"
 			.HS 02
-			>PSTR "B1a"
+			>PSTR "B2a"
 			.HS 03
-			>PSTR "A1a"
+			>PSTR "B1a"
 			.HS 04
-			>PSTR "A5a"
+			>PSTR "A1a"
 			.HS 05
-			>PSTR "B5a"
+			>PSTR "A5a"
 			.HS 06
-			>PSTR "Adaa"
+			>PSTR "B5a"
 			.HS 07
-			>PSTR "Bdaa"
+			>PSTR "Adaa"
 			.HS 08
-			>PSTR "B9aa"
+			>PSTR "Bdaa"
 			.HS 09
-			>PSTR "A9i"
+			>PSTR "B9aa"
 LDA.E	.HS 00
 LDX		.DA LDX.E+1-*
 			>PSTR "LDX"
-			.HS 04
+			.HS 01
+			>PSTR "A2a"
+			.HS 05
 			>PSTR "A6a"
-			.HS 0E
+			.HS 0D
 			>PSTR "B6a"
-			.HS 06
+			.HS 07
 			>PSTR "Aeaa"
-			.HS 08
-			>PSTR "Beaa"
 			.HS 09
-			>PSTR "A2i"
+			>PSTR "Beaa"
 LDX.E	.HS 00
 LDY		.DA LDY.E+1-*
 			>PSTR "LDY"
-			.HS 04
-			>PSTR "A4a"
+			.HS 01
+			>PSTR "A0a"
 			.HS 05
-			>PSTR "B4a"
+			>PSTR "A4a"
 			.HS 06
-			>PSTR "Acaa"
+			>PSTR "B4a"
 			.HS 07
+			>PSTR "Acaa"
+			.HS 08
 			>PSTR "Bcaa"
-			.HS 09
-			>PSTR "A0i"
 LDY.E	.HS 00
 LSR		.DA LSR.E+1-*
 			>PSTR "LSR"
-			.HS 04
-			>PSTR "46a"
 			.HS 05
-			>PSTR "56a"
+			>PSTR "46a"
 			.HS 06
-			>PSTR "4Eaa"
+			>PSTR "56a"
 			.HS 07
+			>PSTR "4Eaa"
+			.HS 08
 			>PSTR "5Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "4A"
 LSR.E	.HS 00
 NOP		.DA NOP.E+1-*
 			>PSTR "NOP"
-			.HS 00
+			.HS FF
 			>PSTR "EA"
 NOP.E	.HS 00
 ORA		.DA ORA.E+1-*
 			>PSTR "ORA"
 			.HS 01
-			>PSTR "12a"
+			>PSTR "09a"
 			.HS 02
-			>PSTR "11a"
+			>PSTR "12a"
 			.HS 03
-			>PSTR "01a"
+			>PSTR "11a"
 			.HS 04
-			>PSTR "05a"
+			>PSTR "01a"
 			.HS 05
-			>PSTR "15a"
+			>PSTR "05a"
 			.HS 06
-			>PSTR "0Daa"
+			>PSTR "15a"
 			.HS 07
-			>PSTR "1Daa"
+			>PSTR "0Daa"
 			.HS 08
-			>PSTR "19aa"
+			>PSTR "1Daa"
 			.HS 09
-			>PSTR "09i"
+			>PSTR "19aa"
 ORA.E	.HS 00
 PHA		.DA PHA.E+1-*
 			>PSTR "PHA"
-			.HS 00
+			.HS FF
 			>PSTR "48"
 PHA.E	.HS 00
 PHP		.DA PHP.E+1-*
 			>PSTR "PHP"
-			.HS 00
+			.HS FF
 			>PSTR "08"
 PHP.E	.HS 00
 PHX		.DA PHX.E+1-*
 			>PSTR "PHX"
-			.HS 00
+			.HS FF
 			>PSTR "DA"
 PHX.E	.HS 00
 PHY		.DA PHY.E+1-*
 			>PSTR "PHY"
-			.HS 00
+			.HS FF
 			>PSTR "5A"
 PHY.E	.HS 00
 PLA		.DA PLA.E+1-*
 			>PSTR "PLA"
-			.HS 00
+			.HS FF
 			>PSTR "68"
 PLA.E	.HS 00
 PLP		.DA PLP.E+1-*
 			>PSTR "PLP"
-			.HS 00
+			.HS FF
 			>PSTR "28"
 PLP.E	.HS 00
 PLX		.DA PLX.E+1-*
 			>PSTR "PLX"
-			.HS 00
+			.HS FF
 			>PSTR "FA"
 PLX.E	.HS 00
 PLY		.DA PLY.E+1-*
 			>PSTR "PLY"
-			.HS 00
+			.HS FF
 			>PSTR "7A"
 PLY.E	.HS 00
 RMB0		.DA RMB0.E+1-*
 			>PSTR "RMB0"
-			.HS 04
+			.HS 05
 			>PSTR "07a"
 RMB0.E	.HS 00
 RMB1		.DA RMB1.E+1-*
 			>PSTR "RMB1"
-			.HS 04
+			.HS 05
 			>PSTR "17a"
 RMB1.E	.HS 00
 RMB2		.DA RMB2.E+1-*
 			>PSTR "RMB2"
-			.HS 04
+			.HS 05
 			>PSTR "27a"
 RMB2.E	.HS 00
 RMB3		.DA RMB3.E+1-*
 			>PSTR "RMB3"
-			.HS 04
+			.HS 05
 			>PSTR "37a"
 RMB3.E	.HS 00
 RMB4		.DA RMB4.E+1-*
 			>PSTR "RMB4"
-			.HS 04
+			.HS 05
 			>PSTR "47a"
 RMB4.E	.HS 00
 RMB5		.DA RMB5.E+1-*
 			>PSTR "RMB5"
-			.HS 04
+			.HS 05
 			>PSTR "57a"
 RMB5.E	.HS 00
 RMB6		.DA RMB6.E+1-*
 			>PSTR "RMB6"
-			.HS 04
+			.HS 05
 			>PSTR "67a"
 RMB6.E	.HS 00
 RMB7		.DA RMB7.E+1-*
 			>PSTR "RMB7"
-			.HS 04
+			.HS 05
 			>PSTR "77a"
 RMB7.E	.HS 00
 ROL		.DA ROL.E+1-*
 			>PSTR "ROL"
-			.HS 04
-			>PSTR "26a"
 			.HS 05
-			>PSTR "36a"
+			>PSTR "26a"
 			.HS 06
-			>PSTR "2Eaa"
+			>PSTR "36a"
 			.HS 07
+			>PSTR "2Eaa"
+			.HS 08
 			>PSTR "3Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "2A"
 ROL.E	.HS 00
 ROR		.DA ROR.E+1-*
 			>PSTR "ROR"
-			.HS 04
-			>PSTR "66a"
 			.HS 05
-			>PSTR "76a"
+			>PSTR "66a"
 			.HS 06
-			>PSTR "6Eaa"
+			>PSTR "76a"
 			.HS 07
+			>PSTR "6Eaa"
+			.HS 08
 			>PSTR "7Eaa"
-			.HS 00
+			.HS FF
 			>PSTR "6A"
 ROR.E	.HS 00
 RTI		.DA RTI.E+1-*
 			>PSTR "RTI"
-			.HS 00
+			.HS FF
 			>PSTR "40"
 RTI.E	.HS 00
 RTS		.DA RTS.E+1-*
 			>PSTR "RTS"
-			.HS 00
+			.HS FF
 			>PSTR "60"
 RTS.E	.HS 00
 SBC		.DA SBC.E+1-*
 			>PSTR "SBC"
 			.HS 01
-			>PSTR "F2a"
+			>PSTR "E9a"
 			.HS 02
-			>PSTR "F1a"
+			>PSTR "F2a"
 			.HS 03
-			>PSTR "E1a"
+			>PSTR "F1a"
 			.HS 04
-			>PSTR "E5a"
+			>PSTR "E1a"
 			.HS 05
-			>PSTR "F5a"
+			>PSTR "E5a"
 			.HS 06
-			>PSTR "Edaa"
+			>PSTR "F5a"
 			.HS 07
-			>PSTR "Fdaa"
+			>PSTR "Edaa"
 			.HS 08
-			>PSTR "F9aa"
+			>PSTR "Fdaa"
 			.HS 09
-			>PSTR "E9i"
+			>PSTR "F9aa"
 SBC.E	.HS 00
 SEC		.DA SEC.E+1-*
 			>PSTR "SEC"
-			.HS 00
+			.HS FF
 			>PSTR "38"
 SEC.E	.HS 00
 SED		.DA SED.E+1-*
 			>PSTR "SED"
-			.HS 00
+			.HS FF
 			>PSTR "F8"
 SED.E	.HS 00
 SEI		.DA SEI.E+1-*
 			>PSTR "SEI"
-			.HS 00
+			.HS FF
 			>PSTR "78"
 SEI.E	.HS 00
 SMB0		.DA SMB0.E+1-*
 			>PSTR "SMB0"
-			.HS 04
+			.HS 05
 			>PSTR "87a"
 SMB0.E	.HS 00
 SMB1		.DA SMB1.E+1-*
 			>PSTR "SMB1"
-			.HS 04
+			.HS 05
 			>PSTR "97a"
 SMB1.E	.HS 00
 SMB2		.DA SMB2.E+1-*
 			>PSTR "SMB2"
-			.HS 04
+			.HS 05
 			>PSTR "A7a"
 SMB2.E	.HS 00
 SMB3		.DA SMB3.E+1-*
 			>PSTR "SMB3"
-			.HS 04
+			.HS 05
 			>PSTR "B7a"
 SMB3.E	.HS 00
 SMB4		.DA SMB4.E+1-*
 			>PSTR "SMB4"
-			.HS 04
+			.HS 05
 			>PSTR "C7a"
 SMB4.E	.HS 00
 SMB5		.DA SMB5.E+1-*
 			>PSTR "SMB5"
-			.HS 04
+			.HS 05
 			>PSTR "D7a"
 SMB5.E	.HS 00
 SMB6		.DA SMB6.E+1-*
 			>PSTR "SMB6"
-			.HS 04
+			.HS 05
 			>PSTR "E7a"
 SMB6.E	.HS 00
 SMB7		.DA SMB7.E+1-*
 			>PSTR "SMB7"
-			.HS 04
+			.HS 05
 			>PSTR "F7a"
 SMB7.E	.HS 00
 STA		.DA STA.E+1-*
 			>PSTR "STA"
-			.HS 01
-			>PSTR "92a"
 			.HS 02
-			>PSTR "91a"
+			>PSTR "92a"
 			.HS 03
-			>PSTR "81a"
+			>PSTR "91a"
 			.HS 04
-			>PSTR "85a"
+			>PSTR "81a"
 			.HS 05
-			>PSTR "95a"
+			>PSTR "85a"
 			.HS 06
-			>PSTR "8Daa"
+			>PSTR "95a"
 			.HS 07
-			>PSTR "9Daa"
+			>PSTR "8Daa"
 			.HS 08
+			>PSTR "9Daa"
+			.HS 09
 			>PSTR "99aa"
 STA.E	.HS 00
 STX		.DA STX.E+1-*
 			>PSTR "STX"
-			.HS 04
+			.HS 05
 			>PSTR "86a"
-			.HS 0E
+			.HS 0D
 			>PSTR "96a"
-			.HS 06
+			.HS 07
 			>PSTR "8Eaa"
 STX.E	.HS 00
 STY		.DA STY.E+1-*
 			>PSTR "STY"
-			.HS 04
-			>PSTR "84a"
 			.HS 05
-			>PSTR "94a"
+			>PSTR "84a"
 			.HS 06
+			>PSTR "94a"
+			.HS 07
 			>PSTR "8Caa"
 STY.E	.HS 00
 STZ		.DA STZ.E+1-*
 			>PSTR "STZ"
-			.HS 04
-			>PSTR "64a"
 			.HS 05
-			>PSTR "74a"
+			>PSTR "64a"
 			.HS 06
-			>PSTR "9Caa"
+			>PSTR "74a"
 			.HS 07
+			>PSTR "9Caa"
+			.HS 08
 			>PSTR "9Eaa"
 STZ.E	.HS 00
 TAX		.DA TAX.E+1-*
 			>PSTR "TAX"
-			.HS 00
+			.HS FF
 			>PSTR "AA"
 TAX.E	.HS 00
 TAY		.DA TAY.E+1-*
 			>PSTR "TAY"
-			.HS 00
+			.HS FF
 			>PSTR "A8"
 TAY.E	.HS 00
 TRB		.DA TRB.E+1-*
 			>PSTR "TRB"
-			.HS 04
+			.HS 05
 			>PSTR "14a"
-			.HS 06
+			.HS 07
 			>PSTR "1Caa"
 TRB.E	.HS 00
 TSB		.DA TSB.E+1-*
 			>PSTR "TSB"
-			.HS 04
+			.HS 05
 			>PSTR "04a"
-			.HS 06
+			.HS 07
 			>PSTR "0Caa"
 TSB.E	.HS 00
 TSX		.DA TSX.E+1-*
 			>PSTR "TSX"
-			.HS 00
+			.HS FF
 			>PSTR "BA"
 TSX.E	.HS 00
 TXA		.DA TXA.E+1-*
 			>PSTR "TXA"
-			.HS 00
+			.HS FF
 			>PSTR "8A"
 TXA.E	.HS 00
 TXS		.DA TXS.E+1-*
 			>PSTR "TXS"
-			.HS 00
+			.HS FF
 			>PSTR "9A"
 TXS.E	.HS 00
 TYA		.DA TYA.E+1-*
 			>PSTR "TYA"
-			.HS 00
+			.HS FF
 			>PSTR "98"
 TYA.E		.HS 00
 			.HS 0000
diff --git a/BIN/ASM.T.Z80.A.txt b/BIN/ASM.T.Z80.A.txt
index 8ac6a738..7bb71c7a 100644
--- a/BIN/ASM.T.Z80.A.txt
+++ b/BIN/ASM.T.Z80.A.txt
@@ -44,7 +44,6 @@ T.ADDR.MODES	.EQ *
 				>PSTR "IX"
 				>PSTR "IY"
 				>PSTR "SP"
-				>PSTR "r"
 				>PSTR "(SP),HL"
 				>PSTR "(SP),IX"
 				>PSTR "(SP),IY"
diff --git a/BIN/ASM.T.Z80.O.txt b/BIN/ASM.T.Z80.O.txt
index fa98b4bb..458cc368 100644
--- a/BIN/ASM.T.Z80.O.txt
+++ b/BIN/ASM.T.Z80.O.txt
@@ -341,7 +341,7 @@ CALLZ		.DA CALLZ.E+1-*
 CALLZ.E	.HS 00
 CCF		.DA CCF.E+1-*
 			>PSTR "CCF"
-			.HS 00
+			.HS FF
 			>PSTR "3F"
 CCF.E	.HS 00
 CP		.DA CP.E+1-*
@@ -371,32 +371,32 @@ CP		.DA CP.E+1-*
 CP.E	.HS 00
 CPD		.DA CPD.E+1-*
 			>PSTR "CPD"
-			.HS 00
+			.HS FF
 			>PSTR "EDA9"
 CPD.E	.HS 00
 CPDR		.DA CPDR.E+1-*
 			>PSTR "CPDR"
-			.HS 00
+			.HS FF
 			>PSTR "EDB9"
 CPDR.E	.HS 00
 CPI		.DA CPI.E+1-*
 			>PSTR "CPI"
-			.HS 00
+			.HS FF
 			>PSTR "EDA1"
 CPI.E	.HS 00
 CPIR		.DA CPIR.E+1-*
 			>PSTR "CPIR"
-			.HS 00
+			.HS FF
 			>PSTR "EDB1"
 CPIR.E	.HS 00
 CPL		.DA CPL.E+1-*
 			>PSTR "CPL"
-			.HS 00
+			.HS FF
 			>PSTR "2F"
 CPL.E	.HS 00
 DAA		.DA DAA.E+1-*
 			>PSTR "DAA"
-			.HS 00
+			.HS FF
 			>PSTR "27"
 DAA.E	.HS 00
 DEC		.DA DEC.E+1-*
@@ -436,74 +436,74 @@ DEC		.DA DEC.E+1-*
 DEC.E	.HS 00
 DI		.DA DI.E+1-*
 			>PSTR "DI"
-			.HS 00
+			.HS FF
 			>PSTR "F3"
 DI.E	.HS 00
 DJNZ		.DA DJNZ.E+1-*
 			>PSTR "DJNZ"
-			.HS 2A
+			.HS 23
 			>PSTR "10r"
 DJNZ.E	.HS 00
 EI		.DA EI.E+1-*
 			>PSTR "EI"
-			.HS 00
+			.HS FF
 			>PSTR "FB"
 EI.E	.HS 00
 EX		.DA EX.E+1-*
 			>PSTR "EX"
-			.HS 2B
+			.HS 2A
 			>PSTR "E3"
-			.HS 2C
+			.HS 2B
 			>PSTR "DDE3"
-			.HS 2D
+			.HS 2C
 			>PSTR "FDE3"
-			.HS 2E
+			.HS 2D
 			>PSTR "EB"
-			.HS 00
+			.HS FF
 			>PSTR "08"
 EX.E	.HS 00
 EXX		.DA EXX.E+1-*
 			>PSTR "EXX"
-			.HS 00
+			.HS FF
 			>PSTR "D9"
 EXX.E	.HS 00
 HLT		.DA HLT.E+1-*
 			>PSTR "HLT"
-			.HS 00
+			.HS FF
 			>PSTR "76"
 HLT.E	.HS 00
 IM0		.DA IM0.E+1-*
 			>PSTR "IM0"
-			.HS 00
+			.HS FF
 			>PSTR "ED46"
 IM0.E	.HS 00
 IM1		.DA IM1.E+1-*
 			>PSTR "IM1"
-			.HS 00
+			.HS FF
 			>PSTR "ED56"
 IM1.E	.HS 00
 IM2		.DA IM2.E+1-*
 			>PSTR "IM2"
-			.HS 00
+			.HS FF
 			>PSTR "ED5E"
 IM2.E	.HS 00
 IN		.DA IN.E+1-*
 			>PSTR "IN"
-			.HS 2F
+			.HS 2E
 			>PSTR "DBa"
-			.HS 30
+			.HS 2F
 			>PSTR "ED78"
-			.HS 31
+			.HS 30
 			>PSTR "ED40"
-			.HS 32
+			.HS 31
 			>PSTR "ED48"
-			.HS 33
+			.HS 32
 			>PSTR "ED50"
-			.HS 34
+			.HS 33
 			>PSTR "ED58"
-			.HS 35
+			.HS 34
 			>PSTR "ED60"
-			.HS 36
+			.HS 35
 			>PSTR "ED68"
 IN.E	.HS 00
 INC		.DA INC.E+1-*
@@ -543,31 +543,31 @@ INC		.DA INC.E+1-*
 INC.E	.HS 00
 IND		.DA IND.E+1-*
 			>PSTR "IND"
-			.HS 00
+			.HS FF
 			>PSTR "EDAA"
 IND.E	.HS 00
 INDR		.DA INDR.E+1-*
 			>PSTR "INDR"
-			.HS 00
+			.HS FF
 			>PSTR "EDBA"
 INDR.E	.HS 00
 INI		.DA INI.E+1-*
 			>PSTR "INI"
-			.HS 00
+			.HS FF
 			>PSTR "EDA2"
 INI.E	.HS 00
 INIR		.DA INIR.E+1-*
 			>PSTR "INIR"
-			.HS 00
+			.HS FF
 			>PSTR "EDB2"
 INIR.E	.HS 00
 JP		.DA JP.E+1-*
 			>PSTR "JP"
 			.HS 18
 			>PSTR "E9"
-			.HS 37
+			.HS 36
 			>PSTR "DDE9"
-			.HS 38
+			.HS 37
 			>PSTR "FDE9"
 			.HS 23
 			>PSTR "C3aa"
@@ -614,108 +614,108 @@ JPZ		.DA JPZ.E+1-*
 JPZ.E	.HS 00
 JR		.DA JR.E+1-*
 			>PSTR "JR"
-			.HS 2A
+			.HS 23
 			>PSTR "18r"
 JR.E	.HS 00
 JRC		.DA JRC.E+1-*
 			>PSTR "JRC"
-			.HS 2A
+			.HS 23
 			>PSTR "38r"
 JRC.E	.HS 00
 JRNC		.DA JRNC.E+1-*
 			>PSTR "JRNC"
-			.HS 2A
+			.HS 23
 			>PSTR "30r"
 JRNC.E	.HS 00
 JRNZ		.DA JRNZ.E+1-*
 			>PSTR "JRNZ"
-			.HS 2A
+			.HS 23
 			>PSTR "20r"
 JRNZ.E	.HS 00
 JRZ		.DA JRZ.E+1-*
 			>PSTR "JRZ"
-			.HS 2A
+			.HS 23
 			>PSTR "28r"
 JRZ.E	.HS 00
 LD		.DA LD.E+1-*
 			>PSTR "LD"
-			.HS 39
+			.HS 38
 			>PSTR "32aa"
-			.HS 3A
+			.HS 39
 			>PSTR "ED43aa"
-			.HS 3B
+			.HS 3A
 			>PSTR "ED53aa"
-			.HS 3C
+			.HS 3B
 			>PSTR "22aa"
-			.HS 3C
+			.HS 3B
 			>PSTR "ED6Baa"
+			.HS 3C
+			>PSTR "DD22aa"
 			.HS 3D
 			>PSTR "DD22aa"
 			.HS 3E
-			>PSTR "DD22aa"
-			.HS 3F
 			>PSTR "ED73aa"
-			.HS 40
+			.HS 3F
 			>PSTR "02"
-			.HS 41
+			.HS 40
 			>PSTR "12"
-			.HS 42
+			.HS 41
 			>PSTR "77"
-			.HS 43
+			.HS 42
 			>PSTR "36a"
-			.HS 44
+			.HS 43
 			>PSTR "70"
-			.HS 45
+			.HS 44
 			>PSTR "71"
-			.HS 46
+			.HS 45
 			>PSTR "72"
-			.HS 47
+			.HS 46
 			>PSTR "73"
-			.HS 48
+			.HS 47
 			>PSTR "74"
-			.HS 49
+			.HS 48
 			>PSTR "75"
-			.HS 4A
+			.HS 49
 			>PSTR "DD77a"
-			.HS 4B
+			.HS 4A
 			>PSTR "DD36aa"
-			.HS 4B
+			.HS 4A
 			>PSTR "DD76aa"
-			.HS 4C
+			.HS 4B
 			>PSTR "DD70a"
-			.HS 4D
+			.HS 4C
 			>PSTR "DD71a"
-			.HS 4E
+			.HS 4D
 			>PSTR "DD72a"
-			.HS 4F
+			.HS 4E
 			>PSTR "DD73a"
-			.HS 50
+			.HS 4F
 			>PSTR "DD74a"
-			.HS 51
+			.HS 50
 			>PSTR "DD75a"
-			.HS 52
+			.HS 51
 			>PSTR "FD77a"
-			.HS 53
+			.HS 52
 			>PSTR "FD36aa"
-			.HS 53
+			.HS 52
 			>PSTR "FD76aa"
-			.HS 54
+			.HS 53
 			>PSTR "FD70a"
-			.HS 55
+			.HS 54
 			>PSTR "FD71a"
-			.HS 56
+			.HS 55
 			>PSTR "FD72a"
-			.HS 57
+			.HS 56
 			>PSTR "FD73a"
-			.HS 58
+			.HS 57
 			>PSTR "FD74a"
-			.HS 59
+			.HS 58
 			>PSTR "FD75a"
-			.HS 5A
+			.HS 59
 			>PSTR "3Aaa"
-			.HS 5B
+			.HS 5A
 			>PSTR "0A"
-			.HS 5C
+			.HS 5B
 			>PSTR "1A"
 			.HS 01
 			>PSTR "7E"
@@ -737,209 +737,209 @@ LD		.DA LD.E+1-*
 			>PSTR "7B"
 			.HS 0A
 			>PSTR "7C"
-			.HS 5D
+			.HS 5C
 			>PSTR "ED57"
 			.HS 0B
 			>PSTR "7D"
-			.HS 5E
+			.HS 5D
 			>PSTR "ED5F"
-			.HS 5F
+			.HS 5E
 			>PSTR "46"
-			.HS 60
+			.HS 5F
 			>PSTR "DD46r"
-			.HS 61
+			.HS 60
 			>PSTR "FD46r"
-			.HS 62
+			.HS 61
 			>PSTR "47"
-			.HS 63
+			.HS 62
 			>PSTR "06a"
-			.HS 64
+			.HS 63
 			>PSTR "40"
-			.HS 65
+			.HS 64
 			>PSTR "41"
-			.HS 66
+			.HS 65
 			>PSTR "42"
-			.HS 67
+			.HS 66
 			>PSTR "43"
-			.HS 68
+			.HS 67
 			>PSTR "44"
-			.HS 69
+			.HS 68
 			>PSTR "45"
-			.HS 6A
+			.HS 69
 			>PSTR "ED4Baa"
-			.HS 6B
+			.HS 6A
 			>PSTR "01aa"
-			.HS 6C
+			.HS 6B
 			>PSTR "4E"
-			.HS 6D
+			.HS 6C
 			>PSTR "DD4Er"
-			.HS 6E
+			.HS 6D
 			>PSTR "FD4Er"
-			.HS 6F
+			.HS 6E
 			>PSTR "4F"
-			.HS 70
+			.HS 6F
 			>PSTR "0Ea"
-			.HS 71
+			.HS 70
 			>PSTR "48"
-			.HS 72
+			.HS 71
 			>PSTR "49"
-			.HS 73
+			.HS 72
 			>PSTR "4A"
-			.HS 74
+			.HS 73
 			>PSTR "4B"
-			.HS 75
+			.HS 74
 			>PSTR "4C"
-			.HS 76
+			.HS 75
 			>PSTR "4D"
-			.HS 77
+			.HS 76
 			>PSTR "56"
-			.HS 78
+			.HS 77
 			>PSTR "DD56a"
-			.HS 79
+			.HS 78
 			>PSTR "FD56a"
-			.HS 7A
+			.HS 79
 			>PSTR "57"
-			.HS 7B
+			.HS 7A
 			>PSTR "16a"
-			.HS 7C
+			.HS 7B
 			>PSTR "50"
-			.HS 7D
+			.HS 7C
 			>PSTR "51"
-			.HS 7E
+			.HS 7D
 			>PSTR "52"
-			.HS 7F
+			.HS 7E
 			>PSTR "53"
-			.HS 80
+			.HS 7F
 			>PSTR "54"
-			.HS 81
+			.HS 80
 			>PSTR "55"
-			.HS 82
+			.HS 81
 			>PSTR "ED5Baa"
-			.HS 83
+			.HS 82
 			>PSTR "11aa"
-			.HS 84
+			.HS 83
 			>PSTR "5E"
-			.HS 85
+			.HS 84
 			>PSTR "DD5Ea"
-			.HS 86
+			.HS 85
 			>PSTR "FD5Ea"
-			.HS 87
+			.HS 86
 			>PSTR "5F"
-			.HS 88
+			.HS 87
 			>PSTR "1Ea"
-			.HS 89
+			.HS 88
 			>PSTR "58"
-			.HS 8A
+			.HS 89
 			>PSTR "59"
-			.HS 8B
+			.HS 8A
 			>PSTR "5A"
-			.HS 8C
+			.HS 8B
 			>PSTR "5B"
-			.HS 8D
+			.HS 8C
 			>PSTR "5C"
-			.HS 8E
+			.HS 8D
 			>PSTR "5D"
-			.HS 8F
+			.HS 8E
 			>PSTR "66"
-			.HS 90
+			.HS 8F
 			>PSTR "DD66a"
-			.HS 91
+			.HS 90
 			>PSTR "FD66a"
-			.HS 92
+			.HS 91
 			>PSTR "67"
-			.HS 93
+			.HS 92
 			>PSTR "26a"
-			.HS 94
+			.HS 93
 			>PSTR "60"
-			.HS 95
+			.HS 94
 			>PSTR "61"
-			.HS 96
+			.HS 95
 			>PSTR "62"
-			.HS 97
+			.HS 96
 			>PSTR "63"
-			.HS 98
+			.HS 97
 			>PSTR "64"
-			.HS 99
+			.HS 98
 			>PSTR "65"
-			.HS 9A
+			.HS 99
 			>PSTR "2Aaa"
-			.HS 9A
+			.HS 99
 			>PSTR "ED6Baa"
-			.HS 9B
+			.HS 9A
 			>PSTR "21aa"
-			.HS 9C
+			.HS 9B
 			>PSTR "ED47"
-			.HS 9D
+			.HS 9C
 			>PSTR "DD2Aaa"
-			.HS 9E
+			.HS 9D
 			>PSTR "DD21aa"
-			.HS 9F
+			.HS 9E
 			>PSTR "FD2Aaa"
-			.HS A0
+			.HS 9F
 			>PSTR "FD21aa"
-			.HS A1
+			.HS A0
 			>PSTR "6E"
-			.HS A2
+			.HS A1
 			>PSTR "DD6Ea"
-			.HS A3
+			.HS A2
 			>PSTR "FD6Ea"
-			.HS A4
+			.HS A3
 			>PSTR "6F"
-			.HS A5
+			.HS A4
 			>PSTR "2Ea"
-			.HS A6
+			.HS A5
 			>PSTR "68"
-			.HS A7
+			.HS A6
 			>PSTR "69"
-			.HS A8
+			.HS A7
 			>PSTR "6A"
-			.HS A9
+			.HS A8
 			>PSTR "6B"
-			.HS AA
+			.HS A9
 			>PSTR "6C"
-			.HS AB
+			.HS AA
 			>PSTR "6D"
-			.HS AC
+			.HS AB
 			>PSTR "ED4F"
-			.HS AD
+			.HS AC
 			>PSTR "ED7Baa"
-			.HS AE
+			.HS AD
 			>PSTR "31aa"
-			.HS AF
+			.HS AE
 			>PSTR "F9"
-			.HS B0
+			.HS AF
 			>PSTR "DDF9"
-			.HS B1
+			.HS B0
 			>PSTR "FDF9"
 LD.E	.HS 00
 LDD		.DA LDD.E+1-*
 			>PSTR "LDD"
-			.HS 00
+			.HS FF
 			>PSTR "EDA8"
 LDD.E	.HS 00
 LDDR		.DA LDDR.E+1-*
 			>PSTR "LDDR"
-			.HS 00
+			.HS FF
 			>PSTR "EDB8"
 LDDR.E	.HS 00
 LDI		.DA LDI.E+1-*
 			>PSTR "LDI"
-			.HS 00
+			.HS FF
 			>PSTR "EDA0"
 LDI.E	.HS 00
 LDIR		.DA LDIR.E+1-*
 			>PSTR "LDIR"
-			.HS 00
+			.HS FF
 			>PSTR "EDB0"
 LDIR.E	.HS 00
 NEG		.DA NEG.E+1-*
 			>PSTR "NEG"
-			.HS 00
+			.HS FF
 			>PSTR "ED44"
 NEG.E	.HS 00
 NOP		.DA NOP.E+1-*
 			>PSTR "NOP"
-			.HS 00
+			.HS FF
 			>PSTR "00"
 NOP.E	.HS 00
 OR		.DA OR.E+1-*
@@ -969,46 +969,46 @@ OR		.DA OR.E+1-*
 OR.E	.HS 00
 OTDR		.DA OTDR.E+1-*
 			>PSTR "OTDR"
-			.HS 00
+			.HS FF
 			>PSTR "EDBB"
 OTDR.E	.HS 00
 OTIR		.DA OTIR.E+1-*
 			>PSTR "OTIR"
-			.HS 00
+			.HS FF
 			>PSTR "EDB3"
 OTIR.E	.HS 00
 OUT		.DA OUT.E+1-*
 			>PSTR "OUT"
-			.HS B2
+			.HS B1
 			>PSTR "D3a"
-			.HS B3
+			.HS B2
 			>PSTR "ED79"
-			.HS B4
+			.HS B3
 			>PSTR "ED41"
-			.HS B5
+			.HS B4
 			>PSTR "ED49"
-			.HS B6
+			.HS B5
 			>PSTR "ED51"
-			.HS B7
+			.HS B6
 			>PSTR "ED59"
-			.HS B8
+			.HS B7
 			>PSTR "ED61"
-			.HS B9
+			.HS B8
 			>PSTR "ED69"
 OUT.E	.HS 00
 OUTD		.DA OUTD.E+1-*
 			>PSTR "OUTD"
-			.HS 00
+			.HS FF
 			>PSTR "EDAB"
 OUTD.E	.HS 00
 OUTI		.DA OUTI.E+1-*
 			>PSTR "OUTI"
-			.HS 00
+			.HS FF
 			>PSTR "EDA3"
 OUTI.E	.HS 00
 POP		.DA POP.E+1-*
 			>PSTR "POP"
-			.HS BA
+			.HS B9
 			>PSTR "F1"
 			.HS 24
 			>PSTR "C1"
@@ -1023,7 +1023,7 @@ POP		.DA POP.E+1-*
 POP.E	.HS 00
 PUSH		.DA PUSH.E+1-*
 			>PSTR "PUSH"
-			.HS BA
+			.HS B9
 			>PSTR "F5"
 			.HS 24
 			>PSTR "C5"
@@ -1222,57 +1222,57 @@ RES7		.DA RES7.E+1-*
 RES7.E	.HS 00
 RET		.DA RET.E+1-*
 			>PSTR "RET"
-			.HS 00
+			.HS FF
 			>PSTR "C9"
 RET.E	.HS 00
 RETC		.DA RETC.E+1-*
 			>PSTR "RETC"
-			.HS 00
+			.HS FF
 			>PSTR "D8"
 RETC.E	.HS 00
 RETI		.DA RETI.E+1-*
 			>PSTR "RETI"
-			.HS 00
+			.HS FF
 			>PSTR "ED4D"
 RETI.E	.HS 00
 RETM		.DA RETM.E+1-*
 			>PSTR "RETM"
-			.HS 00
+			.HS FF
 			>PSTR "F8"
 RETM.E	.HS 00
 RETN		.DA RETN.E+1-*
 			>PSTR "RETN"
-			.HS 00
+			.HS FF
 			>PSTR "ED45"
 RETN.E	.HS 00
 RETNC		.DA RETNC.E+1-*
 			>PSTR "RETNC"
-			.HS 00
+			.HS FF
 			>PSTR "D0"
 RETNC.E	.HS 00
 RETNZ		.DA RETNZ.E+1-*
 			>PSTR "RETNZ"
-			.HS 00
+			.HS FF
 			>PSTR "C0"
 RETNZ.E	.HS 00
 RETP		.DA RETP.E+1-*
 			>PSTR "RETP"
-			.HS 00
+			.HS FF
 			>PSTR "F0"
 RETP.E	.HS 00
 RETPE		.DA RETPE.E+1-*
 			>PSTR "RETPE"
-			.HS 00
+			.HS FF
 			>PSTR "E8"
 RETPE.E	.HS 00
 RETPO		.DA RETPO.E+1-*
 			>PSTR "RETPO"
-			.HS 00
+			.HS FF
 			>PSTR "E0"
 RETPO.E	.HS 00
 RETZ		.DA RETZ.E+1-*
 			>PSTR "RETZ"
-			.HS 00
+			.HS FF
 			>PSTR "C8"
 RETZ.E	.HS 00
 RL		.DA RL.E+1-*
@@ -1320,7 +1320,7 @@ RL		.DA RL.E+1-*
 RL.E	.HS 00
 RLA		.DA RLA.E+1-*
 			>PSTR "RLA"
-			.HS 00
+			.HS FF
 			>PSTR "17"
 RLA.E	.HS 00
 RLC		.DA RLC.E+1-*
@@ -1348,17 +1348,17 @@ RLC		.DA RLC.E+1-*
 RLC.E	.HS 00
 RLCA		.DA RLCA.E+1-*
 			>PSTR "RLCA"
-			.HS 00
+			.HS FF
 			>PSTR "07"
 RLCA.E	.HS 00
 RLD		.DA RLD.E+1-*
 			>PSTR "RLD"
-			.HS 00
+			.HS FF
 			>PSTR "ED6F"
 RLD.E	.HS 00
 RRA		.DA RRA.E+1-*
 			>PSTR "RRA"
-			.HS 00
+			.HS FF
 			>PSTR "1F"
 RRA.E	.HS 00
 RRC		.DA RRC.E+1-*
@@ -1386,52 +1386,52 @@ RRC		.DA RRC.E+1-*
 RRC.E	.HS 00
 RRCA		.DA RRCA.E+1-*
 			>PSTR "RRCA"
-			.HS 00
+			.HS FF
 			>PSTR "0F"
 RRCA.E	.HS 00
 RRD		.DA RRD.E+1-*
 			>PSTR "RRD"
-			.HS 00
+			.HS FF
 			>PSTR "ED67"
 RRD.E	.HS 00
 RST0		.DA RST0.E+1-*
 			>PSTR "RST0"
-			.HS 00
+			.HS FF
 			>PSTR "C7"
 RST0.E	.HS 00
 RST10		.DA RST10.E+1-*
 			>PSTR "RST10"
-			.HS 00
+			.HS FF
 			>PSTR "D7"
 RST10.E	.HS 00
 RST18		.DA RST18.E+1-*
 			>PSTR "RST18"
-			.HS 00
+			.HS FF
 			>PSTR "DF"
 RST18.E	.HS 00
 RST20		.DA RST20.E+1-*
 			>PSTR "RST20"
-			.HS 00
+			.HS FF
 			>PSTR "E7"
 RST20.E	.HS 00
 RST28		.DA RST28.E+1-*
 			>PSTR "RST28"
-			.HS 00
+			.HS FF
 			>PSTR "EF"
 RST28.E	.HS 00
 RST30		.DA RST30.E+1-*
 			>PSTR "RST30"
-			.HS 00
+			.HS FF
 			>PSTR "F7"
 RST30.E	.HS 00
 RST38		.DA RST38.E+1-*
 			>PSTR "RST38"
-			.HS 00
+			.HS FF
 			>PSTR "FF"
 RST38.E	.HS 00
 RST8		.DA RST8.E+1-*
 			>PSTR "RST8"
-			.HS 00
+			.HS FF
 			>PSTR "CF"
 RST8.E	.HS 00
 SBC		.DA SBC.E+1-*
@@ -1469,7 +1469,7 @@ SBC		.DA SBC.E+1-*
 SBC.E	.HS 00
 SCF		.DA SCF.E+1-*
 			>PSTR "SCF"
-			.HS 00
+			.HS FF
 			>PSTR "37"
 SCF.E	.HS 00
 SET0		.DA SET0.E+1-*