diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx
index ea19019b..ed0a3500 100644
Binary files a/.A2osX Issue List.xlsx and b/.A2osX Issue List.xlsx differ
diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po
index e8fff767..b1a8086a 100644
Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ
diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index a1e2b7c8..fe64e857 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SHELL.S.CL.txt b/BIN/SHELL.S.CL.txt
index 0fe49ad1..fc884dc0 100644
--- a/BIN/SHELL.S.CL.txt
+++ b/BIN/SHELL.S.CL.txt
@@ -67,13 +67,6 @@ CL.CHARIN.CTRL	cpx #C.CR
 				>PUSHBI 0
 				>LDYA L.MSG.ECHOCRLF
 				>SYSCALL printf
-
-*				>LDA.G CL.Ptr
-*				tay
-*				lda #0
-*				sta (ZPCLBuf),y
-*				tya
-*				>STA.G CL.Len
 				
 				lda #$ff
 				>STA.G CL.bExec
@@ -273,7 +266,9 @@ CL.GetLine		>LDYA ZPFileBufPtr
 				
 				lda (ZPFileBufPtr)
 				beq .9
-							
+						
+				>STZ.G CL.bInQuote
+						
 				ldy #0
 				
 .1				lda (ZPFileBufPtr),y
@@ -282,10 +277,25 @@ CL.GetLine		>LDYA ZPFileBufPtr
 				cmp #C.CR
 				beq .6
 				
-				cmp #';'
+				cmp #'"'
+				bne .2
+				
+				phy
+				>EOR.G CL.bInQuote
+				sta (pData),y
+				ply
+				
+				bra .5
+				
+.2				cmp #';'
+				bne .5
+				
+				phy
+				>LDA.G CL.bInQuote
 				beq .6
-
-				sta (ZPCLBuf),y
+				ply
+				
+.5				sta (ZPCLBuf),y
 				iny
 				cpy #CL.MAX
 				bne .1
diff --git a/BIN/SHELL.S.txt b/BIN/SHELL.S.txt
index 20e4f194..291113ab 100644
--- a/BIN/SHELL.S.txt
+++ b/BIN/SHELL.S.txt
@@ -669,6 +669,7 @@ Sleep			.BS 4
 CL.Ptr			.BS 1
 CL.Len			.BS 1
 CL.bExec		.BS 1
+CL.bInQuote		.BS 1
 
 CMD.hCLBuf		.BS 1
 
diff --git a/INC/KERNEL.I.txt b/INC/KERNEL.I.txt
index c089f22a..0f7b9018 100644
--- a/INC/KERNEL.I.txt
+++ b/INC/KERNEL.I.txt
@@ -85,10 +85,9 @@ A2osX.SaveSX	.EQ $101				Aux
 * Aux  $3FE -> 3FF : IRQ Vector
 *--------------------------------------
 K.S.STAT		.EQ $0300				S.STAT for internal kernel operations
-*K.S.DIB		.EQ $0340				S.DIB=25 or higher depends on dev type
-K.S.IOCTL		.EQ $0360				9 bytes
-K.MLI.PATH		.EQ $0369				64+1
-K.MLI.PARAMS	.EQ $03AA				Main, 18 bytes min for GetFileInfo (ATLK needs MORE!!!...32 max for now)
+K.S.IOCTL		.EQ K.S.STAT+S.STAT		9 bytes
+K.MLI.PATH		.EQ K.S.IOCTL+S.IOCTL	64+1
+K.MLI.PARAMS	.EQ K.MLI.PATH+MLI.MAXPATH+1 Main, 18 bytes min for GetFileInfo (ATLK needs MORE!!!...32 max for now)
 *--------------------------------------
 K.STACKTOP		.EQ $03ED				XFer !!! down to $3E0
 *--------------------------------------
@@ -113,9 +112,9 @@ PS.Table.Stats	.EQ $0CE0				K.PS.MAX
 OF.Table.hPath	.EQ $0D00				K.OF.MAX
 OF.Table.hFD	.EQ $0D20				K.OF.MAX
 *--------------------------------------
-Evt.Table		.EQ	$0D60				K.EVT.MAX*S.EVT.SIZE=4*8=32b
+Evt.Table		.EQ	$0D40				K.EVT.MAX*S.EVT.SIZE=4*8=32b
 *--------------------------------------
-Flt.Table		.EQ $0D80				K.FLT.MAX*S.FLT.SIZE=4*32=128b
+Flt.Table		.EQ $0D60				K.FLT.MAX*S.FLT.SIZE=4*32=128b
 *--------------------------------------
 K.Buf256		.EQ $0E00
 *--------------------------------------
diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt
index 0d879334..cb1e590a 100644
--- a/SYS/KERNEL.S.PS.txt
+++ b/SYS/KERNEL.S.PS.txt
@@ -61,7 +61,6 @@ PS.Exec			jsr PS.CreateChild		A=PID,Child S.PS at ZPPtr3,PS.Load.hMem
 				bcs .9
 				sta .8+1
 				
-*				stz PS.Load.hBIN
 				stz K.IOBuf
 				jsr PS.Load
 				bcs .90
@@ -69,10 +68,6 @@ PS.Exec			jsr PS.CreateChild		A=PID,Child S.PS at ZPPtr3,PS.Load.hMem
 				bcc .8
 				
 .90				pha						save error code
-*				lda PS.Load.hBIN
-*				beq .91
-	
-*				jsr K.FreeMem
 				
 .91				lda .8+1
 				jsr CORE.PSFree
@@ -259,9 +254,6 @@ PS.Load			>PUSHWI K.S.STAT
 				>STYA ZPPtr3
 				
 				>LDYAI K.IOBuf
-*				>SYSCALL NewStr
-*				bcs .99
-*				stx PS.Load.hBIN
 				
 				bra PS.LoadBIN.YA
 				
@@ -388,7 +380,6 @@ PS.LoadGetHeader.RTS
 *--------------------------------------
 PS.Load.ROOT	.AZ "ROOT"
 PS.Load.HEADER	.AZ "#!/"
-PS.Load.hBIN	.BS 1
 PS.Load.ArgSize	.BS 2
 PS.Load.hMem	.BS 1
 *--------------------------------------
@@ -396,14 +387,10 @@ PS.Load.hMem	.BS 1
 *--------------------------------------
 PS.AddArgV		stz PS.Load.ArgSize
 				stz PS.Load.ArgSize+1
-				
-*				lda PS.Load.hBIN
 
 				lda K.IOBuf
 				beq .10
 				
-*				jsr K.GetMemPtr
-
 				>LDYAI K.IOBuf
 				jsr K.strlen
 				iny						+1 for \0
@@ -454,12 +441,9 @@ PS.AddArgV		stz PS.Load.ArgSize
 				ldy #S.PS.hARGV
 				sta (ZPPtr3),y
 
-*				lda PS.Load.hBIN
 				lda K.IOBuf
 				beq .6
 				
-*				jsr K.GetMemPtr
-
 				>LDYAI K.IOBuf
 				>STYA ZPPtr1
 				jsr PS.AddPtr1ToStrV
diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt
index cf2695bc..d3b589a8 100644
--- a/SYS/KERNEL.S.txt
+++ b/SYS/KERNEL.S.txt
@@ -7,14 +7,15 @@ AUTO 4,1
 				.TF SYS/KERNEL
 
 				.INB INC/MACROS.I
-				.INB INC/KERNEL.I
 				.INB INC/A2OSX.I
 				.INB INC/IO.I
 				.INB INC/MLI.I
 				.INB INC/MLI.E.I
 				.INB INC/XY.MOUSE.I
 				.INB INC/GUI.I
-			
+
+				.INB INC/KERNEL.I
+				
 				.INB USR/SRC/SYS/KERNEL.S.INIT
 				.INB USR/SRC/X.PRINTF.S