diff --git a/library/SAMEDIR b/library/SAMEDIR
index a6e0d202..1ff27939 100644
--- a/library/SAMEDIR
+++ b/library/SAMEDIR
@@ -1,11 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "25-Apr-2022 09:23:16" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SAMEDIR.;3 5583   
+(FILECREATED "31-Oct-2022 13:09:14" {WMEDLEY}<library>SAMEDIR.;4 6221   
 
-      :CHANGES-TO (FNS HOST&DIRECTORYFIELD CHECKSAMEDIR)
+      :CHANGES-TO (FNS CHECKSAMEDIR HOST&DIRECTORYFIELD)
 
-      :PREVIOUS-DATE " 1-Sep-2020 11:40:26" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SAMEDIR.;1)
+      :PREVIOUS-DATE "25-Apr-2022 09:23:16" {WMEDLEY}<library>SAMEDIR.;3)
 
 
 (* ; "
@@ -25,7 +24,8 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (CHECKSAMEDIR
-  [LAMBDA (FILE)                                             (* ; "Edited 25-Apr-2022 09:16 by rmk")
+  [LAMBDA (FILE)                                             (* ; "Edited 31-Oct-2022 13:08 by rmk")
+                                                             (* ; "Edited 25-Apr-2022 09:16 by rmk")
                                                             (* ; "Edited  1-Sep-2020 11:40 by rmk:")
 
     (* ;; "Check (a) that we are writing FILE to the same directory we last read/wrote it and (b) that a version newer than the current one has not since appeared.")
@@ -44,11 +44,19 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation.
               (RETURN))                                      (* ; 
                      "RMK: Use HOST&DIRECTORYFIELD to canonicalize both file and connected directory")
           [SETQ OKHOST/DIRS (CONS (SETQ HOST/DIR (HOST&DIRECTORYFIELD (DIRECTORYNAME T)))
-                                  (MKLIST (CDR (ASSOC HOST/DIR MIGRATIONS :TEST 'STRING-EQUAL]
+                                  (MKLIST (CDR (OR (ASSOC HOST/DIR MIGRATIONS :TEST 'STRING-EQUAL)
+                                                   (ASSOC (TRUEFILENAME HOST/DIR)
+                                                          MIGRATIONS :TEST 'STRING-EQUAL)
+                                                   (ASSOC (PSEUDOFILENAME HOST/DIR)
+                                                          MIGRATIONS :TEST 'STRING-EQUAL]
           (COND
-             ((for OLDFILE in DATES bind HOST DIR never (CL:MEMBER (HOST&DIRECTORYFIELD (CDR OLDFILE)
-                                                                          )
-                                                               OKHOST/DIRS :TEST 'STRING-EQUAL))
+             ([for OLDFILE in DATES bind HOST DIR
+                 never (OR (CL:MEMBER (HOST&DIRECTORYFIELD (CDR OLDFILE))
+                                  OKHOST/DIRS :TEST 'STRING-EQUAL)
+                           (CL:MEMBER (TRUEFILENAME (HOST&DIRECTORYFIELD (CDR OLDFILE)))
+                                  OKHOST/DIRS :TEST 'STRING-EQUAL)
+                           (CL:MEMBER (PSEUDOFILENAME (HOST&DIRECTORYFIELD (CDR OLDFILE)))
+                                  OKHOST/DIRS :TEST 'STRING-EQUAL]
 
               (* ;; "The file is going somewhere it has never been before.  ")
 
@@ -90,11 +98,9 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation.
                   (SHOULDNT])
 
 (HOST&DIRECTORYFIELD
-  [LAMBDA (FILENAME)                                         (* ; "Edited 25-Apr-2022 09:22 by rmk")
+  [LAMBDA (FILENAME)                                         (* ; "Edited 31-Oct-2022 13:03 by rmk")
+                                                             (* ; "Edited 25-Apr-2022 09:22 by rmk")
                                                             (* ; "Edited 15-Apr-2018 19:05 by rmk:")
-
-    (* ;; "Returns the host&dir fields packed together.  HOST and device are upper cased")
-
     (PACKFILENAME.STRING 'DEVICE (U-CASE (FILENAMEFIELD.STRING FILENAME 'DEVICE))
            'HOST
            (U-CASE (FILENAMEFIELD.STRING FILENAME 'HOST))
@@ -116,5 +122,5 @@ Copyright (c) 1982, 1984-1987, 1990, 2018, 2020 by Venue & Xerox Corporation.
 )
 (PUTPROPS SAMEDIR COPYRIGHT ("Venue & Xerox Corporation" 1982 1984 1985 1986 1987 1990 2018 2020))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (802 5200 (CHECKSAMEDIR 812 . 4623) (HOST&DIRECTORYFIELD 4625 . 5198)))))
+  (FILEMAP (NIL (731 5838 (CHECKSAMEDIR 741 . 5249) (HOST&DIRECTORYFIELD 5251 . 5836)))))
 STOP
diff --git a/library/SAMEDIR.LCOM b/library/SAMEDIR.LCOM
index 164bd499..3185b143 100644
Binary files a/library/SAMEDIR.LCOM and b/library/SAMEDIR.LCOM differ
diff --git a/lispusers/GITFNS b/lispusers/GITFNS
index cb5f6e82..109c7b3f 100644
--- a/lispusers/GITFNS
+++ b/lispusers/GITFNS
@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 1-Oct-2022 12:14:04" {WMEDLEY}<lispusers>GITFNS.;5 118357 
+(FILECREATED "31-Oct-2022 10:55:40" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;454 118392 
 
-      :CHANGES-TO (FNS GIT-INIT)
+      :CHANGES-TO (COMMANDS cdg cdw)
 
-      :PREVIOUS-DATE "29-Sep-2022 10:52:34" {DSK}<home>frank>il>medley>wmedley>lispusers>GITFNS.;4)
+      :PREVIOUS-DATE " 1-Oct-2022 12:14:04" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;453)
 
 
 (PRETTYCOMPRINT GITFNSCOMS)
@@ -517,7 +519,7 @@
    (CL:WHEN [AND SUBDIR (NOT (MEMB (CHCON1 SUBDIR))
                              (CHARCODE (> /]
        (SETQ SUBDIR (CONCAT SUBDIR "/")))
-   (SLASHIT (/CNDIR (CONCAT (TRUEFILENAME (GIT-GET-PROJECT PROJECT 'GITHOST))
+   (SLASHIT (/CNDIR (CONCAT (GIT-GET-PROJECT PROJECT 'GITHOST)
                            (OR SUBDIR "")))
           T))
 
@@ -527,7 +529,7 @@
    (CL:WHEN [AND SUBDIR (NOT (MEMB (CHCON1 SUBDIR))
                              (CHARCODE (> /]
        (SETQ SUBDIR (CONCAT SUBDIR "/")))
-   (SLASHIT (/CNDIR (CONCAT (TRUEFILENAME (GIT-GET-PROJECT PROJECT 'WHOST))
+   (SLASHIT (/CNDIR (CONCAT (GIT-GET-PROJECT PROJECT 'WHOST)
                            (OR SUBDIR "")))
           T))
 
@@ -2211,31 +2213,31 @@
 
 (PUTPROPS GITFNS FILETYPE :TCOMPL)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3905 19378 (GIT-CLONEP 3915 . 5178) (GIT-INIT 5180 . 5692) (GIT-MAKE-PROJECT 5694 . 
-14079) (GIT-GET-PROJECT 14081 . 16006) (GIT-PROJECT-PATH 16008 . 17052) (FIND-ANCESTOR-DIRECTORY 17054
- . 17403) (GIT-FIND-CLONE 17405 . 18486) (GIT-MAINBRANCH 18488 . 18883) (GIT-MAINBRANCH? 18885 . 19376
-)) (25826 28614 (ALLSUBDIRS 25836 . 27122) (MEDLEYSUBDIRS 27124 . 27817) (GITSUBDIRS 27819 . 28612)) (
-28615 33405 (TOGIT 28625 . 30031) (FROMGIT 30033 . 31014) (GIT-DELETE-FILE 31016 . 31862) (
-MYMEDLEY-DELETE-FILES 31864 . 33403)) (33406 36409 (MYMEDLEYSUBDIR 33416 . 33872) (GITSUBDIR 33874 . 
-34317) (STRIPDIR 34319 . 34690) (STRIPHOST 34692 . 34932) (STRIPNAME 34934 . 35687) (STRIPWHERE 35689
- . 36407)) (36410 38312 (GFILE4MFILE 36420 . 36783) (MFILE4GFILE 36785 . 37354) (GIT-REPO-FILENAME 
-37356 . 38310)) (38361 48183 (GIT-COMMIT 38371 . 39197) (GIT-PUSH 39199 . 39843) (GIT-PULL 39845 . 
-40457) (GIT-APPROVAL 40459 . 40808) (GIT-GET-FILE 40810 . 42775) (GIT-FILE-EXISTS? 42777 . 43051) (
-GIT-REMOTE-UPDATE 43053 . 43777) (GIT-REMOTE-ADD 43779 . 44086) (GIT-FILE-DATE 44088 . 45019) (
-GIT-FILE-HISTORY 45021 . 46955) (GIT-PRINT-FILE-HISTORY 46957 . 48007) (GIT-FETCH 48009 . 48181)) (
-48213 58806 (GIT-BRANCH-DIFF 48223 . 54563) (GIT-COMMIT-DIFFS 54565 . 55118) (GIT-BRANCH-RELATIONS 
-55120 . 58804)) (58851 71083 (GIT-BRANCH-NUM 58861 . 59434) (GIT-CHECKOUT 59436 . 60495) (
-GIT-WHICH-BRANCH 60497 . 60795) (GIT-MAKE-BRANCH 60797 . 63010) (GIT-BRANCHES 63012 . 65280) (
-GIT-BRANCH-EXISTS? 65282 . 65986) (GIT-PICK-BRANCH 65988 . 66316) (GIT-PRC-MENU 66318 . 68321) (
-GIT-PULL-REQUESTS 68323 . 70469) (GIT-SHORT-BRANCH-NAME 70471 . 70762) (GIT-LONG-NAME 70764 . 71081)) 
-(71113 74448 (GIT-MY-CURRENT-BRANCH 71123 . 71493) (GIT-MY-BRANCHP 71495 . 72000) (GIT-MY-NEXT-BRANCH 
-72002 . 72496) (GIT-MY-BRANCHES 72498 . 74446)) (74494 78446 (GIT-ADD-WORKTREE 74504 . 75988) (
-GIT-REMOVE-WORKTREE 75990 . 76920) (GIT-LIST-WORKTREES 76922 . 77726) (WORKTREEDIR 77728 . 78444)) (
-78494 109703 (GIT-GET-DIFFERENT-FILES 78504 . 84928) (GIT-BRANCHES-COMPARE-DIRECTORIES 84930 . 91087) 
-(GIT-WORKING-COMPARE-DIRECTORIES 91089 . 95915) (GIT-COMPARE-WORKTREE 95917 . 99895) (GITCDOBJBUTTONFN
- 99897 . 104387) (GIT-CD-LABELFN 104389 . 105471) (GIT-CD-MENUFN 105473 . 107913) (
-GIT-WORKING-COMPARE-FILES 107915 . 108535) (GIT-BRANCHES-COMPARE-FILES 108537 . 109701)) (109773 
-118290 (CDGITDIR 109783 . 110343) (GIT-COMMAND 110345 . 111903) (GITORIGIN 111905 . 112602) (
-GIT-INITIALS 112604 . 112908) (GIT-COMMAND-TO-FILE 112910 . 116399) (PROCESS-COMMAND 116401 . 117014) 
-(GIT-RESULT-TO-LINES 117016 . 117623) (STRIPLOCAL 117625 . 118288)))))
+  (FILEMAP (NIL (3970 19443 (GIT-CLONEP 3980 . 5243) (GIT-INIT 5245 . 5757) (GIT-MAKE-PROJECT 5759 . 
+14144) (GIT-GET-PROJECT 14146 . 16071) (GIT-PROJECT-PATH 16073 . 17117) (FIND-ANCESTOR-DIRECTORY 17119
+ . 17468) (GIT-FIND-CLONE 17470 . 18551) (GIT-MAINBRANCH 18553 . 18948) (GIT-MAINBRANCH? 18950 . 19441
+)) (25861 28649 (ALLSUBDIRS 25871 . 27157) (MEDLEYSUBDIRS 27159 . 27852) (GITSUBDIRS 27854 . 28647)) (
+28650 33440 (TOGIT 28660 . 30066) (FROMGIT 30068 . 31049) (GIT-DELETE-FILE 31051 . 31897) (
+MYMEDLEY-DELETE-FILES 31899 . 33438)) (33441 36444 (MYMEDLEYSUBDIR 33451 . 33907) (GITSUBDIR 33909 . 
+34352) (STRIPDIR 34354 . 34725) (STRIPHOST 34727 . 34967) (STRIPNAME 34969 . 35722) (STRIPWHERE 35724
+ . 36442)) (36445 38347 (GFILE4MFILE 36455 . 36818) (MFILE4GFILE 36820 . 37389) (GIT-REPO-FILENAME 
+37391 . 38345)) (38396 48218 (GIT-COMMIT 38406 . 39232) (GIT-PUSH 39234 . 39878) (GIT-PULL 39880 . 
+40492) (GIT-APPROVAL 40494 . 40843) (GIT-GET-FILE 40845 . 42810) (GIT-FILE-EXISTS? 42812 . 43086) (
+GIT-REMOTE-UPDATE 43088 . 43812) (GIT-REMOTE-ADD 43814 . 44121) (GIT-FILE-DATE 44123 . 45054) (
+GIT-FILE-HISTORY 45056 . 46990) (GIT-PRINT-FILE-HISTORY 46992 . 48042) (GIT-FETCH 48044 . 48216)) (
+48248 58841 (GIT-BRANCH-DIFF 48258 . 54598) (GIT-COMMIT-DIFFS 54600 . 55153) (GIT-BRANCH-RELATIONS 
+55155 . 58839)) (58886 71118 (GIT-BRANCH-NUM 58896 . 59469) (GIT-CHECKOUT 59471 . 60530) (
+GIT-WHICH-BRANCH 60532 . 60830) (GIT-MAKE-BRANCH 60832 . 63045) (GIT-BRANCHES 63047 . 65315) (
+GIT-BRANCH-EXISTS? 65317 . 66021) (GIT-PICK-BRANCH 66023 . 66351) (GIT-PRC-MENU 66353 . 68356) (
+GIT-PULL-REQUESTS 68358 . 70504) (GIT-SHORT-BRANCH-NAME 70506 . 70797) (GIT-LONG-NAME 70799 . 71116)) 
+(71148 74483 (GIT-MY-CURRENT-BRANCH 71158 . 71528) (GIT-MY-BRANCHP 71530 . 72035) (GIT-MY-NEXT-BRANCH 
+72037 . 72531) (GIT-MY-BRANCHES 72533 . 74481)) (74529 78481 (GIT-ADD-WORKTREE 74539 . 76023) (
+GIT-REMOVE-WORKTREE 76025 . 76955) (GIT-LIST-WORKTREES 76957 . 77761) (WORKTREEDIR 77763 . 78479)) (
+78529 109738 (GIT-GET-DIFFERENT-FILES 78539 . 84963) (GIT-BRANCHES-COMPARE-DIRECTORIES 84965 . 91122) 
+(GIT-WORKING-COMPARE-DIRECTORIES 91124 . 95950) (GIT-COMPARE-WORKTREE 95952 . 99930) (GITCDOBJBUTTONFN
+ 99932 . 104422) (GIT-CD-LABELFN 104424 . 105506) (GIT-CD-MENUFN 105508 . 107948) (
+GIT-WORKING-COMPARE-FILES 107950 . 108570) (GIT-BRANCHES-COMPARE-FILES 108572 . 109736)) (109808 
+118325 (CDGITDIR 109818 . 110378) (GIT-COMMAND 110380 . 111938) (GITORIGIN 111940 . 112637) (
+GIT-INITIALS 112639 . 112943) (GIT-COMMAND-TO-FILE 112945 . 116434) (PROCESS-COMMAND 116436 . 117049) 
+(GIT-RESULT-TO-LINES 117051 . 117658) (STRIPLOCAL 117660 . 118323)))))
 STOP
diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM
index f84e674c..ca03b43c 100644
Binary files a/lispusers/GITFNS.LCOM and b/lispusers/GITFNS.LCOM differ
diff --git a/lispusers/PSEUDOHOSTS b/lispusers/PSEUDOHOSTS
index 17392f02..0f02b0ce 100644
--- a/lispusers/PSEUDOHOSTS
+++ b/lispusers/PSEUDOHOSTS
@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "14-Jul-2022 17:54:43" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>PSEUDOHOSTS.;150 27644  
+(FILECREATED "31-Oct-2022 23:32:43" {WMEDLEY}<lispusers>PSEUDOHOSTS.;151 27537  
 
       :CHANGES-TO (FNS OPENFILE.PH)
 
-      :PREVIOUS-DATE "25-Jun-2022 17:24:45" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>PSEUDOHOSTS.;149)
+      :PREVIOUS-DATE "14-Jul-2022 17:54:43" {WMEDLEY}<lispusers>PSEUDOHOSTS.;150)
 
 
 (PRETTYCOMPRINT PSEUDOHOSTSCOMS)
@@ -314,6 +312,8 @@
 (OPENFILE.PH
   [LAMBDA (FILE ACCESS RECOG OTHERINFO FDEV OLDSTRING)
 
+    (* ;; "Edited 31-Oct-2022 23:32 by rmk")
+
     (* ;; "Edited 14-Jul-2022 17:53 by rmk")
 
     (* ;; "Edited 25-Jun-2022 17:06 by rmk:  If the stream was opened through the pseudohost, then it should only be registered on the pseudohost.  We assume that it is safe to remove it from the target hosts list.  The goal is that OPENP should only see it once, as being open on the pseudohost.")
@@ -325,12 +325,11 @@
     (LET ((TARGETDEV (FETCH (PHDEVICE TARGETDEV) OF FDEV))
           (STREAM (PSEUDOHOST.TARGETVAL OPENFILE (FILE ACCESS RECOG OTHERINFO FDEV OLDSTRING)
                          FDEV)))
-         (IF STREAM
-             THEN (FDEVOP 'UNREGISTERFILE TARGETDEV TARGETDEV STREAM)
-                  (CHANGE (FETCH (STREAM FULLFILENAME) OF STREAM)
-                         (CONTRACT.PH DATUM FDEV))
-                  (REPLACE (STREAM DEVICE) OF STREAM WITH FDEV)
-           ELSE (ERROR "File not found: " FILE))
+         (CL:WHEN STREAM
+             (FDEVOP 'UNREGISTERFILE TARGETDEV TARGETDEV STREAM)
+             (CHANGE (FETCH (STREAM FULLFILENAME) OF STREAM)
+                    (CONTRACT.PH DATUM FDEV))
+             (REPLACE (STREAM DEVICE) OF STREAM WITH FDEV))
          STREAM])
 
 (GETFILENAME.PH
@@ -524,13 +523,13 @@
     (LOAD 'EXPORTS.ALL))
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1350 9382 (PSEUDOHOST 1360 . 6919) (PSEUDOHOSTP 6921 . 7434) (PSEUDOHOSTS 7436 . 7793) 
-(TARGETHOST 7795 . 8069) (TRUEFILENAME 8071 . 8758) (PSEUDOFILENAME 8760 . 9380)) (9410 16949 (
-EXPAND.PH 9420 . 10673) (CONTRACT.PH 10675 . 13340) (SLASHIT 13342 . 14910) (UNSLASHIT 14912 . 16658) 
-(GETHOSTINFO.PH 16660 . 16947)) (16950 24979 (OPENFILE.PH 16960 . 18058) (GETFILENAME.PH 18060 . 18349
-) (DIRECTORYNAMEP.PH 18351 . 18975) (CLOSEFILE.PH 18977 . 19444) (REOPENFILE.PH 19446 . 20011) (
-DELETEFILE.PH 20013 . 20297) (OPENP.PH 20299 . 20594) (UNREGISTERFILE.PH 20596 . 21138) (
-REGISTERFILE.PH 21140 . 21674) (GENERATEFILES.PH 21676 . 22716) (GETFILEINFO.PH 22718 . 23020) (
-SETFILEINFO.PH 23022 . 23221) (NEXTFILEFN.PH 23223 . 23765) (FILEINFOFN.PH 23767 . 24038) (
-RENAMEFILE.PH 24040 . 24977)))))
+  (FILEMAP (NIL (1268 9300 (PSEUDOHOST 1278 . 6837) (PSEUDOHOSTP 6839 . 7352) (PSEUDOHOSTS 7354 . 7711) 
+(TARGETHOST 7713 . 7987) (TRUEFILENAME 7989 . 8676) (PSEUDOFILENAME 8678 . 9298)) (9328 16867 (
+EXPAND.PH 9338 . 10591) (CONTRACT.PH 10593 . 13258) (SLASHIT 13260 . 14828) (UNSLASHIT 14830 . 16576) 
+(GETHOSTINFO.PH 16578 . 16865)) (16868 24872 (OPENFILE.PH 16878 . 17951) (GETFILENAME.PH 17953 . 18242
+) (DIRECTORYNAMEP.PH 18244 . 18868) (CLOSEFILE.PH 18870 . 19337) (REOPENFILE.PH 19339 . 19904) (
+DELETEFILE.PH 19906 . 20190) (OPENP.PH 20192 . 20487) (UNREGISTERFILE.PH 20489 . 21031) (
+REGISTERFILE.PH 21033 . 21567) (GENERATEFILES.PH 21569 . 22609) (GETFILEINFO.PH 22611 . 22913) (
+SETFILEINFO.PH 22915 . 23114) (NEXTFILEFN.PH 23116 . 23658) (FILEINFOFN.PH 23660 . 23931) (
+RENAMEFILE.PH 23933 . 24870)))))
 STOP
diff --git a/lispusers/PSEUDOHOSTS.LCOM b/lispusers/PSEUDOHOSTS.LCOM
index d2d8d933..22acb128 100644
Binary files a/lispusers/PSEUDOHOSTS.LCOM and b/lispusers/PSEUDOHOSTS.LCOM differ
diff --git a/sources/ADIR b/sources/ADIR
index b549694b..e9eaeeec 100644
--- a/sources/ADIR
+++ b/sources/ADIR
@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "23-May-2022 12:02:10" {DSK}<users>kaplan>local>medley3.5>working-medley>sources>ADIR.;14 65884  
+(FILECREATED "31-Oct-2022 23:50:03" {WMEDLEY}<sources>ADIR.;19 66146  
 
-      :CHANGES-TO (FNS UNPACKFILENAME.STRING)
-                  (VARS ADIRCOMS)
+      :CHANGES-TO (FNS \COPYSYS)
 
-      :PREVIOUS-DATE "26-Mar-2022 09:39:50" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>sources>ADIR.;13)
+      :PREVIOUS-DATE "31-Oct-2022 14:16:39" {WMEDLEY}<sources>ADIR.;18)
 
 
 (* ; "
@@ -20,7 +18,10 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
               (FNS DELFILE FULLNAME INFILE INFILEP IOFILE OPENFILE OPENSTREAM OUTFILE OUTFILEP 
                    RENAMEFILE SIMPLE.FINDFILE VMEMSIZE \COPYSYS \FLUSHVM \LOGOUT0)
               (CONSTANTS (MULTIPLE.STREAMS.PER.FILE.ALLOWED T))
-              (P (MOVD? 'SIMPLE.FINDFILE 'FINDFILE NIL T))
+              (P (MOVD? 'SIMPLE.FINDFILE 'FINDFILE NIL T)
+                 (MOVD? 'EVQ 'TRUEFILENAME)
+                 (MOVD? 'EVQ 'PSEUDOFILENAME)
+                 (MOVD? 'NILL 'PSEUDOHOSTP))
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P 
 
                                        (* ;; "for the benefit of the call to PATHNAMEP in OPENSTREAM.  PATHNAMEP (and pathnames) get defined much later in the loadup.")
@@ -197,26 +198,28 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
     (fetch (IFPAGE NActivePages) of \InterfacePage])
 
 (\COPYSYS
-  [LAMBDA (FILE SYSNAME DONTSAVE)                      (* ; "Edited 16-Mar-2021 19:46 by larry")
-    (PROG (FULLNAME VAL HOST)
+  [LAMBDA (FILE SYSNAME DONTSAVE)                            (* ; "Edited 31-Oct-2022 23:49 by rmk")
+                                                           (* ; "Edited 16-Mar-2021 19:46 by larry")
+    (PROG (FULLNAME VAL TFILE THOST)
       RETRY
-          (SETQ FILE (PACKFILENAME.STRING 'BODY FILE 'BODY "WORK.SYSOUT" 'BODY 
-                            \CONNECTED.DIRECTORY))
-          [SELECTQ [SETQ HOST (U-CASE (FILENAMEFIELD FILE 'HOST]
-              (DSK [SETQ FULLNAME (PACKFILENAME.STRING 'HOST HOST 'EXTENSION "tmpsysout"
+          (SETQ FILE (PACKFILENAME.STRING 'BODY FILE 'BODY "WORK.SYSOUT" 'BODY \CONNECTED.DIRECTORY))
+          (SETQ TFILE (TRUEFILENAME FILE))
+          [SELECTQ [SETQ THOST (U-CASE (FILENAMEFIELD TFILE 'HOST]
+              (DSK [SETQ FULLNAME (PACKFILENAME.STRING 'HOST THOST 'NAME 'tmp 'EXTENSION 'SYSOUT
                                          'BODY
-                                         (\UFS.RECOGNIZE.FILE FILE 'NON (\GETDEVICEFROMNAME HOST]
-                   (SETQ VAL (\FLUSHVM FULLNAME))
+                                         (\UFS.RECOGNIZE.FILE TFILE 'NON (\GETDEVICEFROMNAME THOST]
+                   (SETQ VAL (\FLUSHVM FULLNAME))
                    (SETQ FULLNAME (RENAMEFILE FULLNAME FILE)))
-              (UNIX [SETQ FULLNAME (CONCAT "{" HOST "}" (\UFS.RECOGNIZE.FILE FILE 'NON (
+              (UNIX [SETQ FULLNAME (CONCAT "{" THOST "}" (\UFS.RECOGNIZE.FILE TFILE 'NON (
                                                                                    \GETDEVICEFROMNAME
-                                                                                        HOST]
+                                                                                          THOST]
                                                              (* ; "\DOFLUSHVM ")
-                    (SETQ VAL (\FLUSHVM FULLNAME)))
-              (PROGN (SETQ VAL (\FLUSHVM))
+                    (SETQ VAL (\FLUSHVM FULLNAME))
+                    (SETQ FULLNAME (RENAMEFILE FULLNAME FILE)))
+              (PROGN (SETQ VAL (\FLUSHVM))
                      (LET ((UNIXVAR (UNIX-GETENV "LDEDESTSYSOUT")))
                                                              (* ; 
-                                  "\FLSUVM saves image to  Unix enviroment var  or lisp.virtualmem")
+                                    "\FLSUVM saves image to  Unix enviroment var  or lisp.virtualmem")
                           (SETQ FULLNAME (COPYFILE (COND
                                                       (UNIXVAR (CONCAT "{DSK}" UNIXVAR))
                                                       (T "{DSK}~/lisp.virtualmem"))
@@ -231,13 +234,12 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
               (RETURN FULLNAME))
              ((AND (SMALLP VAL)
                    (IGREATERP 0 VAL))                        (* ; 
-                                                           "Error occurred while making sysout.")
+                                                             "Error occurred while making sysout.")
               (LISPERROR (IMINUS VAL)
                      FULLNAME)
               (GO RETRY))
              (T                                              (* ; "Starting sysout")
-                (\CLEARSYSBUF T)                             (* ; 
-                                                           "Get rid of any spurious typeahead")
+                (\CLEARSYSBUF T)                             (* ; "Get rid of any spurious typeahead")
                 (\RESETKEYBOARD)                             (* ; "Enable keyhandler")
                 (RETURN (LIST FULLNAME])
 
@@ -280,6 +282,12 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
 )
 
 (MOVD? 'SIMPLE.FINDFILE 'FINDFILE NIL T)
+
+(MOVD? 'EVQ 'TRUEFILENAME)
+
+(MOVD? 'EVQ 'PSEUDOFILENAME)
+
+(MOVD? 'NILL 'PSEUDOHOSTP)
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
 
@@ -1226,14 +1234,14 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
 (PUTPROPS ADIR COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
 1991 1992 1920 2017 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3179 14304 (DELFILE 3189 . 3350) (FULLNAME 3352 . 3719) (INFILE 3721 . 3869) (INFILEP 
-3871 . 4006) (IOFILE 4008 . 4148) (OPENFILE 4150 . 4550) (OPENSTREAM 4552 . 8892) (OUTFILE 8894 . 9045
-) (OUTFILEP 9047 . 9183) (RENAMEFILE 9185 . 9491) (SIMPLE.FINDFILE 9493 . 9903) (VMEMSIZE 9905 . 10072
-) (\COPYSYS 10074 . 13023) (\FLUSHVM 13025 . 14097) (\LOGOUT0 14099 . 14302)) (14676 36581 (
-UNPACKFILENAME.STRING 14686 . 33960) (\UPF.DIRECTORY 33962 . 36579)) (38109 40781 (UNPACKFILENAME 
-38119 . 38305) (LASTCHPOS 38307 . 39001) (FILENAMEFIELD 39003 . 39488) (FILENAMEFIELD.STRING 39490 . 
-40069) (PACKFILENAME 40071 . 40414) (PACKFILENAME.STRING 40416 . 40779)) (55251 56164 (
-FILEDIRCASEARRAY 55261 . 56162)) (56331 63511 (LOGOUT 56341 . 57258) (MAKESYS 57260 . 58889) (SYSOUT 
-58891 . 60443) (SAVEVM 60445 . 61245) (HERALD 61247 . 61407) (INTERPRET.REM.CM 61409 . 63134) (
-\USEREVENT 63136 . 63509)) (63693 65420 (USERNAME 63703 . 64659) (SETUSERNAME 64661 . 65418)))))
+  (FILEMAP (NIL (3185 14480 (DELFILE 3195 . 3356) (FULLNAME 3358 . 3725) (INFILE 3727 . 3875) (INFILEP 
+3877 . 4012) (IOFILE 4014 . 4154) (OPENFILE 4156 . 4556) (OPENSTREAM 4558 . 8898) (OUTFILE 8900 . 9051
+) (OUTFILEP 9053 . 9189) (RENAMEFILE 9191 . 9497) (SIMPLE.FINDFILE 9499 . 9909) (VMEMSIZE 9911 . 10078
+) (\COPYSYS 10080 . 13199) (\FLUSHVM 13201 . 14273) (\LOGOUT0 14275 . 14478)) (14938 36843 (
+UNPACKFILENAME.STRING 14948 . 34222) (\UPF.DIRECTORY 34224 . 36841)) (38371 41043 (UNPACKFILENAME 
+38381 . 38567) (LASTCHPOS 38569 . 39263) (FILENAMEFIELD 39265 . 39750) (FILENAMEFIELD.STRING 39752 . 
+40331) (PACKFILENAME 40333 . 40676) (PACKFILENAME.STRING 40678 . 41041)) (55513 56426 (
+FILEDIRCASEARRAY 55523 . 56424)) (56593 63773 (LOGOUT 56603 . 57520) (MAKESYS 57522 . 59151) (SYSOUT 
+59153 . 60705) (SAVEVM 60707 . 61507) (HERALD 61509 . 61669) (INTERPRET.REM.CM 61671 . 63396) (
+\USEREVENT 63398 . 63771)) (63955 65682 (USERNAME 63965 . 64921) (SETUSERNAME 64923 . 65680)))))
 STOP
diff --git a/sources/ADIR.LCOM b/sources/ADIR.LCOM
index de42a63f..3d0b4c84 100644
Binary files a/sources/ADIR.LCOM and b/sources/ADIR.LCOM differ
diff --git a/sources/FILEPKG b/sources/FILEPKG
index 7787380a..1c8358da 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,8 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "22-Sep-2022 08:46:29" {DSK}<home>larry>medley>sources>FILEPKG.;2 274247 
+(FILECREATED "31-Oct-2022 16:05:09" {WMEDLEY}<sources>FILEPKG.;47 274788 
 
-      :PREVIOUS-DATE "21-Sep-2022 20:51:03" {DSK}<home>larry>medley>sources>FILEPKG.;1)
+      :CHANGES-TO (FNS EDITCALLERS)
+
+      :PREVIOUS-DATE "22-Sep-2022 08:46:29" {WMEDLEY}<sources>FILEPKG.;45)
 
 
 (* ; "
@@ -3036,14 +3038,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)
@@ -4311,6 +4313,8 @@ compiling " T)
 (EDITCALLERS
   [LAMBDA (ATOMS FILES COMS)
 
+    (* ;; "Edited 31-Oct-2022 16:04 by rmk")
+
     (* ;; "Edited 24-Jul-2022 15:45 by rmk")
 
     (* ;; "Edited 21-Jul-2022 21:51 by rmk")
@@ -4423,9 +4427,14 @@ compiling " T)
 
                             [NLSETQ (SETQ MAP (LOADFNS NIL FILESTREAM NIL 'FILEMAP]
 
-                            (* ;; "LOADFNS may implicitly close the file, so reopen for next hit")
+                            (* ;; "LOADFNS may implicitly close the file, so reopen for next hit.  Depending on the file device, we may not get the exact same stream, so make sure we close this one too.")
 
-                            [OPENSTREAM FILESTREAM 'INPUT 'OLD `((EXTERNALFORMAT ,ENV]
+                            [RESETSAVE NIL (LIST (FUNCTION CLOSEF?)
+                                                 (SETQ FILESTREAM (OPENSTREAM
+                                                                   FILESTREAM
+                                                                   'INPUT
+                                                                   'OLD
+                                                                   `((EXTERNALFORMAT ,ENV]
                             (CL:UNLESS MAP                   (* ; 
                                                              "Set to T so only try and print once")
                                 (LISPXPRIN1 " no filemap!" T)
@@ -4857,46 +4866,46 @@ compiling " T)
 (PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
 1991 1992 1993 1995 2018 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18942 20615 (SEARCHPRETTYTYPELST 18952 . 19921) (PRETTYDEFMACROS 19923 . 20359) (
-FILEPKGCOMPROPS 20361 . 20613)) (21428 55720 (CLEANUP 21438 . 22828) (COMPILEFILES 22830 . 23106) (
-COMPILEFILES0 23108 . 23921) (CONTINUEDIT 23923 . 25300) (MAKEFILE 25302 . 37028) (FILECHANGES 37030
- . 39794) (FILEPKG.MERGECHANGES 39796 . 40431) (FILEPKG.CHANGEDFNS 40433 . 40745) (MAKEFILE1 40747 . 
-44959) (COMPILE-FILE? 44961 . 46548) (MAKEFILES 46550 . 48078) (ADDFILE 48080 . 50623) (ADDFILE0 50625
- . 54749) (LISTFILES 54751 . 55718)) (56392 89978 (FILEPKGCHANGES 56402 . 57581) (GETFILEPKGTYPE 57583
- . 60533) (MARKASCHANGED 60535 . 62166) (FILECOMS 62168 . 62552) (WHEREIS 62554 . 64083) (
-SMASHFILECOMS 64085 . 64313) (FILEFNSLST 64315 . 64481) (FILECOMSLST 64483 . 64969) (UPDATEFILES 64971
- . 69469) (INFILECOMS? 69471 . 71314) (INFILECOMTAIL 71316 . 72434) (INFILECOMS 72436 . 72597) (
-INFILECOM 72599 . 82617) (INFILECOMSVALS 82619 . 82926) (INFILECOMSVAL 82928 . 83936) (INFILECOMSPROP 
-83938 . 84731) (IFCPROPS 84733 . 85813) (IFCEXPRTYPE 85815 . 86431) (IFCPROPSCAN 86433 . 87394) (
-IFCDECLARE 87396 . 88655) (INFILEPAIRS 88657 . 88956) (INFILECOMSMACRO 88958 . 89976)) (90013 120699 (
-FILES? 90023 . 92134) (FILES?1 92136 . 92838) (FILES?PRINTLST 92840 . 93622) (ADDTOFILES? 93624 . 
-104167) (ADDTOFILE 104169 . 105085) (WHATIS 105087 . 107063) (ADDTOCOMS 107065 . 108603) (ADDTOCOM 
-108605 . 115092) (ADDTOCOM1 115094 . 116265) (ADDNEWCOM 116267 . 117317) (MAKENEWCOM 117319 . 119166) 
-(DEFAULTMAKENEWCOM 119168 . 120697)) (120769 123586 (MERGEINSERT 120779 . 123122) (MERGEINSERT1 123124
- . 123584)) (123740 125101 (ADDTOFILEKEYLST 123750 . 125099)) (125218 136019 (DELFROMFILES 125228 . 
-126058) (DELFROMCOMS 126060 . 127739) (DELFROMCOM 127741 . 133506) (DELFROMCOM1 133508 . 134307) (
-REMOVEITEM 134309 . 135185) (MOVETOFILE 135187 . 136017)) (136233 138604 (SAVEPUT 136243 . 138602)) (
-138729 146972 (UNMARKASCHANGED 138739 . 140223) (PREEDITFN 140225 . 142706) (POSTEDITPROPS 142708 . 
-145002) (POSTEDITALISTS 145004 . 146970)) (147117 166587 (ALISTS.GETDEF 147127 . 147506) (
-ALISTS.WHENCHANGED 147508 . 148154) (CLEARCLISPARRAY 148156 . 149334) (EXPRESSIONS.WHENCHANGED 149336
- . 149714) (MAKEALISTCOMS 149716 . 150731) (MAKEFILESCOMS 150733 . 152063) (MAKELISPXMACROSCOMS 152065
- . 154083) (MAKEPROPSCOMS 154085 . 154711) (MAKEUSERMACROSCOMS 154713 . 156530) (PROPS.WHENCHANGED 
-156532 . 157153) (FILEGETDEF.LISPXMACROS 157155 . 158454) (FILEGETDEF.ALISTS 158456 . 159047) (
-FILEGETDEF.RECORDS 159049 . 159976) (FILEGETDEF.PROPS 159978 . 160773) (FILEGETDEF.MACROS 160775 . 
-161657) (FILEGETDEF.VARS 161659 . 162262) (FILEGETDEF.FNS 162264 . 163504) (FILEPKGCOMS.PUTDEF 163506
- . 165448) (FILES.PUTDEF 165450 . 166318) (VARS.PUTDEF 166320 . 166463) (FILES.WHENCHANGED 166465 . 
-166585)) (168609 175840 (RENAME 168619 . 170064) (CHANGECALLERS 170066 . 175838)) (175841 223750 (
-SHOWDEF 175851 . 177048) (COPYDEF 177050 . 179798) (GETDEF 179800 . 182343) (GETDEFCOM 182345 . 183311
-) (GETDEFCOM0 183313 . 184506) (GETDEFCURRENT 184508 . 190820) (GETDEFERR 190822 . 192092) (
-GETDEFFROMFILE 192094 . 196323) (GETDEFSAVED 196325 . 197413) (PUTDEF 197415 . 198122) (EDITDEF 198124
- . 199107) (DEFAULT.EDITDEF 199109 . 201947) (EDITDEF.FILES 201949 . 202154) (LOADDEF 202156 . 202332)
- (DWIMDEF 202334 . 203188) (DELDEF 203190 . 206084) (DELFROMLIST 206086 . 206590) (HASDEF 206592 . 
-212829) (GETFILEDEF 212831 . 213343) (SAVEDEF 213345 . 215033) (UNSAVEDEF 215035 . 215931) (
-COMPAREDEFS 215933 . 219739) (COMPARE 219741 . 220445) (TYPESOF 220447 . 223748)) (223900 232148 (
-FILEPKGCOM 223910 . 228686) (FILEPKGTYPE 228688 . 232146)) (244181 260944 (FINDCALLERS 244191 . 244706
-) (EDITCALLERS 244708 . 254828) (EDITFROMFILE 254830 . 260259) (FINDATS 260261 . 260533) (LOOKIN 
-260535 . 260942)) (260945 262616 (SEPRCASE 260955 . 262614)) (263133 268589 (IMPORTFILE 263143 . 
-264113) (IMPORTEVAL 264115 . 265001) (IMPORTFILESCAN 265003 . 265416) (CHECKIMPORTS 265418 . 266674) (
-GATHEREXPORTS 266676 . 267997) (\DUMPEXPORTS 267999 . 268587)) (268927 270997 (CLEARFILEPKG 268937 . 
-270995)))))
+  (FILEMAP (NIL (18953 20626 (SEARCHPRETTYTYPELST 18963 . 19932) (PRETTYDEFMACROS 19934 . 20370) (
+FILEPKGCOMPROPS 20372 . 20624)) (21439 55731 (CLEANUP 21449 . 22839) (COMPILEFILES 22841 . 23117) (
+COMPILEFILES0 23119 . 23932) (CONTINUEDIT 23934 . 25311) (MAKEFILE 25313 . 37039) (FILECHANGES 37041
+ . 39805) (FILEPKG.MERGECHANGES 39807 . 40442) (FILEPKG.CHANGEDFNS 40444 . 40756) (MAKEFILE1 40758 . 
+44970) (COMPILE-FILE? 44972 . 46559) (MAKEFILES 46561 . 48089) (ADDFILE 48091 . 50634) (ADDFILE0 50636
+ . 54760) (LISTFILES 54762 . 55729)) (56403 89989 (FILEPKGCHANGES 56413 . 57592) (GETFILEPKGTYPE 57594
+ . 60544) (MARKASCHANGED 60546 . 62177) (FILECOMS 62179 . 62563) (WHEREIS 62565 . 64094) (
+SMASHFILECOMS 64096 . 64324) (FILEFNSLST 64326 . 64492) (FILECOMSLST 64494 . 64980) (UPDATEFILES 64982
+ . 69480) (INFILECOMS? 69482 . 71325) (INFILECOMTAIL 71327 . 72445) (INFILECOMS 72447 . 72608) (
+INFILECOM 72610 . 82628) (INFILECOMSVALS 82630 . 82937) (INFILECOMSVAL 82939 . 83947) (INFILECOMSPROP 
+83949 . 84742) (IFCPROPS 84744 . 85824) (IFCEXPRTYPE 85826 . 86442) (IFCPROPSCAN 86444 . 87405) (
+IFCDECLARE 87407 . 88666) (INFILEPAIRS 88668 . 88967) (INFILECOMSMACRO 88969 . 89987)) (90024 120710 (
+FILES? 90034 . 92145) (FILES?1 92147 . 92849) (FILES?PRINTLST 92851 . 93633) (ADDTOFILES? 93635 . 
+104178) (ADDTOFILE 104180 . 105096) (WHATIS 105098 . 107074) (ADDTOCOMS 107076 . 108614) (ADDTOCOM 
+108616 . 115103) (ADDTOCOM1 115105 . 116276) (ADDNEWCOM 116278 . 117328) (MAKENEWCOM 117330 . 119177) 
+(DEFAULTMAKENEWCOM 119179 . 120708)) (120780 123597 (MERGEINSERT 120790 . 123133) (MERGEINSERT1 123135
+ . 123595)) (123751 125112 (ADDTOFILEKEYLST 123761 . 125110)) (125229 136030 (DELFROMFILES 125239 . 
+126069) (DELFROMCOMS 126071 . 127750) (DELFROMCOM 127752 . 133517) (DELFROMCOM1 133519 . 134318) (
+REMOVEITEM 134320 . 135196) (MOVETOFILE 135198 . 136028)) (136244 138615 (SAVEPUT 136254 . 138613)) (
+138740 146983 (UNMARKASCHANGED 138750 . 140234) (PREEDITFN 140236 . 142717) (POSTEDITPROPS 142719 . 
+145013) (POSTEDITALISTS 145015 . 146981)) (147128 166598 (ALISTS.GETDEF 147138 . 147517) (
+ALISTS.WHENCHANGED 147519 . 148165) (CLEARCLISPARRAY 148167 . 149345) (EXPRESSIONS.WHENCHANGED 149347
+ . 149725) (MAKEALISTCOMS 149727 . 150742) (MAKEFILESCOMS 150744 . 152074) (MAKELISPXMACROSCOMS 152076
+ . 154094) (MAKEPROPSCOMS 154096 . 154722) (MAKEUSERMACROSCOMS 154724 . 156541) (PROPS.WHENCHANGED 
+156543 . 157164) (FILEGETDEF.LISPXMACROS 157166 . 158465) (FILEGETDEF.ALISTS 158467 . 159058) (
+FILEGETDEF.RECORDS 159060 . 159987) (FILEGETDEF.PROPS 159989 . 160784) (FILEGETDEF.MACROS 160786 . 
+161668) (FILEGETDEF.VARS 161670 . 162273) (FILEGETDEF.FNS 162275 . 163515) (FILEPKGCOMS.PUTDEF 163517
+ . 165459) (FILES.PUTDEF 165461 . 166329) (VARS.PUTDEF 166331 . 166474) (FILES.WHENCHANGED 166476 . 
+166596)) (168620 175851 (RENAME 168630 . 170075) (CHANGECALLERS 170077 . 175849)) (175852 223761 (
+SHOWDEF 175862 . 177059) (COPYDEF 177061 . 179809) (GETDEF 179811 . 182354) (GETDEFCOM 182356 . 183322
+) (GETDEFCOM0 183324 . 184517) (GETDEFCURRENT 184519 . 190831) (GETDEFERR 190833 . 192103) (
+GETDEFFROMFILE 192105 . 196334) (GETDEFSAVED 196336 . 197424) (PUTDEF 197426 . 198133) (EDITDEF 198135
+ . 199118) (DEFAULT.EDITDEF 199120 . 201958) (EDITDEF.FILES 201960 . 202165) (LOADDEF 202167 . 202343)
+ (DWIMDEF 202345 . 203199) (DELDEF 203201 . 206095) (DELFROMLIST 206097 . 206601) (HASDEF 206603 . 
+212840) (GETFILEDEF 212842 . 213354) (SAVEDEF 213356 . 215044) (UNSAVEDEF 215046 . 215942) (
+COMPAREDEFS 215944 . 219750) (COMPARE 219752 . 220456) (TYPESOF 220458 . 223759)) (223911 232159 (
+FILEPKGCOM 223921 . 228697) (FILEPKGTYPE 228699 . 232157)) (244192 261485 (FINDCALLERS 244202 . 244717
+) (EDITCALLERS 244719 . 255369) (EDITFROMFILE 255371 . 260800) (FINDATS 260802 . 261074) (LOOKIN 
+261076 . 261483)) (261486 263157 (SEPRCASE 261496 . 263155)) (263674 269130 (IMPORTFILE 263684 . 
+264654) (IMPORTEVAL 264656 . 265542) (IMPORTFILESCAN 265544 . 265957) (CHECKIMPORTS 265959 . 267215) (
+GATHEREXPORTS 267217 . 268538) (\DUMPEXPORTS 268540 . 269128)) (269468 271538 (CLEARFILEPKG 269478 . 
+271536)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index a3253369..27fcbbe9 100644
Binary files a/sources/FILEPKG.LCOM and b/sources/FILEPKG.LCOM differ
