diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index db472970..d31d0c07 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index f073cf4c..419bc319 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/SYS/KERNEL.S.CORE.txt b/SYS/KERNEL.S.CORE.txt
index 41a990b4..2fc406b6 100644
--- a/SYS/KERNEL.S.CORE.txt
+++ b/SYS/KERNEL.S.CORE.txt
@@ -385,17 +385,14 @@ CORE.ScrSel		and #$0F
 				lda A2osX.SCRNDEVS-1,x
 				beq .8					No device claimed this screen
 
+				tay
+				
+				>PUSHBI 0
+				lda #IOCTL.CONTROL
 				>DEBUG
+				jsr K.IOCTL
 				
-				jsr K.GetDevByID		x unmodified.....
-				bcs .8					??? 
-				
-				stx A2osX.ASCREEN
-				
-				>STYA .1+1
 
-				ldx #IOCTL.CONTROL
-.1				jmp $ffff				SELF MODIFED
 				
 .8				rts
 *--------------------------------------
diff --git a/SYS/KERNEL.S.DEV.txt b/SYS/KERNEL.S.DEV.txt
index 7e015865..65a57664 100644
--- a/SYS/KERNEL.S.DEV.txt
+++ b/SYS/KERNEL.S.DEV.txt
@@ -58,7 +58,7 @@ K.GetDevByName	>STYA ZPPtr1
 				bne .2					no....loop
 				
 				ldy ZPPtr2
-				lda ZPPtr3+1
+				lda ZPPtr2+1
 				clc
 				rts
 				
diff --git a/SYS/KERNEL.S.IO.txt b/SYS/KERNEL.S.IO.txt
index 5c7f792d..451a6559 100644
--- a/SYS/KERNEL.S.IO.txt
+++ b/SYS/KERNEL.S.IO.txt
@@ -189,9 +189,8 @@ IO.WRITE.FIFO	ldy #S.FD.FIFO.S
 * **Out:**
 *  Y,A = ...
 *\--------------------------------------
-K.IOCTL			tax						op
-				>PULLB .1+1				param LO
-				>PULLB .2+1				param HI
+K.IOCTL			sta	.7+1				op
+				>PULLW pIOCTL
 				
 				tya						id
 				
@@ -199,11 +198,16 @@ K.IOCTL			tax						op
 				bcs K.IOCTL.9
 				
 				>STYA pFD
-				
-.1				ldy #$ff				SELF MODIFIED
-.2				lda #$ff				SELF MODIFIED
 
-				jmp (pFD)				x = op
+				ldy #S.FD.DEV.DRVPTR
+				lda (pFD),y
+				sta .8+1
+				iny
+				lda (pFD),y
+				sta .8+2
+
+.7				ldx #$ff				SELF MODIFIED
+.8				jmp $ffff				SELF MODIFIED x = op
 				
 K.IOCTL.9		rts
 */--------------------------------------