diff --git a/applecorn.po b/applecorn.po
index 76a678f..b4c0e60 100644
Binary files a/applecorn.po and b/applecorn.po differ
diff --git a/applecorn.s b/applecorn.s
index fa42141..83dc2c7 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -200,3 +200,5 @@ MAINZP      MAC
 
 
 
+
+
diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s
index b94de53..17e708b 100644
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@@ -470,3 +470,5 @@ OSBM2        ASC   ').'
 
 
 
+
+
diff --git a/auxmem.chario.s b/auxmem.chario.s
index 03b2db4..f83148b 100644
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@@ -27,7 +27,10 @@
 
 
 OLDCHAR      EQU   OSKBD1                    ; *TEMP*  ; character under cursor
-COPYCHAR     EQU   OSKBD2                    ; *TEMP*  ; character under copy cursor
+
+** Moved to AUXMEM.MOSEQU.S for Merlin-8/-16
+*COPYCHAR EQU OSKBD2 ; *TEMP*  ; character under copy cursor
+
 FLASHER      EQU   BYTEVARBASE+193           ; flash counter for cursor
 
 FXEXEC       EQU   BYTEVARBASE+198
@@ -441,12 +444,3 @@ BYTE7DOK     RTS
 BYTE76       LDX   #$00                      ; Update LEDs and return X=SHIFT
              RTS                             ; Not possible with Apple
 
-
-
-
-
-
-
-
-
-
diff --git a/auxmem.hostfs.s b/auxmem.hostfs.s
index 2056458..50da210 100644
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@@ -946,4 +946,6 @@ ERROR2E     DW    $C800
 
 
 
+
+
 
diff --git a/auxmem.init.s b/auxmem.init.s
index 1f3eab6..e26412a 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -182,3 +182,5 @@ HELLO       ASC   'Applecorn MOS 2021-09-16 snapshot'
 
 
 
+
+
diff --git a/auxmem.misc.s b/auxmem.misc.s
index f801dcc..eeb903a 100644
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@@ -497,4 +497,6 @@ AUXBLK      ASC   '**ENDOFCODE**'
 
 
 
+
+
 
diff --git a/auxmem.mosequ.s b/auxmem.mosequ.s
index d58e67b..08fa0bf 100644
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@@ -63,8 +63,8 @@ FSCV         EQU   $21E        ; FSCV misc file ops
 BYTEVARBASE  EQU   $190        ; Base of OSBYTE variables
 OSFILECB     EQU   $2EE        ; OSFILE control block
 
+COPYCHAR     EQU   OSKBD2      ; ** TEMP **
 
 * $0300-$03DF
 * $03E0-$03FF Used for interfacing with ProDOS XFER
 
-
diff --git a/auxmem.oscli.s b/auxmem.oscli.s
index b10770a..a638503 100644
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@@ -529,3 +529,5 @@ ECHOLP1     JSR   GSREAD
 *             JMP   OSNEWL
 
 
+
+
diff --git a/auxmem.vdu.s b/auxmem.vdu.s
index 4892114..f3f389a 100644
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@@ -621,3 +621,5 @@ BYTEA0       LDY   #79              ; Read VDU variable $09,$0A
 * TEST
 
 
+
+
diff --git a/mainmem.fsequ.s b/mainmem.fsequ.s
index 55a3497..4a1042e 100644
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@@ -60,3 +60,5 @@ GEOFCMD     EQU   $D1
 
 
 
+
+
diff --git a/mainmem.init.s b/mainmem.init.s
index 2d5b02f..87553cb 100644
--- a/mainmem.init.s
+++ b/mainmem.init.s
@@ -106,3 +106,5 @@ RESET       TSX
 
 
 
+
+
diff --git a/mainmem.ldr.s b/mainmem.ldr.s
index 0e3f519..4a0290d 100644
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@@ -132,6 +132,8 @@ CANTOPEN    ASC   "Unable to open ROM file"
 
 
 
+
+
 
 
 
diff --git a/mainmem.lists.s b/mainmem.lists.s
index 57a4a63..98ca98b 100644
--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@@ -124,3 +124,5 @@ QUITPL      HEX   04          ; Number of parameters
 
 
 
+
+
diff --git a/mainmem.menu.s b/mainmem.menu.s
index e6b83cc..22e91a4 100644
--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@@ -138,6 +138,8 @@ ROM8        STR   "USERROM2.ROM"
 
 
 
+
+
 
 
 
diff --git a/mainmem.misc.s b/mainmem.misc.s
index e71c5f7..c757a1d 100644
--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@@ -41,29 +41,29 @@ FINDBUF     LDX   #$00
 * On entry: buffer number in X
 * On exit: buffer address in AY
 *          Carry set if no bufs, clear otherwise
-BUFADDR      CPX   #$00
-             BNE   :S1
-             LDA   #<IOBUF1
-             LDY   #>IOBUF1
-             BRA   :EXIT
-:S1          CPX   #$01
-             BNE   :S2
-             LDA   #<IOBUF2
-             LDY   #>IOBUF2
-             BRA   :EXIT
-:S2          CPX   #$02
-             BNE   :S3
-             LDA   #<IOBUF3
-             LDY   #>IOBUF3
-             BRA   :EXIT
-:S3          CPX   #$03
-             BNE   :NOBUFS
-             LDA   #<IOBUF4
-             LDY   #>IOBUF4
-:EXIT        CLC
-             RTS
-:NOBUFS      SEC
-             RTS
+BUFADDR     CPX   #$00
+            BNE   :S1
+            LDA   #<IOBUF1
+            LDY   #>IOBUF1
+            BRA   :EXIT
+:S1         CPX   #$01
+            BNE   :S2
+            LDA   #<IOBUF2
+            LDY   #>IOBUF2
+            BRA   :EXIT
+:S2         CPX   #$02
+            BNE   :S3
+            LDA   #<IOBUF3
+            LDY   #>IOBUF3
+            BRA   :EXIT
+:S3         CPX   #$03
+            BNE   :NOBUFS
+            LDA   #<IOBUF4
+            LDY   #>IOBUF4
+:EXIT       CLC
+            RTS
+:NOBUFS     SEC
+            RTS
 
 * Check if file exists
 * Return A=0 if doesn't exist, A=1 file, A=2 dir
@@ -188,3 +188,5 @@ FILEREFS    DB    $00,$00,$00,$00
 
 
 
+
+
diff --git a/mainmem.path.s b/mainmem.path.s
index b8a470f..86c6f0d 100644
--- a/mainmem.path.s
+++ b/mainmem.path.s
@@ -303,3 +303,5 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix
 
 
 
+
+
diff --git a/mainmem.svc.s b/mainmem.svc.s
index 321dd55..a6593f4 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -111,7 +111,7 @@ COPYFILE     >>>   ENTMAIN
              CMP   #$02               ; Existing directory?
              BNE   :BADDEST           ; If not, error
              BRA   :MAINLOOP          ; Source: wildcard, dest: dir
-:NOWILD      
+:NOWILD
 :MAINLOOP
              LDA   MOSFILE2           ; Length
              STA   :OLDLEN
@@ -1058,3 +1058,5 @@ MAINRDEXIT   >>>   XF2AUX,NULLRTS     ; Back to an RTS
 
 
 
+
+
diff --git a/mainmem.wild.s b/mainmem.wild.s
index 7d8e536..4679e8d 100644
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@@ -382,3 +382,5 @@ MATCHBUF    DS    65            ; For storing match results (Pascal str)
 
 
 
+
+