diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 868995af..b5bf9f09 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index ae917d39..d1e98209 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -452,7 +452,8 @@ Ctrl.Q			>LDA.G bUnSaved
 .8				lda #$ff
 				>STA.G bExit
 
-.80				jmp SCRN.UpdateStatusBar
+.80				jsr SCRN.UpdateStatusBar
+				jmp SCRN.GotoCurXCurY
 
 .9				rts
 *--------------------------------------
diff --git a/SYS/KERNEL.S.ENV.txt b/SYS/KERNEL.S.ENV.txt
index 615a4f45..15a04d69 100644
--- a/SYS/KERNEL.S.ENV.txt
+++ b/SYS/KERNEL.S.ENV.txt
@@ -382,25 +382,7 @@ K.GetEnv		>PULLW FORPNT			value
 K.GetEnv.I		ldy #S.PS.hENV
 				lda (pPs),y
 				
-				ldy TXTPTR+1
-				bne	.10
-
-				tax
-				
-				jsr MEM.GetMemByID
-				
 				sta SETREADAUX
-				ldy #S.MEM.LEN
-				lda (ZPMemMgrSPtr),y
-				pha
-				iny
-				lda (ZPMemMgrSPtr),y
-				ply
-				sta CLRREADAUX
-
-				jmp MEM.CopyToMain
-
-.10				sta SETREADAUX
 				sta SETWRITEAUX
 				jsr ENVX.GetEnv
 				sta CLRREADAUX
@@ -432,7 +414,7 @@ K.UnsetEnv.I	ldy #S.PS.hENV
 ENV.NextEnvP3	jsr ENV.GetP3LenY
 *--------------------------------------
 ENV.NextEnvP3Y	tya
-ENV.NextEnvP3A	sec
+				sec
 				adc ZPPtr3
 				sta ZPPtr3
 				bcc .8
diff --git a/SYS/KERNEL.S.ENVX.txt b/SYS/KERNEL.S.ENVX.txt
index 5dbc8c35..bc0bef69 100644
--- a/SYS/KERNEL.S.ENVX.txt
+++ b/SYS/KERNEL.S.ENVX.txt
@@ -113,7 +113,23 @@ ENVX.SetEnv		jsr ENVX.UnsetEnv
 
 .9				rts
 *--------------------------------------
-ENVX.GetEnv		sta ENVX.hEnv
+ENVX.GetEnv		ldy TXTPTR+1
+				bne	.10
+
+				tax						hMem for CopyToMain
+				
+				jsr MEM.GetMemByID
+				
+				ldy #S.MEM.LEN
+				lda (ZPMemMgrSPtr),y
+				pha
+				iny
+				lda (ZPMemMgrSPtr),y
+				ply						YA = Len
+
+				jmp MEM.CopyToMain
+
+.10				sta ENVX.hEnv
 
 				jsr ENVX.FindVar
 				bcs .9
diff --git a/SYS/KERNEL.S.MEM.txt b/SYS/KERNEL.S.MEM.txt
index 692f96af..54dcb463 100644
--- a/SYS/KERNEL.S.MEM.txt
+++ b/SYS/KERNEL.S.MEM.txt
@@ -553,7 +553,8 @@ MEM.MoveToMain	sec
 				stx .2+1				Save AUX hMem
 				>STYA A2L				Save LEN to copy/move
 
-				jsr K.GetMem
+				ldx #SYS.GetMem
+				jsr K.SYSCALL2.MAIN
 				bcs .9
 
 				stx .8+1				Save MAIN hMem
diff --git a/SYS/KERNEL.S.TERM.txt b/SYS/KERNEL.S.TERM.txt
index 19c029e4..b9f4e198 100644
--- a/SYS/KERNEL.S.TERM.txt
+++ b/SYS/KERNEL.S.TERM.txt
@@ -21,66 +21,39 @@ DRV.TERM.STATUS.LC
 				
 				ldy #S.IOCTL.STATCODE
 				lda (ZPIOCTL),y
-				
-				sta SETREADAUX
-				sta SETWRITEAUX
-				jsr DRV.TERM.STATUS
-				sta CLRREADAUX
-				sta CLRWRITEAUX
-				rts
+				bra DRV.TERM.TOAUX
 
 DRV.TERM.CONTROL.LC
-				jsr DRV.TERM.GetDCB
-				
-				sta SETREADAUX
-				sta SETWRITEAUX
-				jsr DRV.TERM.CONTROL
-				sta CLRREADAUX
-				sta CLRWRITEAUX
-				rts
-				
 DRV.TERM.OPEN.LC
-				tax						DEV.ID in A
-
-				jsr DRV.TERM.GetDCB
-				
-				sta SETREADAUX
-				sta SETWRITEAUX
-				jsr DRV.TERM.OPEN
-				sta CLRREADAUX
-				sta CLRWRITEAUX
-				rts
-				
 DRV.TERM.CLOSE.LC
+				pha						DEV.ID in A for OPEN
 				jsr DRV.TERM.GetDCB
-
-				sta SETREADAUX
-				sta SETWRITEAUX
-				jsr DRV.TERM.CLOSE
-				sta CLRREADAUX
-				sta CLRWRITEAUX
-				rts
+				pla
+				bra DRV.TERM.TOAUX
 				
 DRV.TERM.READ.LC
-				jsr DRV.TERM.GetIOCTLBufCntDCB
-				
-				sta SETREADAUX
-				sta SETWRITEAUX
-				jsr DRV.TERM.READ
-				sta CLRREADAUX
-				sta CLRWRITEAUX
-				rts
-				
 DRV.TERM.WRITE.LC
 				jsr DRV.TERM.GetIOCTLBufCntDCB
-
-				sta SETREADAUX
+*--------------------------------------
+DRV.TERM.TOAUX	sta SETREADAUX
 				sta SETWRITEAUX
-				jsr DRV.TERM.WRITE
+				jsr .1
 				sta CLRREADAUX
 				sta CLRWRITEAUX
 				rts
 				
+.1				jmp (.2,x)
+
+.2				.DA DRV.TERM.STATUS
+				.DA A2osX.BADCALL
+				.DA A2osX.BADCALL
+				.DA A2osX.BADCALL
+				.DA DRV.TERM.CONTROL
+				.DA A2osX.BADCALL
+				.DA DRV.TERM.OPEN
+				.DA DRV.TERM.CLOSE
+				.DA DRV.TERM.READ
+				.DA DRV.TERM.WRITE
 *--------------------------------------
 DRV.TERM.GetIOCTLBufCntDCB
 				>STYA ZPIOCTL
diff --git a/SYS/KERNEL.S.TERMX.txt b/SYS/KERNEL.S.TERMX.txt
index 6e1f22d4..125c9aa6 100644
--- a/SYS/KERNEL.S.TERMX.txt
+++ b/SYS/KERNEL.S.TERMX.txt
@@ -83,7 +83,8 @@ DRV.TERM.OPEN.E	lda #MLI.E.OPEN
 				sec
 				rts
 *--------------------------------------
-DRV.TERM.OPEN	jsr DRV.TERM.ISOPENED
+DRV.TERM.OPEN	tax
+				jsr DRV.TERM.ISOPENED
 				bne DRV.TERM.OPEN.E
 
 DRV.TERM.OPEN.1	txa