diff --git a/sources/FILEPKG b/sources/FILEPKG
index 8ddbf47c..7c6ad971 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,15 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 2-Dec-2021 23:35:54" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>FILEPKG.;17 278911 
+(FILECREATED " 2-Mar-2022 15:49:32" {DSK}<home>larry>medley>sources>FILEPKG.;3 279296 
 
-      changes to%:  (VARS FILEPKGCOMS)
+      :CHANGES-TO (FNS FILECHANGES)
 
-      previous date%: " 1-Dec-2021 17:05:26" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>FILEPKG.;16)
+      :PREVIOUS-DATE " 2-Dec-2021 23:35:54" {DSK}<home>larry>medley>sources>FILEPKG.;1)
 
 
 (* ; "
-Copyright (c) 1982-1993, 1995, 2018, 2020-2021 by Venue & Xerox Corporation.
+Copyright (c) 1982-1993, 1995, 2018, 2020-2022 by Venue & Xerox Corporation.
 The following program was created in 1982 but has not been published
 within the meaning of the copyright law, is furnished under license,
 and may not be used, copied and/or disclosed except in accordance
@@ -626,7 +625,8 @@ with the terms of said license.
       OUT (RETURN (LIST FILE "-- MAKEFILE not performed."])
 
 (FILECHANGES
-  [LAMBDA (FILE TYPE)                                    (* bvm%: "30-Aug-86 15:08")
+  [LAMBDA (FILE TYPE)                                      (* ; "Edited  2-Mar-2022 15:43 by larry")
+                                                             (* bvm%: "30-Aug-86 15:08")
 
     (* ;; "If FILE is a list, it is assumed to be a file-created expressions;  otherwise, the filecreated expression is read from FILE.  If TYPE, returns the list of changed items of that type from the changes expression.  If TYPE=NIL, returns the whole list of typed change-lists")
 
@@ -635,29 +635,35 @@ with the terms of said license.
                                      (LET (OLDPTR STREAM)
                                           [if (SETQ STREAM (OPENP FILE 'INPUT))
                                               then (SETQ OLDPTR (GETFILEPTR STREAM))
-                                                    (SETFILEPTR STREAM 0)
-                                            else (RESETSAVE NIL (LIST 'CLOSEF
-                                                                          (SETQ STREAM
-                                                                           (OPENSTREAM FILE
-                                                                                  'INPUT]
+                                                   (SETFILEPTR STREAM 0)
+                                            else (RESETSAVE NIL (LIST 'CLOSEF (SETQ STREAM
+                                                                               (OPENSTREAM
+                                                                                FILE
+                                                                                'INPUT]
                                           (CL:MULTIPLE-VALUE-BIND (ENV FC)
                                                  (\PARSE-FILE-HEADER STREAM 'RETURN)
                                                  (if OLDPTR
                                                      then (SETFILEPTR STREAM OLDPTR))
                                                  FC)))]
-           FNS CHANGES)
-          (SETQ CHANGES (LDIFF (SETQ CHANGES (CDR (MEMB 'to%: FCEXPR)))
-                               (MEMB 'previous CHANGES)))
+           FNS CHANGES FOUND)
+          (while FCEXPR do [SELECTQ (CAR FCEXPR)
+                               ((to%: :CHANGES-TO) 
+                                    (SETQ FOUND T))
+                               ((previous :PREVIOUS-DATE) 
+                                    (RETURN))
+                               (CL:WHEN FOUND
+                                   (push CHANGES (CAR FCEXPR)))]
+                           (SETQ FCEXPR (CDR FCEXPR)))
           [if (AND TYPE (NEQ TYPE 'FNS))
               then (RETURN (CDR (ASSOC TYPE CHANGES]
           (SETQ FNS (SUBSET CHANGES (FUNCTION LITATOM)))     (* ; 
-                         "Old style changes expression listed FNS by name and other things by type")
+                           "Old style changes expression listed FNS by name and other things by type")
           (RETURN (if TYPE
-                      then                               (* ; "TYPE=FNS cause of test above.")
-                            (NCONC FNS (CDR (ASSOC 'FNS CHANGES)))
+                      then                                   (* ; "TYPE=FNS cause of test above.")
+                           (NCONC FNS (CDR (ASSOC 'FNS CHANGES)))
                     elseif FNS
                       then (CONS (CONS 'FNS FNS)
-                                     (SUBSET CHANGES (FUNCTION LISTP)))
+                                 (SUBSET CHANGES (FUNCTION LISTP)))
                     else CHANGES])
 
 (FILEPKG.MERGECHANGES
@@ -3103,14 +3109,14 @@ compiling " T)
 
 
 (ADDTOVAR USERMACROS
-          (M NIL (MAKE FILE FILE))
           (M (X . Y)
              (E (MARKASCHANGED (COND ((LISTP 'X)
                                       (CAR 'X))
                                      (T 'X))
                        'USERMACROS)
                 T)
-             (ORIGINAL (M X . Y))))
+             (ORIGINAL (M X . Y)))
+          (M NIL (MAKE FILE FILE)))
 
 (ADDTOVAR EDITMACROS
           (M (X . Y)
@@ -4906,48 +4912,48 @@ compiling " T)
 (ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
 )
 (PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1987 1988 1989 
-1990 1991 1992 1993 1995 2018 2020 2021))
+1990 1991 1992 1993 1995 2018 2020 2021 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (19258 20963 (SEARCHPRETTYTYPELST 19268 . 20247) (PRETTYDEFMACROS 20249 . 20707) (
-FILEPKGCOMPROPS 20709 . 20961)) (21765 56583 (CLEANUP 21775 . 23163) (COMPILEFILES 23165 . 23441) (
-COMPILEFILES0 23443 . 24163) (CONTINUEDIT 24165 . 25585) (MAKEFILE 25587 . 37924) (FILECHANGES 37926
- . 40261) (FILEPKG.MERGECHANGES 40263 . 41086) (FILEPKG.CHANGEDFNS 41088 . 41400) (MAKEFILE1 41402 . 
-45629) (COMPILE-FILE? 45631 . 47188) (MAKEFILES 47190 . 48883) (ADDFILE 48885 . 51406) (ADDFILE0 51408
- . 55544) (LISTFILES 55546 . 56581)) (57255 92495 (FILEPKGCHANGES 57265 . 58615) (GETFILEPKGTYPE 58617
- . 61690) (MARKASCHANGED 61692 . 63329) (FILECOMS 63331 . 63715) (WHEREIS 63717 . 65137) (
-SMASHFILECOMS 65139 . 65374) (FILEFNSLST 65376 . 65538) (FILECOMSLST 65540 . 66024) (UPDATEFILES 66026
- . 71326) (INFILECOMS? 71328 . 73231) (INFILECOMTAIL 73233 . 74373) (INFILECOMS 74375 . 74536) (
-INFILECOM 74538 . 84747) (INFILECOMSVALS 84749 . 85076) (INFILECOMSVAL 85078 . 86080) (INFILECOMSPROP 
-86082 . 86911) (IFCPROPS 86913 . 88174) (IFCEXPRTYPE 88176 . 88687) (IFCPROPSCAN 88689 . 89742) (
-IFCDECLARE 89744 . 91055) (INFILEPAIRS 91057 . 91389) (INFILECOMSMACRO 91391 . 92493)) (92530 123950 (
-FILES? 92540 . 94733) (FILES?1 94735 . 95433) (FILES?PRINTLST 95435 . 96217) (ADDTOFILES? 96219 . 
-107265) (ADDTOFILE 107267 . 108183) (WHATIS 108185 . 110161) (ADDTOCOMS 110163 . 111807) (ADDTOCOM 
-111809 . 118356) (ADDTOCOM1 118358 . 119529) (ADDNEWCOM 119531 . 120581) (MAKENEWCOM 120583 . 122426) 
-(DEFAULTMAKENEWCOM 122428 . 123948)) (124020 126837 (MERGEINSERT 124030 . 126373) (MERGEINSERT1 126375
- . 126835)) (126991 128348 (ADDTOFILEKEYLST 127001 . 128346)) (128465 139377 (DELFROMFILES 128475 . 
-129325) (DELFROMCOMS 129327 . 131006) (DELFROMCOM 131008 . 136876) (DELFROMCOM1 136878 . 137675) (
-REMOVEITEM 137677 . 138551) (MOVETOFILE 138553 . 139375)) (139591 141960 (SAVEPUT 139601 . 141958)) (
-142085 150409 (UNMARKASCHANGED 142095 . 143803) (PREEDITFN 143805 . 146316) (POSTEDITPROPS 146318 . 
-148819) (POSTEDITALISTS 148821 . 150407)) (150554 171108 (ALISTS.GETDEF 150564 . 150943) (
-ALISTS.WHENCHANGED 150945 . 151589) (CLEARCLISPARRAY 151591 . 152765) (EXPRESSIONS.WHENCHANGED 152767
- . 153141) (MAKEALISTCOMS 153143 . 154216) (MAKEFILESCOMS 154218 . 155655) (MAKELISPXMACROSCOMS 155657
- . 157675) (MAKEPROPSCOMS 157677 . 158375) (MAKEUSERMACROSCOMS 158377 . 160177) (PROPS.WHENCHANGED 
-160179 . 160800) (FILEGETDEF.LISPXMACROS 160802 . 162244) (FILEGETDEF.ALISTS 162246 . 162865) (
-FILEGETDEF.RECORDS 162867 . 163798) (FILEGETDEF.PROPS 163800 . 164592) (FILEGETDEF.MACROS 164594 . 
-165654) (FILEGETDEF.VARS 165656 . 166072) (FILEGETDEF.FNS 166074 . 167438) (FILEPKGCOMS.PUTDEF 167440
- . 169880) (FILES.PUTDEF 169882 . 170839) (VARS.PUTDEF 170841 . 170984) (FILES.WHENCHANGED 170986 . 
-171106)) (173130 180563 (RENAME 173140 . 174541) (CHANGECALLERS 174543 . 180561)) (180564 229420 (
-SHOWDEF 180574 . 181767) (COPYDEF 181769 . 184243) (GETDEF 184245 . 186521) (GETDEFCOM 186523 . 187489
-) (GETDEFCOM0 187491 . 188837) (GETDEFCURRENT 188839 . 195259) (GETDEFERR 195261 . 196562) (
-GETDEFFROMFILE 196564 . 200844) (GETDEFSAVED 200846 . 201950) (PUTDEF 201952 . 202655) (EDITDEF 202657
- . 203634) (DEFAULT.EDITDEF 203636 . 206472) (EDITDEF.FILES 206474 . 206675) (LOADDEF 206677 . 206853)
- (DWIMDEF 206855 . 207709) (DELDEF 207711 . 210725) (DELFROMLIST 210727 . 211231) (HASDEF 211233 . 
-217555) (GETFILEDEF 217557 . 218079) (SAVEDEF 218081 . 219740) (UNSAVEDEF 219742 . 220638) (
-COMPAREDEFS 220640 . 224450) (COMPARE 224452 . 225156) (TYPESOF 225158 . 229418)) (229570 238341 (
-FILEPKGCOM 229580 . 234513) (FILEPKGTYPE 234515 . 238339)) (250374 265306 (FINDCALLERS 250384 . 250899
-) (EDITCALLERS 250901 . 258811) (EDITFROMFILE 258813 . 264621) (FINDATS 264623 . 264895) (LOOKIN 
-264897 . 265304)) (265307 267034 (SEPRCASE 265317 . 267032)) (267551 273108 (IMPORTFILE 267561 . 
-268535) (IMPORTEVAL 268537 . 269417) (IMPORTFILESCAN 269419 . 269840) (CHECKIMPORTS 269842 . 271178) (
-GATHEREXPORTS 271180 . 272518) (\DUMPEXPORTS 272520 . 273106)) (273446 275654 (CLEARFILEPKG 273456 . 
-275652)))))
+  (FILEMAP (NIL (19209 20914 (SEARCHPRETTYTYPELST 19219 . 20198) (PRETTYDEFMACROS 20200 . 20658) (
+FILEPKGCOMPROPS 20660 . 20912)) (21716 56963 (CLEANUP 21726 . 23114) (COMPILEFILES 23116 . 23392) (
+COMPILEFILES0 23394 . 24114) (CONTINUEDIT 24116 . 25536) (MAKEFILE 25538 . 37875) (FILECHANGES 37877
+ . 40641) (FILEPKG.MERGECHANGES 40643 . 41466) (FILEPKG.CHANGEDFNS 41468 . 41780) (MAKEFILE1 41782 . 
+46009) (COMPILE-FILE? 46011 . 47568) (MAKEFILES 47570 . 49263) (ADDFILE 49265 . 51786) (ADDFILE0 51788
+ . 55924) (LISTFILES 55926 . 56961)) (57635 92875 (FILEPKGCHANGES 57645 . 58995) (GETFILEPKGTYPE 58997
+ . 62070) (MARKASCHANGED 62072 . 63709) (FILECOMS 63711 . 64095) (WHEREIS 64097 . 65517) (
+SMASHFILECOMS 65519 . 65754) (FILEFNSLST 65756 . 65918) (FILECOMSLST 65920 . 66404) (UPDATEFILES 66406
+ . 71706) (INFILECOMS? 71708 . 73611) (INFILECOMTAIL 73613 . 74753) (INFILECOMS 74755 . 74916) (
+INFILECOM 74918 . 85127) (INFILECOMSVALS 85129 . 85456) (INFILECOMSVAL 85458 . 86460) (INFILECOMSPROP 
+86462 . 87291) (IFCPROPS 87293 . 88554) (IFCEXPRTYPE 88556 . 89067) (IFCPROPSCAN 89069 . 90122) (
+IFCDECLARE 90124 . 91435) (INFILEPAIRS 91437 . 91769) (INFILECOMSMACRO 91771 . 92873)) (92910 124330 (
+FILES? 92920 . 95113) (FILES?1 95115 . 95813) (FILES?PRINTLST 95815 . 96597) (ADDTOFILES? 96599 . 
+107645) (ADDTOFILE 107647 . 108563) (WHATIS 108565 . 110541) (ADDTOCOMS 110543 . 112187) (ADDTOCOM 
+112189 . 118736) (ADDTOCOM1 118738 . 119909) (ADDNEWCOM 119911 . 120961) (MAKENEWCOM 120963 . 122806) 
+(DEFAULTMAKENEWCOM 122808 . 124328)) (124400 127217 (MERGEINSERT 124410 . 126753) (MERGEINSERT1 126755
+ . 127215)) (127371 128728 (ADDTOFILEKEYLST 127381 . 128726)) (128845 139757 (DELFROMFILES 128855 . 
+129705) (DELFROMCOMS 129707 . 131386) (DELFROMCOM 131388 . 137256) (DELFROMCOM1 137258 . 138055) (
+REMOVEITEM 138057 . 138931) (MOVETOFILE 138933 . 139755)) (139971 142340 (SAVEPUT 139981 . 142338)) (
+142465 150789 (UNMARKASCHANGED 142475 . 144183) (PREEDITFN 144185 . 146696) (POSTEDITPROPS 146698 . 
+149199) (POSTEDITALISTS 149201 . 150787)) (150934 171488 (ALISTS.GETDEF 150944 . 151323) (
+ALISTS.WHENCHANGED 151325 . 151969) (CLEARCLISPARRAY 151971 . 153145) (EXPRESSIONS.WHENCHANGED 153147
+ . 153521) (MAKEALISTCOMS 153523 . 154596) (MAKEFILESCOMS 154598 . 156035) (MAKELISPXMACROSCOMS 156037
+ . 158055) (MAKEPROPSCOMS 158057 . 158755) (MAKEUSERMACROSCOMS 158757 . 160557) (PROPS.WHENCHANGED 
+160559 . 161180) (FILEGETDEF.LISPXMACROS 161182 . 162624) (FILEGETDEF.ALISTS 162626 . 163245) (
+FILEGETDEF.RECORDS 163247 . 164178) (FILEGETDEF.PROPS 164180 . 164972) (FILEGETDEF.MACROS 164974 . 
+166034) (FILEGETDEF.VARS 166036 . 166452) (FILEGETDEF.FNS 166454 . 167818) (FILEPKGCOMS.PUTDEF 167820
+ . 170260) (FILES.PUTDEF 170262 . 171219) (VARS.PUTDEF 171221 . 171364) (FILES.WHENCHANGED 171366 . 
+171486)) (173510 180943 (RENAME 173520 . 174921) (CHANGECALLERS 174923 . 180941)) (180944 229800 (
+SHOWDEF 180954 . 182147) (COPYDEF 182149 . 184623) (GETDEF 184625 . 186901) (GETDEFCOM 186903 . 187869
+) (GETDEFCOM0 187871 . 189217) (GETDEFCURRENT 189219 . 195639) (GETDEFERR 195641 . 196942) (
+GETDEFFROMFILE 196944 . 201224) (GETDEFSAVED 201226 . 202330) (PUTDEF 202332 . 203035) (EDITDEF 203037
+ . 204014) (DEFAULT.EDITDEF 204016 . 206852) (EDITDEF.FILES 206854 . 207055) (LOADDEF 207057 . 207233)
+ (DWIMDEF 207235 . 208089) (DELDEF 208091 . 211105) (DELFROMLIST 211107 . 211611) (HASDEF 211613 . 
+217935) (GETFILEDEF 217937 . 218459) (SAVEDEF 218461 . 220120) (UNSAVEDEF 220122 . 221018) (
+COMPAREDEFS 221020 . 224830) (COMPARE 224832 . 225536) (TYPESOF 225538 . 229798)) (229950 238721 (
+FILEPKGCOM 229960 . 234893) (FILEPKGTYPE 234895 . 238719)) (250754 265686 (FINDCALLERS 250764 . 251279
+) (EDITCALLERS 251281 . 259191) (EDITFROMFILE 259193 . 265001) (FINDATS 265003 . 265275) (LOOKIN 
+265277 . 265684)) (265687 267414 (SEPRCASE 265697 . 267412)) (267931 273488 (IMPORTFILE 267941 . 
+268915) (IMPORTEVAL 268917 . 269797) (IMPORTFILESCAN 269799 . 270220) (CHECKIMPORTS 270222 . 271558) (
+GATHEREXPORTS 271560 . 272898) (\DUMPEXPORTS 272900 . 273486)) (273826 276034 (CLEARFILEPKG 273836 . 
+276032)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index 2b5594a0..d5358b3e 100644
Binary files a/sources/FILEPKG.LCOM and b/sources/FILEPKG.LCOM differ
