diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 289e0594..ed11623f 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 58815c17..7db309d2 100644
Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ
diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt
index b99ccb02..834d3375 100644
--- a/BIN/CHTYP.S.txt
+++ b/BIN/CHTYP.S.txt
@@ -242,7 +242,7 @@ CS.RUN.GetFilePath
 				>SYSCALL StrCpy
 				
 				>PUSHW ZPFileName
-				>PUSHW ZPFullPath
+				>LDYA ZPFullPath
 				>SYSCALL StrCat
 				rts
 *--------------------------------------
diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt
index 9162016b..aface0ab 100644
--- a/BIN/X.CPMVRM.S.txt
+++ b/BIN/X.CPMVRM.S.txt
@@ -729,7 +729,7 @@ CS.RUN.BuildFilePath
 				>SYSCALL StrCpy
 
 				>PUSHW ZPFileName
-				>PUSHW ZPPtr1
+				>LDYA ZPPtr1
 				>SYSCALL StrCat
 				
 				.DO X.COPY.TO.DEST=1
@@ -755,7 +755,7 @@ CS.RUN.BuildFilePath
 				
 .1				>PUSHW ZPFileName
 
-.2				>PUSHW ZPPtr1
+.2				>LDYA ZPPtr1
 				>SYSCALL StrCat
 				
 				.FIN
diff --git a/BIN/X.FILEENUM.S.txt b/BIN/X.FILEENUM.S.txt
index 06d4af68..cacfdffc 100644
--- a/BIN/X.FILEENUM.S.txt
+++ b/BIN/X.FILEENUM.S.txt
@@ -457,7 +457,7 @@ EnterSubDirYA.1	lda (pData),y
 				>STYA ZPPtr1			save full path
 				
 				>PUSHW ZPPtr2
-				>PUSHW ZPPtr1
+				>LDYA ZPPtr1
 				>SYSCALL StrCat
 
 				ldy #0
diff --git a/SBIN/INSDRV.S.txt b/SBIN/INSDRV.S.txt
index e3fc4733..61d65675 100644
--- a/SBIN/INSDRV.S.txt
+++ b/SBIN/INSDRV.S.txt
@@ -38,7 +38,6 @@ L.MSG.LOAD		.DA MSG.LOAD
 *--------------------------------------
 CS.INIT			ldy #S.PS.ARGC
 				lda (pPs),y
-
 				beq .9
 				
 				lda #1					get PTR to ARG[1] (Driver name)
diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt
index a00d27e4..6b62f2a0 100644
--- a/SBIN/SHELL.S.CMD.txt
+++ b/SBIN/SHELL.S.CMD.txt
@@ -74,8 +74,11 @@ Cmd.Parse.NextC	lda (ZPPtr1)
 Cmd.Exec		lda #0
 				>STA.G CMD.bStartProc
 				>STA.G CMD.hFullpath
-				>LDYA ZPCMDBuf
 				
+				>LDYA ZPCMDBuf
+				>SYSCALL puts
+
+				>LDYA ZPCMDBuf
 				>SYSCALL ExpandStr
 				>STYA ZPPtr1			Ptr to CMD ARGS
 				
@@ -204,7 +207,7 @@ Cmd.Exec.EXT.TXT
 				
 				>SYSCALL GetArg
 				>PUSHYA						
-				>PUSHW ZPCMDBuf
+				>LDYA ZPCMDBuf
 				>SYSCALL StrCat
 				
 				jsr Cmd.Exec.EXT.SEP	Add a space....
@@ -215,7 +218,7 @@ Cmd.Exec.EXT.BIN
 				>LDA.G CMD.hFullpath
 				>SYSCALL GetMemPtr
 				>PUSHYA
-				>PUSHW ZPCMDBuf
+				>LDYA ZPCMDBuf
 				>SYSCALL StrCat
 
 				lda (ZPPTR2)			Some ARGS ?
@@ -224,7 +227,7 @@ Cmd.Exec.EXT.BIN
 				jsr Cmd.Exec.EXT.SEP	Add a space....
 				
 				>PUSHW ZPPTR2
-				>PUSHW ZPCMDBuf
+				>LDYA ZPCMDBuf
 				>SYSCALL StrCat
 								
 .1				>LDA.G CMD.bStartProc
@@ -239,10 +242,14 @@ Cmd.Exec.EXT.BIN
 				jmp Cmd.Exec.Done
 *--------------------------------------
 Cmd.Exec.EXT.Search
-				>PUSHYA					push search list
-				>PUSHW ZPPtr1			push CMD
-				>PUSHW ZPCMDBuf			push dest full path
+				pha
+				phy
 				>PUSHEA.G CMD.Stat
+				>PUSHW ZPCMDBuf			push dest full path
+				ply
+				pla
+				>PUSHYA					push search list
+				>LDYA ZPPtr1			push CMD
 				>SYSCALL FileSearch
 				rts
 *--------------------------------------
diff --git a/SYS/KERNEL.S.DRV.txt b/SYS/KERNEL.S.DRV.txt
index 932cfe39..60713e9b 100644
--- a/SYS/KERNEL.S.DRV.txt
+++ b/SYS/KERNEL.S.DRV.txt
@@ -383,8 +383,16 @@ DRV.SYS.ScrollAux
 				sta CLRREADAUX
 				rts
 *--------------------------------------
-DRV.SYS.Scroll	ldx #1
-.1				jsr DRV.SYS.SetBaseX
+DRV.SYS.Scroll	ldx #DRV.SYS.Scroll-DRV.SYS.ScrollAux-1
+				
+.1				lda DRV.SYS.ScrollAux,x
+				sta $102,x
+				dex
+				bpl .1
+			
+				ldx #1
+				
+.2				jsr DRV.SYS.SetBaseX
 
 				inx
 				lda DRV.SYS.BASEL,x
@@ -392,13 +400,6 @@ DRV.SYS.Scroll	ldx #1
 				lda DRV.SYS.BASEH,x
 				sta ZPDRV+3
 
-				ldx #DRV.SYS.Scroll-DRV.SYS.ScrollAux-1
-				
-.2				lda DRV.SYS.ScrollAux,x
-				sta $102,x
-				dex
-				bpl .2
-			
 				ldy #39
 
 				sta SETWRITEAUX
@@ -413,7 +414,7 @@ DRV.SYS.Scroll	ldx #1
 				bpl .3
 
 				cpx #23
-				bne .1					Fall in ClrLineAtX for last line
+				bne .2					Fall in ClrLineAtX for last line
 *--------------------------------------
 DRV.SYS.ClrLineAtX
 				jsr DRV.SYS.SetBaseX
diff --git a/SYS/KERNEL.S.ENV.txt b/SYS/KERNEL.S.ENV.txt
index 4c7e12d5..6e0e571c 100644
--- a/SYS/KERNEL.S.ENV.txt
+++ b/SYS/KERNEL.S.ENV.txt
@@ -164,7 +164,10 @@ K.FileSearch	pha
 				bpl .3
 .9				rts
 
-K.FileSearch.YA	jsr K.ExpandStr			Y,A = Search Path, Expand it
+K.FileSearch.YA	>STYA .4+1
+
+				>LDYA K.FileSearch.SearchPath
+				jsr K.ExpandStr			Y,A = Search Path, Expand it
 				bcs .99
 
 				stx .98+1
diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt
index 01582ed9..88b79528 100644
--- a/SYS/KERNEL.S.STDIO.txt
+++ b/SYS/KERNEL.S.STDIO.txt
@@ -40,7 +40,7 @@ K.PutChar.X		>LDYAI K.IOBuf
 				>STYA K.S.IOCTL+S.IOCTL.BUFPTR
 				stx K.S.IOCTL+S.IOCTL.BYTECNT
 				stz K.S.IOCTL+S.IOCTL.BYTECNT+1
-				jmp K.WRITE
+				jmp K.WRITE.I
 */--------------------------------------
 * # PutS
 * Write Str to StdOut, appends '\r\n'
@@ -98,7 +98,7 @@ K.FPutS.I		jsr IO.SELECT
 				
 .2				sty K.S.IOCTL+S.IOCTL.BYTECNT
 				stx K.S.IOCTL+S.IOCTL.BYTECNT+1
-				jmp K.WRITE
+				jmp K.WRITE.I
 */--------------------------------------
 * # PrintF/SPrintF/FPrintF
 * Prints C-Style String