diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 83d56e19..eb2d7ad5 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 9b6688de..83503132 100644
Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 647b5a60..9e34dad1 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -555,38 +555,48 @@ CMD.FUNCTION	lda (ZPArgVBufPtr)
 *--------------------------------------
 .10				jsr CORE.GetCharNB
 				bcs .9
+
 				cmp #'{'
 				bne .9
+
 				jsr CORE.GetNextCharNB
 				bcs .9
+
 .11				stz M32.ACC				'{' counter
 
 				>LDYA ZPInputBufPtr
 				>STYA ZPPtr1
+
 				ldy #0
 				ldx #0
 				lda (ZPInputBufPtr)
 				beq .6
+
 .12				cmp #'{'
 				bne .13
+
 				inc M32.ACC
 				bra .14
+
 .13				cmp #'}'
 				bne .14
+
 				dec M32.ACC
 				bmi .7
+
 .14				iny
 				bne .15
 				inx
 
 .15				jsr CORE.GetNextChar
 				bne .12
+
 .6				lda M32.ACC
 				bpl .9
+
 .7				jsr CORE.GetNextChar	skip ending '}'
 
-				txa
-				pha
+				phx
 				phy
 				>PUSHB.G hFuncList
 				>PUSHW ZPTmpW			KeyID
@@ -614,6 +624,7 @@ CMD.CALL		jsr CMD.CALL.GETFUNC
 				>LDYA ZPArgVBufPtr		FUNC PARAM1 PARAM2...
 				jsr CORE.Load.YAX		Exec FUNC
 				bcs CMD.CALL.RTS
+
 				lda #$C0+C.CALL
 				jmp CORE.StkPush
 *--------------------------------------
diff --git a/LIB/LIBBLKDEV.S.BB.txt b/LIB/LIBBLKDEV.S.BB.txt
index ed5df272..fe253e8b 100644
--- a/LIB/LIBBLKDEV.S.BB.txt
+++ b/LIB/LIBBLKDEV.S.BB.txt
@@ -323,7 +323,7 @@ seek 			lda BB.HdrTrk			get track we're on
 				
 				jsr BB.PhaseOn
 
-				lda #60
+				lda #35
 				jsr BB.MSWait			Trash X
 
 				ldx slotz
diff --git a/LIB/LIBBLKDEV.S.D2.txt b/LIB/LIBBLKDEV.S.D2.txt
index 6ff16c09..385aaf21 100644
--- a/LIB/LIBBLKDEV.S.D2.txt
+++ b/LIB/LIBBLKDEV.S.D2.txt
@@ -47,7 +47,7 @@ D2MoveHead		>PULLB MoveTo
 			    sta MoveFrom
 				jsr D2.PhaseOn
 
-				lda #60
+				lda #30
 				jsr D2.Wait100msA		Trash X
 
 				ldx Slotn0
diff --git a/ProDOS.FX/ProDOS.S.XRW.txt b/ProDOS.FX/ProDOS.S.XRW.txt
index 94742aaa..e531af69 100644
--- a/ProDOS.FX/ProDOS.S.XRW.txt
+++ b/ProDOS.FX/ProDOS.S.XRW.txt
@@ -760,7 +760,7 @@ XRW.Seek		ldx XRW.UnitIndex
 
 				jsr XRW.PhaseOn
 				
-				lda #90					wait 9.000 usec
+				lda #35					wait 3.500 usec
 				jsr XRW.Wait100msA		Trash X
 
 				jsr XRW.AllPhaseOff
diff --git a/SYS/KERNEL.S.SLISTX.txt b/SYS/KERNEL.S.SLISTX.txt
index 875fa947..a7e331d2 100644
--- a/SYS/KERNEL.S.SLISTX.txt
+++ b/SYS/KERNEL.S.SLISTX.txt
@@ -76,7 +76,7 @@ SLISTX.SListGetData
 .2				inc SLIST.nDataCnt
 				bne .3
 				inc SLIST.nDataCnt+1
-				beq .80
+				beq .81
 
 .3				bit SLIST.bStringMode
 				bmi .4					String mode : until CR