diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index d3c08d49..491decca 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 8b34d0ed..e7f3cbf4 100644
Binary files a/.Floppies/A2OSX.TEST.po and b/.Floppies/A2OSX.TEST.po differ
diff --git a/DRV/PPPSSC.DRV.S.txt b/DRV/PPPSSC.DRV.S.txt
index ef1390be..67d432cb 100644
--- a/DRV/PPPSSC.DRV.S.txt
+++ b/DRV/PPPSSC.DRV.S.txt
@@ -56,10 +56,11 @@ L.FD.DEV		.DA FD.DEV
 L.FD.DEV.NAME	.DA FD.DEV.NAME
 L.ETCFILE		.DA ETCFILE
 L.MSG.ETCFILE	.DA MSG.ETCFILE
+L.MSG.UNEXPECTED	.DA MSG.UNEXPECTED
+L.MSG.SYNTAX	.DA MSG.SYNTAX
 L.MSG.DUMPBUF	.DA MSG.DUMPBUFS
 				.DA MSG.DUMPBUFR
 L.MSG.HEXDUMP	.DA MSG.HEXDUMP
-L.MSG.STRING	.DA MSG.STRING
 L.PPP.LCPReq	.DA PPP.LCPReq
 L.PPP.IPCPReq	.DA PPP.IPCPReq
 L.FILE.Buf		.DA FILE.Buf
@@ -119,6 +120,7 @@ Dev.Detect		>STYA ZPArgsPtr
 
 				jsr SSC.Init
 				jsr PPP.ETCFILE
+				bcs .99
 				jsr PPP.Init
 				bcs .99
 
@@ -169,7 +171,7 @@ PPP.ETCFILE		>PUSHW L.ETCFILE
 				>PUSHWI 255
 				>SYSCALL FGetS
 				bcs .8
-
+				
 				lda FILE.Buf
 				cmp #'#'
 				beq .1
@@ -189,26 +191,55 @@ PPP.ETCFILE		>PUSHW L.ETCFILE
 .2				cmp #'!'
 				bne .7
 				
-				jsr SSC.Read
+.3				jsr SSC.Read
 				bcs .9
 
 				tya
-				beq .2
+				beq .3
 
 				lda #0
 				sta RCV.Buf,y
 
-				>PUSHW L.MSG.STRING
-				tya
-				>PUSHA
-				>PUSHW L.RCV.Bufp2
-				>PUSHBI 3
-				>SYSCALL PrintF
+				>LDYA L.RCV.Bufp1
+				>STYA ZPPtr2
+	
+.4				ldy #0
 
+.5				iny
+				lda FILE.Buf,y
+				bne .6
+				
+				lda #C.CR
+				
+.6				cmp (ZPPtr2),y
+				bne .60
+				
+				cmp #C.CR
+				bne .5
 				jmp .1
 				
-.7				lda #E.SYN
+.60				ldy #0
+
+.61				iny
+				lda (ZPPtr2),y
+				cmp #C.LF
+				bne .61
+				
+				tya
 				sec
+				adc ZPPtr2
+				sta ZPPtr2
+				bcc .62
+				
+				inc ZPPtr2+1
+
+.62				lda (ZPPtr2)
+				bne .60
+				
+				jsr PPP.ETCFILE.ERR1
+				bra .9
+				
+.7				jsr PPP.ETCFILE.ERR2
 				bra .9
 
 .8				cmp #MLI.E.EOF
@@ -225,7 +256,25 @@ PPP.ETCFILE		>PUSHW L.ETCFILE
 				pla
 				plp
 
-.99				rts
+				rts
+*--------------------------------------
+PPP.ETCFILE.ERR1
+				>PUSHW L.MSG.UNEXPECTED
+				>PUSHW L.RCV.Buf
+				>PUSHBI 2
+				>SYSCALL PrintF
+				lda #MLI.E.IO
+				sec
+				rts
+*--------------------------------------
+PPP.ETCFILE.ERR2
+				>PUSHW L.MSG.SYNTAX
+				>PUSHW L.FILE.Buf
+				>PUSHBI 2
+				>SYSCALL PrintF
+				lda #MLI.E.IO
+				sec
+				rts
 *--------------------------------------
 PPP.Init		>LDYAI PPP.LCPReq.LEN
 				>STYA ZPBufLen
@@ -344,7 +393,8 @@ SSC.Write		php
 				iny
 				bne .2
 
-.9				lda	#MLI.E.IO
+.9				pla
+				lda	#MLI.E.IO
 				plp
 				sec
 				rts
@@ -434,7 +484,8 @@ DumpBuf			>STYA ZPPtr1
 
 				lda (ZPPtr1)
 				cmp #$0D
-				bne DumpBuf.PPP
+*			bne DumpBuf.PPP
+			bra DumpBuf.PPP
 			
 				lda ZPBufLen
 				eor #$ff
@@ -641,10 +692,11 @@ DEVSIG.Length	.EQ DEVSIG.Value-DEVSIG.Offset
 MSG.DETECT		.AZ "PPP Driver For Apple SSC."
 MSG.DETECT.OK	.AZ "PPP Installed As Device : %s\r\n"
 MSG.DETECT.KO	.AZ "No SSC Found."
-MSG.STRING		.AZ "[%h]:{%s}\r\n"
 ETCFILE			.AZ "${ROOT}etc/ppp.conf"
 *--------------------------------------
 MSG.ETCFILE		.AZ "Executing %s File...\r\n"
+MSG.UNEXPECTED	.AZ "\r\nERR:Unexpected reply From Modem\r\n{%s}\r\n"
+MSG.SYNTAX		.AZ "\r\nERR:Bad Syntax In ppp.conf\r\n{%s}\r\n"
 MSG.DUMPBUFS	.AZ "Send:%H\r\n"
 MSG.DUMPBUFR	.AZ "Recv:%H\r\n"
 MSG.HEXDUMP		.AZ "%H:%h %h %h %h %h %h %h %h\r\n"
diff --git a/LIB/LIBBLKDEV.S.D2.txt b/LIB/LIBBLKDEV.S.D2.txt
index cd9fc394..aa05fbb4 100644
--- a/LIB/LIBBLKDEV.S.D2.txt
+++ b/LIB/LIBBLKDEV.S.D2.txt
@@ -141,6 +141,8 @@ D2MoveHead.SEI	lda MoveFrom
 				jsr D2.Wait25600usec
 
 .8				sta IO.D2.Ph0Off,x
+				nop
+				nop
 				sta IO.D2.Ph0Off,y
 				rts
 */--------------------------------------
diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt
index 1c8c46ec..4997369f 100644
--- a/LIB/LIBBLKDEV.S.txt
+++ b/LIB/LIBBLKDEV.S.txt
@@ -321,14 +321,14 @@ BuildProDOSCat.BM
 				bra .7
 *--------------------------------------
 ZeroPtr1		phy
-
+				pha
 				lda #0
 				tay
 
 .1				sta (ZPPtr1),y
 				iny
 				bne .1
-
+				pla
 				ply
 				rts
 *--------------------------------------
diff --git a/LIB/LIBGUI.S.CUR.txt b/LIB/LIBGUI.S.CUR.txt
index ecd3f609..eb77da97 100644
--- a/LIB/LIBGUI.S.CUR.txt
+++ b/LIB/LIBGUI.S.CUR.txt
@@ -94,14 +94,17 @@ SetCursorPos	>PULLW ZPPtr1
 
 				lda CUR.bVisible
 				bmi ShowCursor.I
-	
+
+				clc
 				rts
 *--------------------------------------
 HideCursor		lda CUR.bVisible
 				bpl .9
 				jsr HideCursor.I
 				stz CUR.bVisible
-.9				rts
+
+.9				clc
+				rts
 *--------------------------------------
 ShowCursor		lda CUR.bVisible
 				bmi .9
@@ -141,11 +144,12 @@ DrawCursor.I	sta CB.PTR+S.CB.OP
 
 				>LDYA L.CB.PTR
 				jsr CLIP.YA
-				bcs .9
+				bcs .8
 			
-				jmp GFXWrite.CB
+				jsr GFXWrite.CB
+.8				clc
 
-.9				rts
+				rts
 *--------------------------------------
 MAN
 SAVE usr/src/lib/libgui.s.cur
diff --git a/LIB/LIBGUI.S.DRAW.txt b/LIB/LIBGUI.S.DRAW.txt
index e6ccd491..b2b82a92 100644
--- a/LIB/LIBGUI.S.DRAW.txt
+++ b/LIB/LIBGUI.S.DRAW.txt
@@ -543,7 +543,7 @@ DrawCBBufToYA	pha
 
 .8				lda hCBBuf
 				stz hCBBuf
-				>SYSCALL FreeMem
+				>SYSCALL2 FreeMem
 
 				clc
 
diff --git a/LIB/LIBGUI.S.MENU.txt b/LIB/LIBGUI.S.MENU.txt
index 5cd95c35..0ab17fc0 100644
--- a/LIB/LIBGUI.S.MENU.txt
+++ b/LIB/LIBGUI.S.MENU.txt
@@ -715,7 +715,7 @@ MENU.Save		lda #S.CB.CMD.GETRECTBUFSIZE
 
 				jsr GFXWrite.CB
 
-				>SYSCALL NewStkObj
+				>SYSCALL2 NewStkObj
 				bcs .9
 
 				stx CB.Cache+S.CB.DstPtr
@@ -774,7 +774,7 @@ MENU.Destroy	clc
 
 				ldx MENU.Stack.Top
 				lda MENU.Stack-1,x
-				>SYSCALL GetMemPtr
+				>SYSCALL2 GetMemPtr
 				>STYA ZPMENUPtr
 
 				ldy #S.OBJ.X1
diff --git a/LIB/LIBGUI.S.MOU.txt b/LIB/LIBGUI.S.MOU.txt
index fff24ebd..b6c64ed8 100644
--- a/LIB/LIBGUI.S.MOU.txt
+++ b/LIB/LIBGUI.S.MOU.txt
@@ -107,7 +107,7 @@ MOU.CheckOverMenu
 
 				lda MENU.Stack-1,x
 
-				>SYSCALL GetMemPtr
+				>SYSCALL2 GetMemPtr
 				>STYA ZPMENUPtr
 				pha
 				tya
@@ -157,7 +157,7 @@ MOU.CheckOverWND
 .1				stx WND.Stack.Idx
 
 				lda WND.Stack-1,x
-				>SYSCALL GetMemPtr
+				>SYSCALL2 GetMemPtr
 				>STYA ZPWNDPtr
 
 				ldy #S.OBJ.F
@@ -206,6 +206,7 @@ MOU.CheckOverWND
 				bcc .4					not in MBAR
 
 
+
 				bra .5
 
 .4				iny						#S.WND.SBarY1
@@ -215,7 +216,7 @@ MOU.CheckOverWND
 				iny
 				lda (ZPWNDPtr),y
 				sbc MouseData+S.MOUSE.Y1+1
-				bcs .6					not in TBAR
+				bcs .6					not in SBAR
 
 
 
diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt
index d1c9f295..f5b4e6f7 100644
--- a/LIB/LIBGUI.S.txt
+++ b/LIB/LIBGUI.S.txt
@@ -258,7 +258,7 @@ GetCBBuf		clc
 				bne .9
 
 				>LDYAI 512
-				>SYSCALL GetMem
+				>SYSCALL2 GetMem
 				bcs .9
 				
 				stx hCBBuf
diff --git a/ProDOS.FX/ProDOS.S.XRW.txt b/ProDOS.FX/ProDOS.S.XRW.txt
index 1e714f7c..842c76ab 100644
--- a/ProDOS.FX/ProDOS.S.XRW.txt
+++ b/ProDOS.FX/ProDOS.S.XRW.txt
@@ -129,8 +129,8 @@ L59BD  			lda bloknml
 * motor should be up to speed,
 * if it looks stopped then the drive is not present
 
-*				jsr XRW.CheckMotorOn	is drive present ?
-*				beq XRW.E.ND
+				jsr XRW.CheckMotorOn	is drive present ?
+				beq XRW.E.ND
 *--------------------------------------
 L538E  			lda A4L					get command #
 				bne .1
@@ -388,6 +388,8 @@ XRW.Seek		ldx XRW.UnitIndex
 				jsr XRW.Wait25600usec
 
 XRW.SEEKOFF		sta IO.D2.Ph0Off,x
+				nop
+				nop
 				sta IO.D2.Ph0Off,y
 				rts
 *--------------------------------------
@@ -593,6 +595,9 @@ XRW.Write		bit IO.D2.ReadProt,x	(4) PREWRITE MODE
 				lda #$FF   				(2)
 				nop						(2)
 
+				nop						(2)
+				nop						(2)
+		
 				sta IO.D2.WriteMode,x	(5) goto write mode
 				ora IO.D2.WShift,x		(4)