diff --git a/applecorn.po b/applecorn.po
index 10f235e..e428930 100644
Binary files a/applecorn.po and b/applecorn.po differ
diff --git a/applecorn.s b/applecorn.s
index ad15472..2f7c84f 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -83,31 +83,41 @@ XFMAIN      MAC
             EOM
 
 * Macro to load addr into STRTL/STRTH
+* Called by code running in main mem
 XFADDR      MAC
+            PHA
             LDA   #<]1
             STA   STRTL
             LDA   #>]1
             STA   STRTH
+            PLA
             EOM
 
 * Macro to backup STRTL/STRTH then load XFADDR
-* Callers running with AltZP should call this one
-ALXFADDR    MAC
+* Called by code running in aux mem
+XFADDRAUX   MAC
+            PHA
             LDA   STRTL
             STA   STRTBCKL
             LDA   STRTH
             STA   STRTBCKH
-            >>>   XFADDR,]1
+            LDA   #<]1
+            STA   STRTL
+            LDA   #>]1
+            STA   STRTH
+            PLA
             EOM
 
 * Macro to recover STRTL/STRTH
-* Used by callers running with AltZP to recover
 * STRTL and STRTH after XFER returns
+* Called by code running in aux mem
 XFRECVR     MAC
+            PHA
             LDA   STRTBCKL
             STA   STRTL
             LDA   STRTBCKH
             STA   STRTH
+            PLA
             EOM
 
 * Code is all included from PUT files below ...
diff --git a/auxmem.s b/auxmem.s
index 4d9518a..496b6f5 100644
--- a/auxmem.s
+++ b/auxmem.s
@@ -311,14 +311,14 @@ FINDHND     PHX
             STA   $C004                      ; Write main
             STY   MOSFILE                    ; Length (Pascal string)
             STA   $C005                      ; Write aux
-            >>>   ALXFADDR,OFILE
+            >>>   XFADDRAUX,OFILE
             PLA                              ; Recover options
 :S1         >>>   XFMAIN
 
 :CLOSE      STA   $C004                      ; Write main
             STY   MOSFILE                    ; Write file number
             STA   $C005                      ; Write aux
-            >>>   ALXFADDR,CFILE
+            >>>   XFADDRAUX,CFILE
             BRA   :S1
 
 OSFINDRET
@@ -359,7 +359,7 @@ BPUTHND     PHX
             STA   $C005                      ; Write to aux memory
             TSX                              ; Stash alt SP in $0101
             STX   $0101
-            >>>   ALXFADDR,FILEPUT
+            >>>   XFADDRAUX,FILEPUT
             PLA                              ; Char to write
             PHA
             >>>   XFMAIN
@@ -381,7 +381,7 @@ BGETHND     PHX
             STA   $C005                      ; Write to aux memory
             TSX                              ; Stash alt SP in $0101
             STX   $0101
-            >>>   ALXFADDR,FILEGET
+            >>>   XFADDRAUX,FILEGET
             >>>   XFMAIN
 OSBGETRET
             LDX   $0101                      ; Recover alt SP from $0101
@@ -439,7 +439,7 @@ ARGSHND     PHA
             STA   $C004                      ; Write main memory
             STY   MOSFILE                    ; File ref num
             STA   $C005                      ; Write aux memory
-:FLUSH      >>>   ALXFADDR,FLUSH
+:FLUSH      >>>   XFADDRAUX,FLUSH
             >>>   XFMAIN
 :EXIT       PLY
             PLX
@@ -528,9 +528,9 @@ FILEHND     PHX
             PLX
             RTS
 
-:S1         >>>   ALXFADDR,SAVEFILE
+:S1         >>>   XFADDRAUX,SAVEFILE
             BRA   :S3
-:S2         >>>   ALXFADDR,LOADFILE
+:S2         >>>   XFADDRAUX,LOADFILE
 :S3         >>>   XFMAIN
 
 OSFILERET
@@ -1244,12 +1244,12 @@ STARHELP    LDA   #<:MSG
             DB    $0D,$0D,$00
 :MSG2       DB    $0D,$00
 
-STARQUIT    >>>   ALXFADDR,QUIT
+STARQUIT    >>>   XFADDRAUX,QUIT
             >>>   XFMAIN
 
 STARCAT     TSX
             STX   $0101                      ; Stash alt SP
-            >>>   ALXFADDR,CATALOG
+            >>>   XFADDRAUX,CATALOG
             >>>   XFMAIN
 STARCATRET
             LDX   $0101                      ; Recover alt SP
@@ -1278,7 +1278,7 @@ PRONEBLK    LDX   $0101                      ; Recover alt SP
             BNE   :L1
             BRA   :END
 
-:END        >>>   ALXFADDR,CATALOGRET
+:END        >>>   XFADDRAUX,CATALOGRET
             >>>   XFMAIN
 :DIRM       ASC   'Directory: '
             DB    $00
@@ -1354,7 +1354,7 @@ STARDIR     LDA   ZP1                        ; Move ZP1->ZP3 (OSWRCH uses ZP1)
             STA   $C005                      ; Write aux
             TSX
             STX   $0101                      ; Stash alt SP
-            >>>   ALXFADDR,SETPFX
+            >>>   XFADDRAUX,SETPFX
             >>>   XFMAIN
 STARDIRRET
             LDX   $0101                      ; Recover Alt SP
@@ -1387,7 +1387,7 @@ OSBYTE80    CPX   #$00                       ; X=0 Last ADC channel
 CHKEOF      STA   $C004                      ; Write main mem
             STX   MOSFILE                    ; File reference number
             STA   $C005                      ; Write aux mem
-            >>>   ALXFADDR,FILEEOF
+            >>>   XFADDRAUX,FILEEOF
             TSX                              ; Stash alt SP in $0101
             STX   $0101
             >>>   XFMAIN