diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index aed2d842..46096b8f 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 9eb804ce..f5a7a3eb 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -678,7 +678,7 @@ CMD.EXIT		lda (ZPArgVBufPtr)
 				
 .1				ldy #S.PS.RC
 				sta (pPs),y
-	
+
 .2				jsr CORE.StkPull		Pull everything until CALL . CL...
 				bcs .9
 
@@ -723,6 +723,9 @@ CMD.EXIT.FILE	jsr CORE.StkPull
 				jsr CORE.StkPull
 				sta ZPInputBuf
 
+				ldy #S.PS.RC
+				lda (pPs),y
+				
 				clc
 				rts
 *--------------------------------------
diff --git a/BIN/USERADD.S.txt b/BIN/USERADD.S.txt
index 853cb2b3..0a9da257 100644
--- a/BIN/USERADD.S.txt
+++ b/BIN/USERADD.S.txt
@@ -3,7 +3,7 @@ NEW
 			.LIST OFF
 			.OP	65C02
 			.OR	$2000
-			.TF BIN/USERADD
+			.TF bin/useradd
 *--------------------------------------
 USER.MAX	.EQ 16
 PASS.MAX	.EQ 64
@@ -367,7 +367,7 @@ OptionList		>PSTR "CcDdPpSs"
 *--------------------------------------
 * Initialized DATA
 *--------------------------------------
-LIBCRYPT		.AZ "LIBCRYPT"
+LIBCRYPT		.AZ "libcrypt"
 hLIBCRYPT		.BS 1
 *--------------------------------------
 MSG.USAGE		.AS "Usage : USERADD username\r\n"
@@ -382,16 +382,16 @@ MSG.MISMATCH	.AZ "\r\nPasswords mismatch...\r\n"
 MSG.DUP			.AZ "\r\nDuplicate username...\r\n"
 MSG.BS			.DA #C.BS,#C.SPACE,#C.BS,#0
 *--------------------------------------
-PW.ROOT			.AS "ROOT"
+PW.ROOT			.AS "root"
 				.BS 17-4
 				.AZ "D41D8CD98F00B204E9800998ECF8427E"
 				.DA #0					UID
 				.DA #0					GID
 				.AS "Root User"
 				.BS 65-9
-				.AS "${ROOT}ROOT/"
+				.AS "${ROOT}root/"
 				.BS 65-12
-				.AS "${ROOT}BIN/SH"
+				.AS "${ROOT}bin/sh"
 				.BS 65-13
 *--------------------------------------
 PW.DEFAULT		.BS 17					NAME
@@ -399,9 +399,9 @@ PW.DEFAULT		.BS 17					NAME
 				.DA #0					UID
 				.DA #1					GID
 				.BS 65					GECOS
-				.AS "${ROOT}USR/"
+				.AS "${ROOT}usr/"
 				.BS 65-11
-				.AS "${ROOT}BIN/SH"
+				.AS "${ROOT}bin/sh"
 				.BS 65-13
 *--------------------------------------
 * Per Process DATA segment
diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt
index a6ec74b6..993df548 100644
--- a/SBIN/LOGIN.S.txt
+++ b/SBIN/LOGIN.S.txt
@@ -3,7 +3,7 @@ NEW
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
-				.TF SBIN/LOGIN
+				.TF sbin/login
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
@@ -482,17 +482,17 @@ MSG.LOGIN		.AZ "\r\nlogin:"
 MSG.PASSWORD	.AZ "\r\npassword:"
 MSG.BAD			.AZ "Bad user or password"
 MSG.BS			.DA #C.BS,#C.SPACE,#C.BS,#0
-ETCISSUE		.AZ "${ROOT}ETC/ISSUE"
-ETCMOTD			.AZ "${ROOT}ETC/MOTD"
+ETCISSUE		.AZ "${ROOT}etc/issue"
+ETCMOTD			.AZ "${ROOT}etc/motd"
 SHELL			.AZ "${SHELL}"
 *--------------------------------------
 SESSION.ROOT	.DA #S.SESSION.P.ROOT
 				.DA #0					UID
 				.DA #0					GID
-				.AZ "ROOT"				NAME
+				.AZ "root"				NAME
 				.AZ "Root User"			GECOS
-				.AZ "${ROOT}ROOT/"		DIR
-				.AZ "${ROOT}BIN/SH"		SHELL
+				.AZ "${ROOT}root/"		DIR
+				.AZ "${ROOT}bin/sh"		SHELL
 SESSION.ROOT.Size	.EQ	*-SESSION.ROOT
 *--------------------------------------
 				.DUMMY
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index b8bf7788..d728f47c 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -1154,12 +1154,12 @@ DEV.CONSOLE		.AZ "/dev/console"
 RAMx			.AZ "/RAMx"
 I.ENV.BOOT		.AZ "BOOT"
 I.ENV.ROOT		.AZ "ROOT"
-I.ENV.PATH		.AZ "PATH=${BOOT}SBIN/:${BOOT}BIN/"
+I.ENV.PATH		.AZ "PATH=${BOOT}sbin/:${BOOT}bin/"
 I.ENV.LIB		.AZ "LIB=${BOOT}lib/"
-I.ENV.DRV		.AZ "DRV=${BOOT}DRV/"
-CTRLR.SHELL		.AZ "${BOOT}BIN/SH"
-ETCINIT.CMDLINE	.AZ "${ROOT}ETC/INIT"
-ETCPASSWD		.AZ "${ROOT}ETC/PASSWD"
+I.ENV.DRV		.AZ "DRV=${BOOT}drv/"
+CTRLR.SHELL		.AZ "${BOOT}bin/sh"
+ETCINIT.CMDLINE	.AZ "${ROOT}etc/init"
+ETCPASSWD		.AZ "${ROOT}etc/passwd"
 *--------------------------------------
 PwdMgr.ROOT		.DA #S.SESSION.P.ROOT
 				.DA #0					UID
diff --git a/SYS/KERNEL.S.PWD.txt b/SYS/KERNEL.S.PWD.txt
index a0e13d60..63a4d2eb 100644
--- a/SYS/KERNEL.S.PWD.txt
+++ b/SYS/KERNEL.S.PWD.txt
@@ -64,7 +64,7 @@ K.FlushEtcPasswd
 PWD.hDB			.BS 1
 PWD.DBPtr		.BS 2
 PWD.DBSize		.BS 2
-PWD.FILE		.AZ "${ROOT}ETC/PASSWD"
+PWD.FILE		.AZ "${ROOT}etc/passwd"
 *--------------------------------------
 MAN
 SAVE USR/SRC/SYS/KERNEL.S.PWD