diff --git a/sources/FILEPKG b/sources/FILEPKG
index a04d19f5..2e65e312 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,11 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "23-Aug-2021 16:42:18" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;6 284495 
 
-      changes to%:  (FNS GATHEREXPORTS)
+(FILECREATED "10-Oct-2021 20:36:54" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;10 284821 
 
-      previous date%: " 3-Jul-2021 11:08:42" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;5)
+      changes to%:  (FNS MAKEFILE)
+
+      previous date%: " 8-Oct-2021 23:56:39" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;9)
 
 
 (* ; "
@@ -19,15 +20,15 @@ with the terms of said license.
 (PRETTYCOMPRINT FILEPKGCOMS)
 
 (RPAQQ FILEPKGCOMS
-       [(COMS                                                (* ; 
-            "standard records for accessing file  package type/command parts.  Exported for PRETTY")
+       [(COMS                                                (* ; 
+            "standard records for accessing file  package type/command parts.  Exported for PRETTY")
               (VARS FILEPKGTYPEPROPS)
               (EXPORT (DECLARE%: EVAL@COMPILE DONTCOPY (RECORDS * FILEPKGRECORDS)))
               (FNS SEARCHPRETTYTYPELST PRETTYDEFMACROS FILEPKGCOMPROPS)
               (INITRECORDS * FILEPKGRECORDS))
         [DECLARE%: EVAL@COMPILE DOCOPY 
 
-               (* ;; "Proclaim SPECIAL those variables that are used freely in a lot of code.")
+               (* ;; "Proclaim SPECIAL those variables that are used freely in a lot of code.")
 
                (P (CL:PROCLAIM '(CL:SPECIAL PRETTYDEFMACROS PRETTYTYPELST FILEPKGTYPES 
                                        PRETTYPRINTMACROS *DEFAULT-CLEANUP-COMPILER* MARKASCHANGEDFNS
@@ -36,7 +37,7 @@ with the terms of said license.
                                        NOTCOMPILEDFILES MAKEFILEFORMS CLEANUPOPTIONS]
         (INITVARS (MSDATABASELST))
         [COMS 
-              (* ;; "making, adding, listing, compiling files")
+              (* ;; "making, adding, listing, compiling files")
 
               (FNS CLEANUP COMPILEFILES COMPILEFILES0 CONTINUEDIT MAKEFILE FILECHANGES 
                    FILEPKG.MERGECHANGES FILEPKG.CHANGEDFNS MAKEFILE1 COMPILE-FILE? MAKEFILES ADDFILE
@@ -58,14 +59,14 @@ with the terms of said license.
               (INITVARS (MAKEFILEREMAKEFLG T)
                      (CLEANUPOPTIONS '(RC]
         (COMS 
-              (* ;; "scanning file coms")
+              (* ;; "scanning file coms")
 
               (FNS FILEPKGCHANGES GETFILEPKGTYPE MARKASCHANGED FILECOMS WHEREIS SMASHFILECOMS 
                    FILEFNSLST FILECOMSLST UPDATEFILES INFILECOMS? INFILECOMTAIL INFILECOMS INFILECOM
                    INFILECOMSVALS INFILECOMSVAL INFILECOMSPROP IFCPROPS IFCEXPRTYPE IFCPROPSCAN 
                    IFCDECLARE INFILEPAIRS INFILECOMSMACRO))
         (COMS 
-              (* ;; "adding to a file")
+              (* ;; "adding to a file")
 
               (FNS FILES? FILES?1 FILES?PRINTLST ADDTOFILES? ADDTOFILE WHATIS ADDTOCOMS ADDTOCOM 
                    ADDTOCOM1 ADDNEWCOM MAKENEWCOM DEFAULTMAKENEWCOM)
@@ -73,28 +74,28 @@ with the terms of said license.
               (ADDVARS (MARKASCHANGEDFNS))
               (FNS MERGEINSERT MERGEINSERT1)
               
-              (* ;; "RMK: Changed INITVARS to VARS, so = addition is a synonym for untypable LF, and also suppress appearance of raw CR and LF in the file")
+              (* ;; "RMK: Changed INITVARS to VARS, so = addition is a synonym for untypable LF, and also suppress appearance of raw CR and LF in the file")
 
               (FNS ADDTOFILEKEYLST)
               (INITVARS (ADDTOFILEKEYLST (ADDTOFILEKEYLST))
                      (LASTFILE)))
         (COMS 
-              (* ;; "deleting an item from a file")
+              (* ;; "deleting an item from a file")
 
               (FNS DELFROMFILES DELFROMCOMS DELFROMCOM DELFROMCOM1 REMOVEITEM MOVETOFILE)
               (P (MOVD? 'DELFROMFILES 'DELFROMFILE NIL T)
                  (MOVD? 'MOVETOFILE 'MOVEITEM NIL T))
               (ADDVARS (SYSPROPS PROPTYPE VARTYPE)))
-        [COMS                                                (* ; 
-                      "functions for doing things and marking them changed and auxiliary functions")
+        [COMS                                                (* ; 
+                      "functions for doing things and marking them changed and auxiliary functions")
               (FNS SAVEPUT)
               [DECLARE%: DONTEVAL@LOAD DOCOPY (P (OR (CHANGENAME 'PUTPROPS 'PUTPROP 'SAVEPUT)
                                                      (CHANGENAME 'PUTPROPS '/PUT 'SAVEPUT]
               (FNS UNMARKASCHANGED PREEDITFN POSTEDITPROPS POSTEDITALISTS)
               (ADDVARS (LISPXFNS (PUT . SAVEPUT)
                               (PUTPROP . SAVEPUT]
-        (COMS                                                (* ; 
-                                                  "sub-functions for file package commands & types")
+        (COMS                                                (* ; 
+                                                  "sub-functions for file package commands & types")
               (FNS ALISTS.GETDEF ALISTS.WHENCHANGED CLEARCLISPARRAY EXPRESSIONS.WHENCHANGED 
                    MAKEALISTCOMS MAKEFILESCOMS MAKELISPXMACROSCOMS MAKEPROPSCOMS MAKEUSERMACROSCOMS 
                    PROPS.WHENCHANGED FILEGETDEF.LISPXMACROS FILEGETDEF.ALISTS FILEGETDEF.RECORDS 
@@ -107,24 +108,24 @@ with the terms of said license.
               (PROP VARTYPE BAKTRACELST BREAKMACROS COMPILETYPELST EDITMACROS ERRORTYPELST FONTDEFS 
                     LISPXHISTORYMACROS LISPXMACROS PRETTYDEFMACROS PRETTYEQUIVLST PRETTYPRINTMACROS 
                     PRETTYPRINTYPEMACROS USERMACROS))
-        (COMS                                                (* ; 
-                    "Define the commands below AFTER the various properties have been established.")
+        (COMS                                                (* ; 
+                    "Define the commands below AFTER the various properties have been established.")
               (USERMACROS M))
-        (COMS                                                (* ; "GETDEF methods")
+        (COMS                                                (* ; "GETDEF methods")
               (FNS RENAME CHANGECALLERS)
               (FNS SHOWDEF COPYDEF GETDEF GETDEFCOM GETDEFCOM0 GETDEFCURRENT GETDEFERR GETDEFFROMFILE
                    GETDEFSAVED PUTDEF EDITDEF DEFAULT.EDITDEF EDITDEF.FILES LOADDEF DWIMDEF DELDEF 
                    DELFROMLIST HASDEF GETFILEDEF SAVEDEF UNSAVEDEF COMPAREDEFS COMPARE TYPESOF)
               (INITVARS (WHEREIS.HASH)))
-                                                             (* ; "Must come after PUTDEF")
+                                                             (* ; "Must come after PUTDEF")
         (FNS FIXEDITDATE EDITDATE?)
-                                                             (* ; 
-                                  "Edit date support for all kinds of definers (from PARC 6/10/92)")
+                                                             (* ; 
+                                  "Edit date support for all kinds of definers (from PARC 6/10/92)")
         [VARS (EDITDATE-ARGLIST-DEFINERS '(FUNCTIONS TYPES))
               (EDITDATE-NAME-DEFINERS '(STRUCTURES VARIABLES]
         (GLOBALVARS EDITDATE-ARGLIST-DEFINERS EDITDATE-NAME-DEFINERS)
         (COMS 
-              (* ;; "how to dump FILEPKGCOMS. The SPLST must be initialized to contain FILEPKGCOMS in order to get started.")
+              (* ;; "how to dump FILEPKGCOMS. The SPLST must be initialized to contain FILEPKGCOMS in order to get started.")
 
               (FNS FILEPKGCOM FILEPKGTYPE)
               (PROP ARGNAMES FILEPKGCOM)
@@ -137,24 +138,24 @@ with the terms of said license.
         (ADDVARS (SHADOW-TYPES (FUNCTIONS FNS)
                         (VARIABLES VARS CONSTANTS)))
         (INITVARS (SAVEDDEFS))
-        (COMS                                                (* ; "EDITCALLERS")
+        (COMS                                                (* ; "EDITCALLERS")
               (FNS FINDCALLERS EDITCALLERS EDITFROMFILE FINDATS LOOKIN)
               (FNS SEPRCASE)
               [INITVARS (DEFAULTRENAMEMETHOD '(EDITCALLERS CAREFUL]
               (INITVARS (SEPRCASEARRAYS)
                      (CLISPCASEARRAYS))
               (P (MOVD? 'INFILEP 'FINDFILE)
-                                                             (* ; "or else from SPELLFILE"))
+                                                             (* ; "or else from SPELLFILE"))
               (BLOCKS (EDITFROMFILE EDITFROMFILE LOOKIN (GLOBALVARS EDITLOADFNSFLG)
                              (NOLINKFNS LOADFROM)))
               (GLOBALVARS SYSFILES CLISPCASEARRAYS SEPRCASEARRAYS CLISPCHARS))
-        (COMS                                                (* ; "EXPORT")
+        (COMS                                                (* ; "EXPORT")
               (FNS IMPORTFILE IMPORTEVAL IMPORTFILESCAN CHECKIMPORTS GATHEREXPORTS \DUMPEXPORTS)
               (FILEPKGCOMS EXPORT)
               [INITVARS (BEGINEXPORTDEFSTRING "* %"FOLLOWING DEFINITIONS EXPORTED%")")
                      (ENDEXPORTDEFFORM '(* "END EXPORTED DEFINITIONS"]
               (GLOBALVARS BEGINEXPORTDEFSTRING ENDEXPORTDEFFORM))
-        (COMS                                                (* ; "for GAINSPACE")
+        (COMS                                                (* ; "for GAINSPACE")
               (FNS CLEARFILEPKG)
               [ADDVARS (GAINSPACEFORMS (FILELST "erase filepkg information" (CLEARFILEPKG RESPONSE)
                                               ((Y "es")
@@ -254,11 +255,11 @@ with the terms of said license.
                                                       (REMOVE (FASSOC DATUM (GETTOPVAL 
                                                                                    'PRETTYDEFMACROS))
                                                              (GETTOPVAL 'PRETTYDEFMACROS]
-                                                             (* Not an atom record cause want 
-                                                           REMPROP on NILs.)
-                                                             (* NOTE%: PRETTCOM on PRETTY has 
-                                                           open-coded access to the MACRO 
-                                                           property.)
+                                                             (* Not an atom record cause want 
+                                                           REMPROP on NILs.)
+                                                             (* NOTE%: PRETTCOM on PRETTY has 
+                                                           open-coded access to the MACRO 
+                                                           property.)
                           (INIT (FILEPKGCOMPROPS ADDTOPRETTYCOM DELFROMPRETTYCOM PRETTYTYPE 
                                        FILEPKGCONTENTS)))
 
@@ -289,8 +290,8 @@ with the terms of said license.
                                                                     (REMOVE (SEARCHPRETTYTYPELST
                                                                              DATUM)
                                                                            (GETTOPVAL 'PRETTYTYPELST]
-                                                             (* NOTE%: PRETTYCOM on PRETTY has 
-                                                           open-coded access to GETDEF property)
+                                                             (* NOTE%: PRETTYCOM on PRETTY has 
+                                                           open-coded access to GETDEF property)
                                    (INIT [PROGN (SETQ SYSPROPS (UNION FILEPKGTYPEPROPS SYSPROPS))
                                                 (MAPC FILEPKGTYPEPROPS (FUNCTION (LAMBDA (X)
                                                                                    (PUT X
@@ -455,31 +456,35 @@ with the terms of said license.
           (RETURN FILE])
 
 (MAKEFILE
-  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)          (* ; "Edited  3-Jul-2021 11:03 by rmk:")
-                                                            (* ; "Edited 29-Jun-2021 17:24 by rmk:")
+  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)          (* ; "Edited 10-Oct-2021 20:36 by rmk:")
+                                                            (* ; "Edited 29-Jun-2021 17:24 by rmk:")
 
-    (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL;  LIST means list the FILE;  RC means RECOMPILE, C means COMPILEL;  --- for C AND RC assume ST unless next option is F.")
+    (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL;  LIST means list the FILE;  RC means RECOMPILE, C means COMPILEL;  --- for C AND RC assume ST unless next option is F.")
 
+    (* ;; "RMK:  OPTIONS can specify external format, either as a pair like (FORMAT :UTF-8) or just :UTF-8 where (FIND-FORMAT :UTF-8) is non NIL.")
+
+    [SETQ OPTIONS (FOR OPT INSIDE OPTIONS COLLECT (CL:IF (FIND-FORMAT OPT T)
+                                                                  (LIST 'FORMAT OPT))]
     (PROG ((PRETTYFLG (AND [NOT (MEMB 'FAST (SETQ OPTIONS (MKLIST OPTIONS]
                            PRETTYFLG))
            (*PRINT-BASE* (if (EQ *PRINT-BASE* 8)
                              then 8
-                           else                          (* ; "make sure radix is either 8 or 10, because all others don't read in like they print.  Maybe obsolete now with makefile environments")
+                           else                          (* ; "make sure radix is either 8 or 10, because all others don't read in like they print.  Maybe obsolete now with makefile environments")
                                  10))
            FILETYPE ROOTNAME FILEPROP CHANGES FILEDATES (Z (ADDFILE FILE)))
           (DECLARE (CL:SPECIAL PRETTYFLG))
-          (SETQ FILE (CAR Z))                                (* ; 
-                                               "Necessary because FILE might have been misspelled.")
-          (SETQ ROOTNAME (CADR Z))                           (* ; "result of (ROOTFILENAME FILE), or if FILE is corrected, result of applying ROOTFILENAME to correct value.")
+          (SETQ FILE (CAR Z))                                (* ; 
+                                               "Necessary because FILE might have been misspelled.")
+          (SETQ ROOTNAME (CADR Z))                           (* ; "result of (ROOTFILENAME FILE), or if FILE is corrected, result of applying ROOTFILENAME to correct value.")
           (SETQ FILEPROP (CDDR Z))
-          (UPDATEFILES)                                  (* ; "Want updating done after file is added to filelst, so any functions that are being dumped are marked as having been dumped.")
+          (UPDATEFILES)                                  (* ; "Want updating done after file is added to filelst, so any functions that are being dumped are marked as having been dumped.")
           (SETQ CHANGES (fetch TOBEDUMPED of FILEPROP))
           (SETQ FILEDATES (LISTP (fetch FILEDATES of ROOTNAME)))
           (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE))
       LP0 (if (AND (NULL (fetch LOADTYPE of FILEPROP))
                        (NULL FILEDATES))
-              then                                       (* ; 
-                   "File has never been loaded and never dumped i.e. user just set up COMS in core")
+              then                                       (* ; 
+                   "File has never been loaded and never dumped i.e. user just set up COMS in core")
             elseif [OR (EQMEMB 'NEW OPTIONS)
                            (AND (NULL MAKEFILEREMAKEFLG)
                                 (NOT (MEMB 'REMAKE OPTIONS]
@@ -500,14 +505,14 @@ with the terms of said license.
                                   T)
                            (COND
                               ((NEQ (ASKUSER DWIMWAIT 'Y "Go ahead and MAKEFILE anyway? ")
-                                    'Y)                      (* ; 
-            "E.g. user loads a .com file and then resets the COMS or defines the functons by hand.")
+                                    'Y)                      (* ; 
+            "E.g. user loads a .com file and then resets the COMS or defines the functons by hand.")
                                (GO OUT)))
                            (/replace LOADTYPE of FILEPROP with NIL)))
                     (SETQ SOURCEFILE NIL)
                     (SETQ REPRINTFNS NIL)
             elseif SOURCEFILE
-              then                                       (* ; "source file given")
+              then                                       (* ; "source file given")
             elseif [AND FILEDATES (OR [AND (SETQ SOURCEFILE (FINDFILE ROOTNAME T))
                                                (EQUAL (FILEDATE SOURCEFILE)
                                                       (fetch FILEDATE of (CAR FILEDATES]
@@ -527,7 +532,7 @@ with the terms of said license.
                                    (fetch FILEDATE of (CADR FILEDATES]
               then 
 
-                    (* ;; "prevous version file is gone, drop back to original daddy file and dump everything that has been changed.")
+                    (* ;; "prevous version file is gone, drop back to original daddy file and dump everything that has been changed.")
 
                     (SETQ CHANGES (FILEPKG.MERGECHANGES (fetch TOBEDUMPED of FILEPROP)
                                          (fetch FILECHANGES of ROOTNAME)))
@@ -545,8 +550,8 @@ with the terms of said license.
                   (GO LP0))
           (COND
              ((AND SOURCEFILE (SETQ Z (SELECTQ (fetch LOADTYPE of FILEPROP)
-                                          (LOADCOMP          (* ; 
-                                                   "only loaded via LOADCOMP.  Need to do LOADFROM")
+                                          (LOADCOMP          (* ; 
+                                                   "only loaded via LOADCOMP.  Need to do LOADFROM")
                                                     (LIST 'N SOURCEFILE "was loaded with LOADCOMP"
                                                           '- "LOADFROM it to obtain VARS/COMS"))
                                           (Compiled (AND (INFILECOMS? 'DONTCOPY 'DECLARE%:
@@ -569,23 +574,23 @@ with the terms of said license.
                                 (A "bort MAKEFILE
 "]
                   (Y (SELECTQ (fetch LOADTYPE of FILEPROP)
-                         (LOADCOMP                           (* ; 
-                               "file was never actually loaded, just loadcomped.  thus no filecoms")
+                         (LOADCOMP                           (* ; 
+                               "file was never actually loaded, just loadcomped.  thus no filecoms")
                                    (LOADFROM SOURCEFILE))
                          (Compiled 
 
-                                 (* ;; "This is going to be a remake.  If it was originally loaded as a compiled file, must first do a LOADFROM in order to get the properties set up by declare: etc.")
+                                 (* ;; "This is going to be a remake.  If it was originally loaded as a compiled file, must first do a LOADFROM in order to get the properties set up by declare: etc.")
 
                                    (LOADVARS 'DONTCOPY SOURCEFILE)
                                    (/replace LOADTYPE of FILEPROP with 'COMPILED)
-                                                             (* ; "So wont have to be done again.")
+                                                             (* ; "So wont have to be done again.")
 
-                                 (* ;; "These are the only DECLARE:'s that are not also on the compiled file.  Note that a DECLARE: DONTEVAL@LOAD will be found and evaluated, but the corresponding expressions won't be evaluated from within the DECLARE:  Not worthwhile to bother setting up a complicated edit pattern to screen these out, especially if you consider expressions like (DECLARE: -- DONTEVAL@LOAD -- DOEVAL@LOAD --)")
+                                 (* ;; "These are the only DECLARE:'s that are not also on the compiled file.  Note that a DECLARE: DONTEVAL@LOAD will be found and evaluated, but the corresponding expressions won't be evaluated from within the DECLARE:  Not worthwhile to bother setting up a complicated edit pattern to screen these out, especially if you consider expressions like (DECLARE: -- DONTEVAL@LOAD -- DOEVAL@LOAD --)")
 
                                    )
                          ((loadfns compiled) 
 
-                                 (* ;; "This is going to be a remake, but the original call to LOADFNS didnt specify all the VARS, so some expressions may not have been loaded.")
+                                 (* ;; "This is going to be a remake, but the original call to LOADFNS didnt specify all the VARS, so some expressions may not have been loaded.")
 
                               (LOADVARS T SOURCEFILE))
                          NIL))
@@ -4789,7 +4794,7 @@ compiling " T)
 
 (MOVD? 'INFILEP 'FINDFILE)
 
-                                                             (* ; "or else from SPELLFILE")
+                                                             (* ; "or else from SPELLFILE")
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY
 
 (BLOCK%: EDITFROMFILE EDITFROMFILE LOOKIN (GLOBALVARS EDITLOADFNSFLG)
@@ -5036,46 +5041,46 @@ compiling " T)
 (PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1987 1988 1989 
 1990 1991 1992 1993 1995 2018 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (20621 22326 (SEARCHPRETTYTYPELST 20631 . 21610) (PRETTYDEFMACROS 21612 . 22070) (
-FILEPKGCOMPROPS 22072 . 22324)) (23128 57617 (CLEANUP 23138 . 24526) (COMPILEFILES 24528 . 24804) (
-COMPILEFILES0 24806 . 25526) (CONTINUEDIT 25528 . 26948) (MAKEFILE 26950 . 38958) (FILECHANGES 38960
- . 41295) (FILEPKG.MERGECHANGES 41297 . 42120) (FILEPKG.CHANGEDFNS 42122 . 42434) (MAKEFILE1 42436 . 
-46663) (COMPILE-FILE? 46665 . 48222) (MAKEFILES 48224 . 49917) (ADDFILE 49919 . 52440) (ADDFILE0 52442
- . 56578) (LISTFILES 56580 . 57615)) (58313 93553 (FILEPKGCHANGES 58323 . 59673) (GETFILEPKGTYPE 59675
- . 62748) (MARKASCHANGED 62750 . 64387) (FILECOMS 64389 . 64773) (WHEREIS 64775 . 66195) (
-SMASHFILECOMS 66197 . 66432) (FILEFNSLST 66434 . 66596) (FILECOMSLST 66598 . 67082) (UPDATEFILES 67084
- . 72384) (INFILECOMS? 72386 . 74289) (INFILECOMTAIL 74291 . 75431) (INFILECOMS 75433 . 75594) (
-INFILECOM 75596 . 85805) (INFILECOMSVALS 85807 . 86134) (INFILECOMSVAL 86136 . 87138) (INFILECOMSPROP 
-87140 . 87969) (IFCPROPS 87971 . 89232) (IFCEXPRTYPE 89234 . 89745) (IFCPROPSCAN 89747 . 90800) (
-IFCDECLARE 90802 . 92113) (INFILEPAIRS 92115 . 92447) (INFILECOMSMACRO 92449 . 93551)) (93588 125008 (
-FILES? 93598 . 95791) (FILES?1 95793 . 96491) (FILES?PRINTLST 96493 . 97275) (ADDTOFILES? 97277 . 
-108323) (ADDTOFILE 108325 . 109241) (WHATIS 109243 . 111219) (ADDTOCOMS 111221 . 112865) (ADDTOCOM 
-112867 . 119414) (ADDTOCOM1 119416 . 120587) (ADDNEWCOM 120589 . 121639) (MAKENEWCOM 121641 . 123484) 
-(DEFAULTMAKENEWCOM 123486 . 125006)) (125078 127895 (MERGEINSERT 125088 . 127431) (MERGEINSERT1 127433
- . 127893)) (128049 129406 (ADDTOFILEKEYLST 128059 . 129404)) (129523 140435 (DELFROMFILES 129533 . 
-130383) (DELFROMCOMS 130385 . 132064) (DELFROMCOM 132066 . 137934) (DELFROMCOM1 137936 . 138733) (
-REMOVEITEM 138735 . 139609) (MOVETOFILE 139611 . 140433)) (140649 143018 (SAVEPUT 140659 . 143016)) (
-143143 151467 (UNMARKASCHANGED 143153 . 144861) (PREEDITFN 144863 . 147374) (POSTEDITPROPS 147376 . 
-149877) (POSTEDITALISTS 149879 . 151465)) (151616 172170 (ALISTS.GETDEF 151626 . 152005) (
-ALISTS.WHENCHANGED 152007 . 152651) (CLEARCLISPARRAY 152653 . 153827) (EXPRESSIONS.WHENCHANGED 153829
- . 154203) (MAKEALISTCOMS 154205 . 155278) (MAKEFILESCOMS 155280 . 156717) (MAKELISPXMACROSCOMS 156719
- . 158737) (MAKEPROPSCOMS 158739 . 159437) (MAKEUSERMACROSCOMS 159439 . 161239) (PROPS.WHENCHANGED 
-161241 . 161862) (FILEGETDEF.LISPXMACROS 161864 . 163306) (FILEGETDEF.ALISTS 163308 . 163927) (
-FILEGETDEF.RECORDS 163929 . 164860) (FILEGETDEF.PROPS 164862 . 165654) (FILEGETDEF.MACROS 165656 . 
-166716) (FILEGETDEF.VARS 166718 . 167134) (FILEGETDEF.FNS 167136 . 168500) (FILEPKGCOMS.PUTDEF 168502
- . 170942) (FILES.PUTDEF 170944 . 171901) (VARS.PUTDEF 171903 . 172046) (FILES.WHENCHANGED 172048 . 
-172168)) (174192 181625 (RENAME 174202 . 175603) (CHANGECALLERS 175605 . 181623)) (181626 229574 (
-SHOWDEF 181636 . 182429) (COPYDEF 182431 . 184905) (GETDEF 184907 . 187183) (GETDEFCOM 187185 . 188151
-) (GETDEFCOM0 188153 . 189499) (GETDEFCURRENT 189501 . 195921) (GETDEFERR 195923 . 197224) (
-GETDEFFROMFILE 197226 . 201506) (GETDEFSAVED 201508 . 202612) (PUTDEF 202614 . 203317) (EDITDEF 203319
- . 204296) (DEFAULT.EDITDEF 204298 . 207134) (EDITDEF.FILES 207136 . 207337) (LOADDEF 207339 . 207515)
- (DWIMDEF 207517 . 208371) (DELDEF 208373 . 211387) (DELFROMLIST 211389 . 211893) (HASDEF 211895 . 
-218217) (GETFILEDEF 218219 . 218741) (SAVEDEF 218743 . 220402) (UNSAVEDEF 220404 . 221300) (
-COMPAREDEFS 221302 . 224604) (COMPARE 224606 . 225310) (TYPESOF 225312 . 229572)) (229641 234684 (
-FIXEDITDATE 229651 . 233154) (EDITDATE? 233156 . 234682)) (235103 243874 (FILEPKGCOM 235113 . 240046) 
-(FILEPKGTYPE 240048 . 243872)) (255911 270843 (FINDCALLERS 255921 . 256436) (EDITCALLERS 256438 . 
-264348) (EDITFROMFILE 264350 . 270158) (FINDATS 270160 . 270432) (LOOKIN 270434 . 270841)) (270844 
-272571 (SEPRCASE 270854 . 272569)) (273088 278645 (IMPORTFILE 273098 . 274072) (IMPORTEVAL 274074 . 
-274954) (IMPORTFILESCAN 274956 . 275377) (CHECKIMPORTS 275379 . 276715) (GATHEREXPORTS 276717 . 278055
-) (\DUMPEXPORTS 278057 . 278643)) (278983 281191 (CLEARFILEPKG 278993 . 281189)))))
+  (FILEMAP (NIL (20618 22323 (SEARCHPRETTYTYPELST 20628 . 21607) (PRETTYDEFMACROS 21609 . 22067) (
+FILEPKGCOMPROPS 22069 . 22321)) (23125 57943 (CLEANUP 23135 . 24523) (COMPILEFILES 24525 . 24801) (
+COMPILEFILES0 24803 . 25523) (CONTINUEDIT 25525 . 26945) (MAKEFILE 26947 . 39284) (FILECHANGES 39286
+ . 41621) (FILEPKG.MERGECHANGES 41623 . 42446) (FILEPKG.CHANGEDFNS 42448 . 42760) (MAKEFILE1 42762 . 
+46989) (COMPILE-FILE? 46991 . 48548) (MAKEFILES 48550 . 50243) (ADDFILE 50245 . 52766) (ADDFILE0 52768
+ . 56904) (LISTFILES 56906 . 57941)) (58639 93879 (FILEPKGCHANGES 58649 . 59999) (GETFILEPKGTYPE 60001
+ . 63074) (MARKASCHANGED 63076 . 64713) (FILECOMS 64715 . 65099) (WHEREIS 65101 . 66521) (
+SMASHFILECOMS 66523 . 66758) (FILEFNSLST 66760 . 66922) (FILECOMSLST 66924 . 67408) (UPDATEFILES 67410
+ . 72710) (INFILECOMS? 72712 . 74615) (INFILECOMTAIL 74617 . 75757) (INFILECOMS 75759 . 75920) (
+INFILECOM 75922 . 86131) (INFILECOMSVALS 86133 . 86460) (INFILECOMSVAL 86462 . 87464) (INFILECOMSPROP 
+87466 . 88295) (IFCPROPS 88297 . 89558) (IFCEXPRTYPE 89560 . 90071) (IFCPROPSCAN 90073 . 91126) (
+IFCDECLARE 91128 . 92439) (INFILEPAIRS 92441 . 92773) (INFILECOMSMACRO 92775 . 93877)) (93914 125334 (
+FILES? 93924 . 96117) (FILES?1 96119 . 96817) (FILES?PRINTLST 96819 . 97601) (ADDTOFILES? 97603 . 
+108649) (ADDTOFILE 108651 . 109567) (WHATIS 109569 . 111545) (ADDTOCOMS 111547 . 113191) (ADDTOCOM 
+113193 . 119740) (ADDTOCOM1 119742 . 120913) (ADDNEWCOM 120915 . 121965) (MAKENEWCOM 121967 . 123810) 
+(DEFAULTMAKENEWCOM 123812 . 125332)) (125404 128221 (MERGEINSERT 125414 . 127757) (MERGEINSERT1 127759
+ . 128219)) (128375 129732 (ADDTOFILEKEYLST 128385 . 129730)) (129849 140761 (DELFROMFILES 129859 . 
+130709) (DELFROMCOMS 130711 . 132390) (DELFROMCOM 132392 . 138260) (DELFROMCOM1 138262 . 139059) (
+REMOVEITEM 139061 . 139935) (MOVETOFILE 139937 . 140759)) (140975 143344 (SAVEPUT 140985 . 143342)) (
+143469 151793 (UNMARKASCHANGED 143479 . 145187) (PREEDITFN 145189 . 147700) (POSTEDITPROPS 147702 . 
+150203) (POSTEDITALISTS 150205 . 151791)) (151942 172496 (ALISTS.GETDEF 151952 . 152331) (
+ALISTS.WHENCHANGED 152333 . 152977) (CLEARCLISPARRAY 152979 . 154153) (EXPRESSIONS.WHENCHANGED 154155
+ . 154529) (MAKEALISTCOMS 154531 . 155604) (MAKEFILESCOMS 155606 . 157043) (MAKELISPXMACROSCOMS 157045
+ . 159063) (MAKEPROPSCOMS 159065 . 159763) (MAKEUSERMACROSCOMS 159765 . 161565) (PROPS.WHENCHANGED 
+161567 . 162188) (FILEGETDEF.LISPXMACROS 162190 . 163632) (FILEGETDEF.ALISTS 163634 . 164253) (
+FILEGETDEF.RECORDS 164255 . 165186) (FILEGETDEF.PROPS 165188 . 165980) (FILEGETDEF.MACROS 165982 . 
+167042) (FILEGETDEF.VARS 167044 . 167460) (FILEGETDEF.FNS 167462 . 168826) (FILEPKGCOMS.PUTDEF 168828
+ . 171268) (FILES.PUTDEF 171270 . 172227) (VARS.PUTDEF 172229 . 172372) (FILES.WHENCHANGED 172374 . 
+172494)) (174518 181951 (RENAME 174528 . 175929) (CHANGECALLERS 175931 . 181949)) (181952 229900 (
+SHOWDEF 181962 . 182755) (COPYDEF 182757 . 185231) (GETDEF 185233 . 187509) (GETDEFCOM 187511 . 188477
+) (GETDEFCOM0 188479 . 189825) (GETDEFCURRENT 189827 . 196247) (GETDEFERR 196249 . 197550) (
+GETDEFFROMFILE 197552 . 201832) (GETDEFSAVED 201834 . 202938) (PUTDEF 202940 . 203643) (EDITDEF 203645
+ . 204622) (DEFAULT.EDITDEF 204624 . 207460) (EDITDEF.FILES 207462 . 207663) (LOADDEF 207665 . 207841)
+ (DWIMDEF 207843 . 208697) (DELDEF 208699 . 211713) (DELFROMLIST 211715 . 212219) (HASDEF 212221 . 
+218543) (GETFILEDEF 218545 . 219067) (SAVEDEF 219069 . 220728) (UNSAVEDEF 220730 . 221626) (
+COMPAREDEFS 221628 . 224930) (COMPARE 224932 . 225636) (TYPESOF 225638 . 229898)) (229967 235010 (
+FIXEDITDATE 229977 . 233480) (EDITDATE? 233482 . 235008)) (235429 244200 (FILEPKGCOM 235439 . 240372) 
+(FILEPKGTYPE 240374 . 244198)) (256237 271169 (FINDCALLERS 256247 . 256762) (EDITCALLERS 256764 . 
+264674) (EDITFROMFILE 264676 . 270484) (FINDATS 270486 . 270758) (LOOKIN 270760 . 271167)) (271170 
+272897 (SEPRCASE 271180 . 272895)) (273414 278971 (IMPORTFILE 273424 . 274398) (IMPORTEVAL 274400 . 
+275280) (IMPORTFILESCAN 275282 . 275703) (CHECKIMPORTS 275705 . 277041) (GATHEREXPORTS 277043 . 278381
+) (\DUMPEXPORTS 278383 . 278969)) (279309 281517 (CLEARFILEPKG 279319 . 281515)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index 9dac1105..83298c1c 100644
Binary files a/sources/FILEPKG.LCOM and b/sources/FILEPKG.LCOM differ
