diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 75b1ed40..e1c45401 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/PAK.S.txt b/BIN/PAK.S.txt
index b7355305..92feb5ed 100644
--- a/BIN/PAK.S.txt
+++ b/BIN/PAK.S.txt
@@ -63,7 +63,6 @@ L.MSG.OK		.DA MSG.OK
 L.MSG.ERR		.DA MSG.ERR
 L.MSG.E.IARC	.DA MSG.E.IARC
 L.ARC.Header	.DA ARC.Header
-L.MSG.DBG		.DA MSG.DBG
 				.DA 0
 *--------------------------------------
 CS.INIT			>LDYA L.LIBPAK
@@ -486,11 +485,6 @@ CS.RUN.WriteSrcData
 				jsr CS.RUN.WriteArcByteA
 				bcs .9
 				
-				>PUSHW.G Shunk.SrcSize
-				>PUSHBI 2
-				>LDYA L.MSG.DBG
-				>SYSCALL printf
-
 				>LDA.G Shunk.SrcSize
 				jsr CS.RUN.WriteArcByteA
 				bcs .9
@@ -513,11 +507,6 @@ CS.RUN.WritePakData
 				lda #CHNK.T.DATA
 				jsr CS.RUN.WriteArcByteA
 				bcs .9
-				
-*				>PUSHW.G Shunk.DstSize
-*				>PUSHBI 2
-*				>LDYA L.MSG.DBG
-*				>SYSCALL printf
 
 				>LDA.G Shunk.DstSize
 				jsr CS.RUN.WriteArcByteA
@@ -610,7 +599,6 @@ MSG.ERR			.AZ "[%h]\r\n"
 MSG.E.IARC		.AZ "Invalid/corrupt archive"
 MSG.DIR			.AZ "Reading Dir:%s..."
 MSG.FILE		.AZ "Adding File:%s..."
-MSG.DBG			.AZ "%H"
 ARC.Header		.AZ "PAK"
 *--------------------------------------
 LIBPAK			.AZ "libpak"
diff --git a/BIN/UNPAK.S.txt b/BIN/UNPAK.S.txt
index 518750aa..31679ac6 100644
--- a/BIN/UNPAK.S.txt
+++ b/BIN/UNPAK.S.txt
@@ -56,10 +56,7 @@ L.MSG.USAGE		.DA MSG.USAGE
 L.MSG.DIR		.DA MSG.DIR
 L.MSG.FILE		.DA MSG.FILE
 L.MSG.OK		.DA MSG.OK
-L.MSG.ERR		.DA MSG.ERR
 L.MSG.E.IARC	.DA MSG.E.IARC
-L.MSG.E.OFS		.DA MSG.E.OFS
-L.MSG.DBG		.DA MSG.DBG
 				.DA 0
 *--------------------------------------
 CS.INIT			clc
@@ -204,20 +201,15 @@ CS.RUN.LOOP		jsr CS.RUN.GetByte
 				lda (ZPInBufPtr),y
 				sta ZPOutBufLen+1
 
-*				>PUSHW ZPOutBufLen
-*				>PUSHBI 2
-*				>LDYA L.MSG.DBG
-*				>SYSCALL printf
-
 				>LDA.G hOutBuf
 				>SYSCALL getmemptr
 				>STYA ZPOutBufPtr
 				
 				jsr X.Unpak
-.90				bcs .9
+				bcs .9
 				
 				jsr CS.RUN.WriteFile
-				bcs .90
+				bcs .9
 
 				jsr CS.RUN.GetByte
 				bcs .8
@@ -268,8 +260,9 @@ CS.RUN.OpenArc	pha
 .9				rts
 
 .99
-CS.RUN.E.IARC	>LDYA L.MSG.E.IARC
-				>SYSCALL puts
+CS.RUN.E.IARC	>PUSHBI 0
+				>LDYA L.MSG.E.IARC
+				>SYSCALL printf
 				lda #E.SYN
 				sec
 				rts
@@ -385,11 +378,8 @@ MSG.USAGE		.AZ "Usage : UNPAK Archive [DstDir]\r\n"
 MSG.DIR			.AZ "Creating Dir:%s..."
 MSG.FILE		.AZ "Extracting File:%s..."
 MSG.OK			.AZ "[OK]"
-MSG.ERR			.AZ "[%h]\r\n"
-MSG.E.IARC		.AZ "Invalid/corrupt archive"
-MSG.E.OFS		.AZ "UnPak Error at Offset : %L\r\n"
+MSG.E.IARC		.AZ "\r\nInvalid/corrupt archive"
 MSG.PAK			.AS "PAK"
-MSG.DBG			.AZ "%H"
 *--------------------------------------
 				.DUMMY
 				.OR 0
diff --git a/SHARED/X.UNPAK.S.txt b/SHARED/X.UNPAK.S.txt
index 0e57cf6a..5d8439b6 100644
--- a/SHARED/X.UNPAK.S.txt
+++ b/SHARED/X.UNPAK.S.txt
@@ -88,7 +88,6 @@ X.Unpak.PAK		pha						A = BLBITS
 * TOP8
 				ldx #3
 				jsr X.Unpak.GetXBitInA
-
 				bra .51
 *--------------------------------------				
 .4				jsr X.Unpak.GetBitInC
@@ -97,7 +96,6 @@ X.Unpak.PAK		pha						A = BLBITS
 				ldx #3
 				jsr X.Unpak.GetXBitInA
 				ora #%1000
-
 				bra .51
 *--------------------------------------				
 .5				jsr X.Unpak.GetBitInC
@@ -111,9 +109,10 @@ X.Unpak.PAK		pha						A = BLBITS
 				lda (ZPPtr1),y
 
 .52				jsr X.Unpak.PutByte
-				beq .99
-
-				bra .80
+				bne .80
+				
+.99				sec
+				rts
 *--------------------------------------
 * BACKLINK : 1111 OfsLBits OfsHBits LenBits
 
@@ -150,21 +149,25 @@ X.Unpak.PAK		pha						A = BLBITS
 				
 .62				lda (ZPPtr2),y
 				jsr X.Unpak.PutByte
-				beq .99
+				bne .63
 				
-				iny
+				dex
+				bne .99
+
+				clc
+				rts
+				
+.63				iny
 				dex
 				bne  .62
 				
 .80				lda ZPnCnt
-				ora ZPnCnt+1
+				and ZPnCnt+1
+				inc
 				bne .2
 				
 				clc
 				rts
-				
-.99				sec
-				rts
 *--------------------------------------
 X.Unpak.GetXBitInA
 				lda #0
diff --git a/SYS/KERNEL.S.PWDX.txt b/SYS/KERNEL.S.PWDX.txt
index 61d7336c..cd82c3c7 100644
--- a/SYS/KERNEL.S.PWDX.txt
+++ b/SYS/KERNEL.S.PWDX.txt
@@ -433,13 +433,14 @@ PWD.GetRecordLen
 
 				lda #':'
 				jsr PWD.StoreChar
-				iny						S.PW.UID
+				
+				ldy #S.PW.GID
 				jsr SHARED.TXTPTR.GetY
 				jsr PWD.StoreByte
 				lda #':'
 				jsr PWD.StoreChar
 
-*				iny						S.PW.GECOS
+				ldy #S.PW.GECOS-1
 
 				jsr PWD.StoreString
 				lda #':'
diff --git a/SYS/KERNEL.S.TERM.txt b/SYS/KERNEL.S.TERM.txt
index 948c396d..02303e48 100644
--- a/SYS/KERNEL.S.TERM.txt
+++ b/SYS/KERNEL.S.TERM.txt
@@ -438,7 +438,9 @@ DRV.TERM.CSI	ldy #S.DCB.TTY.INBUFFER
 				bcs DRV.TERM.CSI.Exec
 				cpy #S.DCB.TTY.INBUFFER.MAX-1	buffer full?
 				bne .8
+
 				jsr RESET.MODE
+
 .8				clc
 				rts
 
@@ -488,8 +490,10 @@ DRV.TERM.CSI.Exec
 
 .6				cmp CsiCodes,x
 				beq .7
+				
 				dex
-				bne .6
+				bpl .6
+				
 				clc
 				rts