diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 7a8e0a85..b3381df9 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt
index 3196e37a..835181ad 100644
--- a/DRV/MOUSE.DRV.S.txt
+++ b/DRV/MOUSE.DRV.S.txt
@@ -10,6 +10,7 @@ AUTO 4,1
 				.INB INC/A2OSX.I
 				.INB INC/MLI.E.I
 				.INB INC/XY.MOUSE.I
+				.INB INC/GUI.I
 				.INB INC/LIBGUI.I
 *--------------------------------------
 ZPSlotPtr		.EQ ZPDRV
@@ -31,7 +32,9 @@ CS.START		cld
 L.MSG.DETECT	.DA MSG.DETECT
 L.MSG.DETECT.OK	.DA MSG.DETECT.OK
 L.MSG.DETECT.KO	.DA MSG.DETECT.KO
-L.DEV.HEADER.NAME	.DA DEV.HEADER.NAME
+L.DRV.CS.START	.DA DRV.CS.START
+L.FD.DEV		.DA FD.DEV
+L.FD.DEV.NAME	.DA FD.DEV.NAME
 				.DA 0					End Of Reloc Table
 *--------------------------------------
 Dev.Detect		>LDYA L.MSG.DETECT
@@ -49,8 +52,21 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				bne .3
 				dex
 				bpl .2
+				bra .8
 				
-				lda ZPSlotPtr+1
+.3				lda ZPSlotPtr+1			no match, try next slot....
+				inc
+				cmp #$C8
+				bne .1	
+				
+				>LDYA L.MSG.DETECT.KO
+				>SYSCALL printf
+
+.9				lda #MLI.E.NODEV
+				sec
+				rts
+				
+.8				lda ZPSlotPtr+1
 				sta GOMOUSE+2
 				sta GOMOUSE.Cn+1
 				sta GOMOUSE.JMP+2
@@ -64,7 +80,8 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				asl
 				sta GOMOUSE.n0+1
 				
-				>PUSHW L.DEV.HEADER.NAME
+				>PUSHW L.FD.DEV.NAME
+				>PUSHBI 2
 				>LDYA L.MSG.DETECT.OK
 				>SYSCALL printf
 	
@@ -81,18 +98,6 @@ Dev.Detect		>LDYA L.MSG.DETECT
 				>SYSCALL MKDEV
 
 				rts
-				
-.3				lda ZPSlotPtr+1			no match, try next slot....
-				inc
-				cmp #$C8
-				bne .1	
-				
-				>LDYA L.MSG.DETECT.KO
-				>SYSCALL printf
-
-				lda #MLI.E.NODEV
-				sec
-				rts				
 *--------------------------------------
 CS.END
 MSG.DETECT		.AZ "Apple Mouse Driver.\r\n"
@@ -116,7 +121,9 @@ FD.DEV.NAME		.AZ "MOU7"
 ZPIOCTL			.EQ ZPDRV
 ZPTmpPtr1		.EQ ZPDRV+2
 *--------------------------------------
-DRV.CS.START	.DA STATUS
+DRV.CS.START	cld
+				jmp (.1,x)
+.1				.DA STATUS
 				.DA READBLOCK
 				.DA A2osX.BADCALL
 				.DA A2osX.BADCALL
@@ -336,6 +343,7 @@ DEVSTAT			.DA #0
 				.DA #0
 				.DA #91
 *--------------------------------------
+DRV.END
 MAN
 SAVE USR/SRC/DRV/MOUSE.DRV.S
 ASM
diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt
index bc3f9311..b65ee454 100644
--- a/SBIN/GETTY.S.txt
+++ b/SBIN/GETTY.S.txt
@@ -149,7 +149,7 @@ CS.RUN.LOOP1	>SLEEP
 .1				jsr Wait.Timeout
 				bcc CS.RUN.LOOP1
 				
-.2				>PUSHBI S.PS.F.DUPENV+S.PS.F.HOLD
+.2				>PUSHBI S.PS.F.HOLD
 
 				>LDA.G ArgProg
 				>SYSCALL ArgV