diff --git a/applecorn.po b/applecorn.po
index c5ca7ff..76a678f 100644
Binary files a/applecorn.po and b/applecorn.po differ
diff --git a/mainmem.init.s b/mainmem.init.s
index bf6d5e3..2d5b02f 100644
--- a/mainmem.init.s
+++ b/mainmem.init.s
@@ -33,7 +33,7 @@ SETPRFX     LDA   #GPFXCMD
             TAX
             INX
             STX   DRVBUF1           ; was $0300
-            LDA   #$2F
+            LDA   #'/'
             STA   DRVBUF2           ; was $0301
             DEC   :OPC7
             BNE   :L1
diff --git a/mainmem.path.s b/mainmem.path.s
index c334b86..b8a470f 100644
--- a/mainmem.path.s
+++ b/mainmem.path.s
@@ -9,9 +9,10 @@
 * Also allows '^' as '^' is illegal character in ProDOS
 * Carry set on error, clear otherwise
 PREPATH     LDX   MOSFILE      ; Length
-            BEQ   :EXIT        ; If zero length
-            LDA   MOSFILE+1    ; 1st char of pathname
-            CMP   #$3A         ; ':'
+            BNE   :S1
+            JMP   :EXIT        ; If zero length
+:S1         LDA   MOSFILE+1    ; 1st char of pathname
+            CMP   #':'
             BNE   :NOTCOLN     ; Not colon
             CPX   #$03         ; Length >= 3?
             BCC   :ERR         ; If not
@@ -31,32 +32,37 @@ PREPATH     LDX   MOSFILE      ; Length
             CMP   #$02         ; Length >= 2
             BCC   :ERR         ; If not
             LDA   MOSFILE+1    ; 1st char of filename
-            CMP   #$2F         ; '/'
+            CMP   #'/'
             BNE   :ERR
             JSR   DEL1CHAR     ; Delete '/' from MOSFILE
             BRA   :APPEND
 :NOTCOLN    JSR   GETPREF      ; Current pfx -> PREFIX
 :REENTER    LDA   MOSFILE+1    ; First char of dirname
             CMP   #'.'
-            BEQ   :UPDIR1
-            CMP   #$5E         ; '^' char
-            BEQ   :CARET       ; If '^'
-            CMP   #$2F         ; '/' char - abs path
+            BEQ   :ONEDOT
+            CMP   #'@'
+            BEQ   :CWD
+            CMP   #'^'
+            BEQ   :CARET
+            CMP   #'/'         ; Absolute path
             BEQ   :EXIT        ; Nothing to do
             BRA   :APPEND
-
-:UPDIR1     LDA   MOSFILE+2
+:ONEDOT     JSR   DEL1CHAR     ; Delete the dot
+            LDA   MOSFILE      ; Is there more?
+            BEQ   :APPEND      ; Nope - '.' alone
+            LDA   MOSFILE+1
+            CMP   #'/'         ; './'
+            BEQ   :CWD2
             CMP   #'.'         ; '..'
             BNE   :EXIT
-            JSR   DEL1CHAR     ; Delete two leading characters
-:CARET      JSR   DEL1CHAR     ; Delete '^' from MOSFILE
-            JSR   PARENT       ; Parent dir -> MOSFILE
-            LDA   MOSFILE      ; Is there more?
-            BEQ   :APPEND      ; Only '^'
+:CARET      JSR   PARENT       ; Parent dir -> PREFIX
+:CWD        JSR   DEL1CHAR     ; Delete first char from MOSFILE
+:CWD2       LDA   MOSFILE      ; Is there more?
+            BEQ   :APPEND      ; Nope!
             CMP   #$02         ; Len at least two?
             BCC   :ERR         ; Nope!
             LDA   MOSFILE+1    ; What is next char?
-            CMP   #$2F         ; Is it slash?
+            CMP   #'/'         ; Is it slash?
             BNE   :ERR         ; Nope!
             JSR   DEL1CHAR     ; Delete '/' from MOSFILE
             BRA   :REENTER     ; Go again!
@@ -74,7 +80,7 @@ PARENT      LDX   PREFIX       ; Length of string
             BEQ   :EXIT        ; Prefix len zero
             DEX                ; Ignore trailing '/'
 :L1         LDA   PREFIX,X
-            CMP   #$2F         ; Slash '/'
+            CMP   #'/'
             BEQ   :FOUND
             DEX
             CPX   #$01
@@ -104,7 +110,7 @@ DRV2PFX     CLC                ; Cy=0 A=00000sss
             INC                ; Plus '/' at each end
             INC
             STA   PREFIX       ; Store length
-            LDA   #$2F         ; '/'
+            LDA   #'/'
             STA   PREFIX+1
             STA   PREFIX+2,X
 :L1         CPX   #$00         ; Copy -> PREFIX
@@ -154,7 +160,7 @@ DIGCONV     LDY   #$01         ; First char
             CPY   #$01         ; First char?
             BEQ   :INS         ; First char is digit
             LDA   MOSFILE-1,Y  ; Prev char
-            CMP   #$2F         ; Slash
+            CMP   #'/'
             BEQ   :INS         ; Slash followed by digit
             BRA   :NOINS       ; Otherwise leave it alone
 :INS        LDA   #'N'         ; Char to insert