diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 23bc49d7..e25539db 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.TEST.po b/.Floppies/A2OSX.TEST.po
index 893974cc..4f1033c6 100644
Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ
diff --git a/BIN/ACOS.S.txt b/BIN/ACOS.S.txt
index 4221be89..c770166a 100644
--- a/BIN/ACOS.S.txt
+++ b/BIN/ACOS.S.txt
@@ -6,9 +6,8 @@ NEW
 				.TF bin/acos
 *--------------------------------------
 CODESEG			.EQ 4096
-CONSTSEG		.EQ 2048
 DATASEG			.EQ 256
-STRVSEG			.EQ 4096
+STRVSEG			.EQ 8192
 FWREF			.EQ 1024
 EXP.DEPTH.MAX	.EQ 16
 CCS.MAX			.EQ 128
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index 1f9c8b77..0cdac4a4 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -467,14 +467,11 @@ CPU.Init		>PUSHWI MSG.CPU
 				php
 				sei
 
-				lda MACHID
-				and #MACHID.T
-				eor #MACHID.T.IIc
+				ldx A2osX.HWType
+				cpx #A2osX.HWType.IIc
 				beq CPU.Init2c
 
-				lda A2osX.HZ
-				asl
-				tax
+				ldx A2osX.HZ
 
 .1				bit VBL					//e : Wait VBL high....
 				bpl .1
diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt
index 6518583a..543643c7 100644
--- a/SYS/KERNEL.S.IRQ.txt
+++ b/SYS/KERNEL.S.IRQ.txt
@@ -26,14 +26,11 @@ IRQ.Handler		cld
 				stx	IRQ.5+1
 				sty IRQ.4+1
 				
-				lda RDPAGE2
+				lda RD80STORE
+				and RDPAGE2
 				pha
 				sta CLRPAGE2
 
-				lda RD80STORE
-				pha
-				sta CLR80STORE
-
 				lda RDREADAUX
 				pha
 				sta CLRREADAUX			Make sure we can access FD.Table
@@ -87,14 +84,9 @@ IRQ.3			pla						Must keep Carry
 .2				pla
 				bpl .3
 
-				sta SET80STORE
-
-.3				pla
-				bpl .30
-
 				sta SETPAGE2
 
-.30				bvc IRQ.4				if not V, skip task switching
+.3				bvc IRQ.4				if not V, skip task switching
 
 				tsx						Check Stack if before "dec IRQ.InKernel"
 				cpx #$fc				$1ff-PChi-PClo-P = $1fc
diff --git a/SYS/KM.VSDRIVE.S.txt b/SYS/KM.VSDRIVE.S.txt
index fb6f46cf..b7722f78 100644
--- a/SYS/KM.VSDRIVE.S.txt
+++ b/SYS/KM.VSDRIVE.S.txt
@@ -432,10 +432,10 @@ DRV.INIT.C		inc SSC.CMD				SELF MODIFIED
 				dey
 				bpl .3
 
-				ldy #DRV.102.LEN-1
+				ldy #DRV.200.LEN-1
 
-.5				lda DRV.102,y
-				sta $102,y
+.5				lda DRV.200,y
+				sta $200,y
 				dey
 				bpl .5
 *--------------------------------------
@@ -474,7 +474,7 @@ DRV.DO.CMD.R	ldy #3					Read Back and check 4 bytes
 .3				clc
 				
 .4				jsr DRV.SSCGet
-				jsr $102
+				jsr $200
 				eor DRV.CmdBuf.Sum
 				sta DRV.CmdBuf.Sum
 				iny
@@ -497,7 +497,7 @@ DRV.DO.CMD.ERR	jsr	DRV.SSCClose
 *--------------------------------------
 DRV.DO.CMD.W	lda #$B1				lda (),y
 
-				sta $105
+				sta $203
 
 				ldy #0
 
@@ -507,7 +507,7 @@ DRV.DO.CMD.W	lda #$B1				lda (),y
 				.HS 90					BCC
 .1				clc
 
-.2				jsr $102
+.2				jsr $200
 				jsr DRV.SSCSend
 				eor DRV.CmdBuf.Sum
 				sta DRV.CmdBuf.Sum
@@ -564,11 +564,11 @@ DRV.SSCGet.S	lda SSC.STATUS			SELF MODIFIED
 DRV.SSCGet.D	lda SSC.DATA			SELF MODIFIED
 				rts
 *--------------------------------------
-DRV.102			bit RRAMWRAMBNK1
+DRV.200			bit RRAMWRAMBNK1
 				sta (DRV.BUFF),y
 				bit RRAMWRAMBNK2
 				rts	
-DRV.102.LEN		.EQ *-DRV.102
+DRV.200.LEN		.EQ *-DRV.200
 *--------------------------------------
 DRV.CmdBuf.Sum	.BS 1					Reverse order for dey
 DRV.CmdBuf.BlkH	.BS 1