diff --git a/sources/COMPARE b/sources/COMPARE
index 028bad44..f31ee4ba 100644
--- a/sources/COMPARE
+++ b/sources/COMPARE
@@ -1,13 +1,15 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED "16-May-90 14:59:25" {DSK}<usr>local>lde>lispcore>sources>COMPARE.;2 12260  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (VARS COMPARECOMS)
+(FILECREATED " 5-Nov-2021 20:53:09" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;2 12484  
 
-      previous date%: "20-Jan-87 12:44:37" {DSK}<usr>local>lde>lispcore>sources>COMPARE.;1)
+      changes to%:  (FNS COMPAREPRINTN)
+
+      previous date%: "16-May-90 14:59:25" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;1)
 
 
 (* ; "
-Copyright (c) 1987, 1990 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1987, 1990 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT COMPARECOMS)
@@ -214,7 +216,11 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.  All rights reserved.
           (TERPRI STREAM])
 
 (COMPAREPRINTN
-  [LAMBDA (N SPACE FLG STREAM)                               (* ; "Edited 29-Dec-86 11:56 by jds")
+  [LAMBDA (N SPACE FLG STREAM)                              (* ; "Edited  5-Nov-2021 20:53 by rmk:")
+                                                             (* ; "Edited 29-Dec-86 11:56 by jds")
+
+    (* ;; "RMK:  Added STREAM to POSITION and LINELENGTH")
+
     [COND
        ((NEQ N 0)
         (COND
@@ -223,9 +229,9 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.  All rights reserved.
         (SELECTQ N
             (1 (PRIN1 '& STREAM))
             (PROGN (COND
-                      ((NOT (ILESSP (IPLUS (POSITION)
+                      ((NOT (ILESSP (IPLUS (POSITION STREAM)
                                            7)
-                                   (LINELENGTH)))
+                                   (LINELENGTH NIL STREAM)))
                        (TERPRI STREAM)))
                    (PRIN1 '- STREAM)
                    (PRIN2 N STREAM)
@@ -299,7 +305,7 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.  All rights reserved.
 )
 (PUTPROPS COMPARE COPYRIGHT ("Venue & Xerox Corporation" 1987 1990))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (823 11885 (COMPARELST 833 . 1095) (COMPARE1 1097 . 2506) (COMPAREPRINT 2508 . 3465) (
-COMPAREPRINT1 3467 . 7731) (COMPARELISTS 7733 . 9020) (COMPAREPRINTN 9022 . 9666) (COMPARENCHARS 9668
- . 10226) (COMPAREFAIL 10228 . 11355) (COMPAREMAX 11357 . 11594) (COUNTDOWN 11596 . 11883)))))
+  (FILEMAP (NIL (847 12109 (COMPARELST 857 . 1119) (COMPARE1 1121 . 2530) (COMPAREPRINT 2532 . 3489) (
+COMPAREPRINT1 3491 . 7755) (COMPARELISTS 7757 . 9044) (COMPAREPRINTN 9046 . 9890) (COMPARENCHARS 9892
+ . 10450) (COMPAREFAIL 10452 . 11579) (COMPAREMAX 11581 . 11818) (COUNTDOWN 11820 . 12107)))))
 STOP
diff --git a/sources/COMPARE.LCOM b/sources/COMPARE.LCOM
index e18483e0..eb07d99f 100644
Binary files a/sources/COMPARE.LCOM and b/sources/COMPARE.LCOM differ
diff --git a/sources/COREIO b/sources/COREIO
index 8f07436e..fc1dcbcb 100644
--- a/sources/COREIO
+++ b/sources/COREIO
@@ -1,14 +1,15 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED " 4-Oct-2018 14:13:06" {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>COREIO.;4 55097  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS \CORE.GETFILEINFO)
+(FILECREATED "22-Nov-2021 09:25:42" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COREIO.;3 55023  
 
-      previous date%: "28-Jun-99 16:15:28" 
-{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>COREIO.;3)
+      changes to%:  (FNS \CORE.SETFILEINFO)
+
+      previous date%: " 4-Oct-2018 14:13:06" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COREIO.;2)
 
 
 (* ; "
-Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1981-1988, 1990, 1993, 1999, 2018 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT COREIOCOMS)
@@ -16,7 +17,7 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
 (RPAQQ COREIOCOMS
        (
 
-(* ;;; "Implementation of Core resident `files'")
+(* ;;; "Implementation of Core resident `files'")
 
         (FNS \CORE.CLOSEFILE \CORE.DELETEFILE \CORE.DIRECTORYNAMEP \CORE.FINDPAGE \CORE.GENERATEFILES
              \CORE.NEXTFILEFN \CORE.FILEINFOFN \CORE.GETFILEHANDLE \CORE.GETFILEINFO 
@@ -611,7 +612,8 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
     STREAM])
 
 (\CORE.SETFILEINFO
-  [LAMBDA (STREAM ATTRIBUTE VALUE DEV)                   (* bvm%: "15-Jan-85 17:40")
+  [LAMBDA (STREAM ATTRIBUTE VALUE DEV)                       (* ; "Edited 22-Nov-2021 09:25 by rmk:")
+                                                             (* bvm%: "15-Jan-85 17:40")
     (PROG ((INFOBLOCK (\CORE.GETINFOBLOCK STREAM 'OLD DEV)))
           (SELECTQ ATTRIBUTE
               (CREATIONDATE (SETQ VALUE (OR (IDATE VALUE)
@@ -624,10 +626,20 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
                                           (replace IOFIBType of INFOBLOCK with VALUE))
                                      (EOL (replace COREEOLC of INFOBLOCK
                                              with (SELECTQ VALUE
-                                                          (CR CR.EOLC)
-                                                          (LF LF.EOLC)
-                                                          (CRLF CRLF.EOLC)
-                                                          (LISPERROR "ILLEGAL ARG" VALUE))))
+                                                      (CR CR.EOLC)
+                                                      (LF LF.EOLC)
+                                                      (CRLF CRLF.EOLC)
+                                                      (LISPERROR "ILLEGAL ARG" VALUE))))
+                                     (CREATIONDATE (replace IOFIBCreationTime of INFOBLOCK
+                                                      with (IDATE VALUE)))
+                                     (READDATE (replace IOFIBReadTime of INFOBLOCK
+                                                  with (IDATE VALUE)))
+                                     (WRITEDATE (replace IOFIBWriteTime of INFOBLOCK
+                                                   with (IDATE VALUE)))
+                                     (ICREATIONDATE (replace IOFIBCreationTime of INFOBLOCK
+                                                       with VALUE))
+                                     (IREADDATE (replace IOFIBReadTime of INFOBLOCK with VALUE))
+                                     (IWRITEDATE (replace IOFIBWriteTime of INFOBLOCK with VALUE))
                                      NIL])
 
 (\CORE.GETNEXTBUFFER
@@ -851,60 +863,48 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
 (RECORD CORE.PAGEENTRY (PAGENUMBER . PAGEPOINTER))
 
 (DATATYPE COREFILEINFOBLK ((IOFIBCreationTime FIXP)
-                               (IOFIBReadTime FIXP)
-                               (IOFIBWriteTime FIXP)
-                               (IOFIBType POINTER)
-                               (IOFILEPAGES POINTER)
-                               (IOFILEFULLNAME POINTER)
-                               (IOEPAGE WORD)
-                               (IOEOFFSET WORD)
-                               (COREEOLC BITS 2)
-                               (IOFIBFileType WORD))
-                              IOFIBCreationTime _ (IDATE)
-                              IOFILEPAGES _ (LIST (create CORE.PAGEENTRY
-                                                         PAGENUMBER _ 0))
-                              COREEOLC _ CR.EOLC)
+                           (IOFIBReadTime FIXP)
+                           (IOFIBWriteTime FIXP)
+                           (IOFIBType POINTER)
+                           (IOFILEPAGES POINTER)
+                           (IOFILEFULLNAME POINTER)
+                           (IOEPAGE WORD)
+                           (IOEOFFSET WORD)
+                           (COREEOLC BITS 2)
+                           (IOFIBFileType WORD))
+                          IOFIBCreationTime _ (IDATE)
+                          IOFILEPAGES _ (LIST (create CORE.PAGEENTRY
+                                                     PAGENUMBER _ 0))
+                          COREEOLC _ CR.EOLC)
 
 (RECORD CORESTREAM STREAM (SUBRECORD STREAM)
-                             [ACCESSFNS CORESTREAM ((INFOBLK (fetch F1 of DATUM)
-                                                           (replace F1 of DATUM with
-                                                                                        NEWVALUE))
-                                                    (COREPAGECACHE (fetch F10 of DATUM)
-                                                           (replace F10 of DATUM with
-                                                                                         NEWVALUE))
-                                                    (BEINGPRINTED (fetch IOBEINGPRINTED
-                                                                     of (fetch INFOBLK
-                                                                               of DATUM))
-                                                           (replace IOBEINGPRINTED
-                                                              of (fetch INFOBLK of DATUM)
-                                                              with NEWVALUE))
-                                                    (FILEPAGES (fetch IOFILEPAGES
-                                                                  of (fetch INFOBLK
-                                                                            of DATUM))
-                                                           (replace IOFILEPAGES
-                                                              of (fetch INFOBLK of DATUM)
-                                                              with NEWVALUE))
-                                                    (CreationTime (fetch IOFIBCreationTime
-                                                                     of (fetch INFOBLK
-                                                                               of DATUM))
-                                                           (replace IOFIBCreationTime
-                                                              of (fetch INFOBLK of DATUM)
-                                                              with NEWVALUE))
-                                                    (ReadTime (fetch IOFIBReadTime
-                                                                 of (fetch INFOBLK
-                                                                           of DATUM))
-                                                           (replace IOFIBReadTime
-                                                              of (fetch INFOBLK of DATUM)
-                                                              with NEWVALUE))
-                                                    (WriteTime (fetch IOFIBWriteTime
-                                                                  of (fetch INFOBLK
-                                                                            of DATUM))
-                                                           (replace IOFIBWriteTime
-                                                              of (fetch INFOBLK of DATUM)
-                                                              with NEWVALUE])
+                         [ACCESSFNS CORESTREAM ((INFOBLK (fetch F1 of DATUM)
+                                                       (replace F1 of DATUM with NEWVALUE))
+                                                (COREPAGECACHE (fetch F10 of DATUM)
+                                                       (replace F10 of DATUM with NEWVALUE))
+                                                (BEINGPRINTED (fetch IOBEINGPRINTED
+                                                                 of (fetch INFOBLK of DATUM))
+                                                       (replace IOBEINGPRINTED
+                                                          of (fetch INFOBLK of DATUM) with NEWVALUE))
+                                                (FILEPAGES (fetch IOFILEPAGES
+                                                              of (fetch INFOBLK of DATUM))
+                                                       (replace IOFILEPAGES
+                                                          of (fetch INFOBLK of DATUM) with NEWVALUE))
+                                                (CreationTime (fetch IOFIBCreationTime
+                                                                 of (fetch INFOBLK of DATUM))
+                                                       (replace IOFIBCreationTime
+                                                          of (fetch INFOBLK of DATUM) with NEWVALUE))
+                                                (ReadTime (fetch IOFIBReadTime
+                                                             of (fetch INFOBLK of DATUM))
+                                                       (replace IOFIBReadTime
+                                                          of (fetch INFOBLK of DATUM) with NEWVALUE))
+                                                (WriteTime (fetch IOFIBWriteTime
+                                                              of (fetch INFOBLK of DATUM))
+                                                       (replace IOFIBWriteTime
+                                                          of (fetch INFOBLK of DATUM) with NEWVALUE])
 
 (ACCESSFNS COREDEVICE ((COREDIRECTORY (FETCH DEVICEINFO OF DATUM)
-                                  (REPLACE DEVICEINFO OF DATUM WITH NEWVALUE))))
+                              (REPLACE DEVICEINFO OF DATUM WITH NEWVALUE))))
 
 (RECORD COREGENFILESTATE (COREFILELST))
 )
@@ -954,16 +954,16 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, 1990, 1993, 1999,
 (PUTPROPS COREIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
 1993 1999 2018))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1755 43279 (\CORE.CLOSEFILE 1765 . 2538) (\CORE.DELETEFILE 2540 . 4526) (
-\CORE.DIRECTORYNAMEP 4528 . 4789) (\CORE.FINDPAGE 4791 . 8020) (\CORE.GENERATEFILES 8022 . 10609) (
-\CORE.NEXTFILEFN 10611 . 11110) (\CORE.FILEINFOFN 11112 . 11341) (\CORE.GETFILEHANDLE 11343 . 13497) (
-\CORE.GETFILEINFO 13499 . 14462) (\CORE.GETFILEINFO.FROM.INFOBLOCK 14464 . 16001) (\CORE.GETFILENAME 
-16003 . 18292) (\CORE.GETINFOBLOCK 18294 . 20917) (\CORE.NAMESCAN 20919 . 22686) (\CORE.NAMESEGMENT 
-22688 . 23125) (\CORE.OPENFILE 23127 . 26246) (\COREFILE.SETPARAMETERS 26248 . 28429) (
-\CORE.PACKFILENAME 28431 . 28826) (\CORE.RELEASEPAGES 28828 . 29429) (\CORE.SETFILEPTR 29431 . 30530) 
-(\CORE.UPDATEOF 30532 . 32161) (\CORE.BACKFILEPTR 32163 . 34371) (\CORE.SETEOFPTR 34373 . 36242) (
-\CORE.SETACCESSTIME 36244 . 36869) (\CORE.SETFILEINFO 36871 . 38062) (\CORE.GETNEXTBUFFER 38064 . 
-42020) (\CORE.UNPACKFILENAME 42022 . 43277)) (43280 46913 (COREDEVICE 43290 . 43461) (
-\CREATECOREDEVICE 43463 . 46911)) (46914 49215 (\NODIRCOREFDEV 46924 . 47521) (\NODIRCORE.OPENFILE 
-47523 . 49213)))))
+  (FILEMAP (NIL (1710 44229 (\CORE.CLOSEFILE 1720 . 2493) (\CORE.DELETEFILE 2495 . 4481) (
+\CORE.DIRECTORYNAMEP 4483 . 4744) (\CORE.FINDPAGE 4746 . 7975) (\CORE.GENERATEFILES 7977 . 10564) (
+\CORE.NEXTFILEFN 10566 . 11065) (\CORE.FILEINFOFN 11067 . 11296) (\CORE.GETFILEHANDLE 11298 . 13452) (
+\CORE.GETFILEINFO 13454 . 14417) (\CORE.GETFILEINFO.FROM.INFOBLOCK 14419 . 15956) (\CORE.GETFILENAME 
+15958 . 18247) (\CORE.GETINFOBLOCK 18249 . 20872) (\CORE.NAMESCAN 20874 . 22641) (\CORE.NAMESEGMENT 
+22643 . 23080) (\CORE.OPENFILE 23082 . 26201) (\COREFILE.SETPARAMETERS 26203 . 28384) (
+\CORE.PACKFILENAME 28386 . 28781) (\CORE.RELEASEPAGES 28783 . 29384) (\CORE.SETFILEPTR 29386 . 30485) 
+(\CORE.UPDATEOF 30487 . 32116) (\CORE.BACKFILEPTR 32118 . 34326) (\CORE.SETEOFPTR 34328 . 36197) (
+\CORE.SETACCESSTIME 36199 . 36824) (\CORE.SETFILEINFO 36826 . 39012) (\CORE.GETNEXTBUFFER 39014 . 
+42970) (\CORE.UNPACKFILENAME 42972 . 44227)) (44230 47863 (COREDEVICE 44240 . 44411) (
+\CREATECOREDEVICE 44413 . 47861)) (47864 50165 (\NODIRCOREFDEV 47874 . 48471) (\NODIRCORE.OPENFILE 
+48473 . 50163)))))
 STOP
diff --git a/sources/COREIO.LCOM b/sources/COREIO.LCOM
index 2758e993..3ca8afd2 100644
Binary files a/sources/COREIO.LCOM and b/sources/COREIO.LCOM differ
diff --git a/sources/FASLOAD b/sources/FASLOAD
index 0993c39f..f3c03c47 100644
--- a/sources/FASLOAD
+++ b/sources/FASLOAD
@@ -1,11 +1,12 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "FASL")
-(IL:FILECREATED "10-Jun-2021 18:26:43" 
-IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;8| 35584  
+(DEFINE-FILE-INFO PACKAGE "FASL" READTABLE "XCL" BASE 10)
 
-      IL:|changes| IL:|to:|  (IL:FUNCTIONS READ-TEXT)
+(IL:FILECREATED "23-Nov-2021 12:29:28" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>FASLOAD.;5| 34723  
 
-      IL:|previous| IL:|date:| "17-Apr-2018 07:55:20" 
-IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
+      IL:|changes| IL:|to:|  (IL:FNS CONVERT-FASL-DATE)
+
+      IL:|previous| IL:|date:| "23-Nov-2021 09:44:12" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>FASLOAD.;2|)
 
 
 ; Copyright (c) 1986-1992, 2018, 2021 by Venue & Xerox Corporation.
@@ -14,14 +15,14 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (IL:RPAQQ IL:FASLOADCOMS
           (
-           (IL:* IL:|;;| "FASL file loader.")
+           (IL:* IL:|;;| "FASL file loader.")
 
            
-           (IL:* IL:|;;| "THIS FILE IS DUPLICATED as ...<Lispcore>Sources> for the large-symbol version, and <Lispcore>Sources>2-byte> for the older 2-byte atom version.  IF YOU CHANGE THIS COPY, CHANGE THE OTHER, AS WELL!")
+           (IL:* IL:|;;| "THIS FILE IS DUPLICATED as ...<Lispcore>Sources> for the large-symbol version, and <Lispcore>Sources>2-byte> for the older 2-byte atom version.  IF YOU CHANGE THIS COPY, CHANGE THE OTHER, AS WELL!")
 
            (IL:COMS 
 
-                  (IL:* IL:|;;| "Common definitions.")
+                  (IL:* IL:|;;| "Common definitions.")
 
                   (IL:DECLARE\: IL:EVAL@COMPILE IL:EVAL@LOAD IL:DONTCOPY (IL:FILES (NIL IL:SOURCE)
                                                                                 IL:FASL-SUPPORT))
@@ -33,26 +34,26 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
                   (IL:FUNCTIONS TABLE-STATS))
            (IL:COMS 
 
-                  (IL:* IL:|;;| "Reader.")
+                  (IL:* IL:|;;| "Reader.")
 
-                  (IL:COMS                                   (IL:* IL:\; "Setting up the table")
+                  (IL:COMS                                   (IL:* IL:\; "Setting up the table")
                          (IL:STRUCTURES OPTABLE)
                          (IL:FUNCTIONS MAKE-OPTABLE DEFINE-OPCODE-RANGE DEFINE-SINGLE-OPCODE 
                                 ADD-OP-TRANSLATION OPCODE-SEQUENCE)
-                                                             (IL:* IL:\; "Opcode definers")
+                                                             (IL:* IL:\; "Opcode definers")
                          (IL:FUNCTIONS DEFOP DEFRANGE))
                   (IL:FUNCTIONS FASL-END-OF-BLOCK FASL-EXTENDED SETESCAPE UNIMPLEMENTED-OPCODE)
                   (IL:VARIABLES *DEFAULT-OPTABLE* *CURRENT-OPTABLE* INITIAL-VALUE-TABLE-SIZE 
                          VALUE-TABLE-INCREMENT *VALUE-TABLE* *BLOCK-LEVEL* DEBUG-READER DEBUG-STREAM)
                   
-                  (IL:* IL:|;;| "The main reader functions:")
+                  (IL:* IL:|;;| "The main reader functions:")
 
                   (IL:FUNCTIONS PROCESS-FILE PROCESS-SEGMENT)
                   (IL:FUNCTIONS WITH-OPTABLE CHECK-VERSION READ-TEXT PROCESS-BLOCK SKIP-TEXT 
                          NEXT-VALUE DO-OP NEW-VALUE-TABLE CLEAR-TABLE STORE-VALUE FETCH-VALUE 
                          COLLECT-LIST)
                   
-                  (IL:* IL:|;;| "FASL Opcode processors:")
+                  (IL:* IL:|;;| "FASL Opcode processors:")
 
                   (FASL-OPS FASL-SHORT-INTEGER FASL-NIL FASL-T FASL-INTEGER FASL-LARGE-INTEGER 
                          FASL-RATIO FASL-COMPLEX FASL-VECTOR FASL-CREATE-ARRAY FASL-INITIALIZE-ARRAY
@@ -64,18 +65,18 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
                          FASL-FUNCALL FASL-BITMAP16 FASL-STRUCTURE))
            (XCL:OPTIMIZERS FIXUP-NTOFFSET)
            
-           (IL:* IL:|;;| "make sure there's some print function around so that you can load early.")
+           (IL:* IL:|;;| "make sure there's some print function around so that you can load early.")
 
            (IL:P (IL:MOVD? 'IL:PRIN1 'PRINC)
                  (IL:MOVD? 'IL:TERPRI 'TERPRI))
            (IL:COMS 
 
-                  (IL:* IL:|;;| 
-             "ADDITION TO FILEDATE so it will handle FASL files as well as LCOMs and source files.")
+                  (IL:* IL:|;;| 
+               "ADDITION TO FILEDATE so it will handle FASL files as well as LCOMs and source files.")
 
                   (IL:FNS IL:FASL-FILEDATE CONVERT-FASL-DATE))
            
-           (IL:* IL:|;;| "Arrange for the correct compiler and makefile environment")
+           (IL:* IL:|;;| "Arrange for the correct compiler and makefile environment")
 
            (IL:PROP (IL:FILETYPE IL:MAKEFILE-ENVIRONMENT)
                   IL:FASLOAD)))
@@ -143,7 +144,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
    "End-of-data marker: if first byte of a segment, terminate processing")
 
 (DEFCONSTANT VERSION-RANGE '(8 . 8)
-                               "Handles (car version-range) <= version <= (cdr version-range)")
+                           "Handles (car version-range) <= version <= (cdr version-range)")
 
 (DEFCONSTANT CURRENT-VERSION 8)
 
@@ -183,13 +184,13 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFUN DEFINE-OPCODE-RANGE (NAME FIRST-OPCODE RANGE OFFSET TABLE)
 
-   (IL:* IL:|;;| 
-"For implementation of DEFRANGE definer--define a range of opcodes having the same implementation.")
+   (IL:* IL:|;;| 
+  "For implementation of DEFRANGE definer--define a range of opcodes having the same implementation.")
 
    (LET ((PACKAGE (SYMBOL-PACKAGE NAME))
          (PNAME (SYMBOL-NAME NAME)))
-        (DOTIMES (I RANGE)                                   (IL:* IL:\; 
-                                                  "Using IL:CONCAT here to minimize bootstrap woes")
+        (DOTIMES (I RANGE)                                   (IL:* IL:\; 
+                                                    "Using IL:CONCAT here to minimize bootstrap woes")
             (DEFINE-SINGLE-OPCODE NAME (+ I FIRST-OPCODE)
                    TABLE
                    (INTERN (IL:CONCAT PNAME (+ I OFFSET))
@@ -197,7 +198,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFUN DEFINE-SINGLE-OPCODE (NAME OPCODE TABLE TRANS-NAME)
 
-   (IL:* IL:|;;| "For implementation of DEFOP definer -- define NAME to be a fasl op numbered OPCODE in TABLE.  NAME is the name of both the opcode as a FASL::FASL-OPS and the function implementing the opcode.  TRANS-NAME is a name to associate with the opcode in the OPNAMES slot of the table (it is a generated name when we are called from DEFRANGE).")
+   (IL:* IL:|;;| "For implementation of DEFOP definer -- define NAME to be a fasl op numbered OPCODE in TABLE.  NAME is the name of both the opcode as a FASL::FASL-OPS and the function implementing the opcode.  TRANS-NAME is a name to associate with the opcode in the OPNAMES slot of the table (it is a generated name when we are called from DEFRANGE).")
 
    (SETF (ELT (OPTABLE-VECTOR TABLE)
               OPCODE)
@@ -213,7 +214,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
                   (OPTABLE-OPNAMES TABLE)))))
 
 (DEFUN OPCODE-SEQUENCE (OPNAME &OPTIONAL (TABLE *DEFAULT-OPTABLE*)
-                                  &AUX ENTRY)
+                              &AUX ENTRY)
    (COND
       ((NULL TABLE)
        NIL)
@@ -229,8 +230,8 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 
 (XCL:DEFDEFINER DEFOP FASL-OPS (IL:NAME (OPCODE &KEY (INDIRECT 0)
-                                                   (TABLE '*DEFAULT-OPTABLE*))
-                                          &BODY BODY)
+                                               (TABLE '*DEFAULT-OPTABLE*))
+                                      &BODY BODY)
    (IF (ZEROP INDIRECT)
        `(PROGN (DEFUN ,IL:NAME (STREAM OPCODE)
                   ,@BODY)
@@ -245,8 +246,8 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
                   ,@BODY))))
 
 (XCL:DEFDEFINER DEFRANGE FASL-OPS (IL:NAME (FIRST-OPCODE &KEY (INDIRECT 0)
-                                                      (TABLE '*DEFAULT-OPTABLE*))
-                                             RANGE OFFSET &BODY BODY)
+                                                  (TABLE '*DEFAULT-OPTABLE*))
+                                         RANGE OFFSET &BODY BODY)
    (IF (ZEROP INDIRECT)
        `(PROGN (DEFUN ,IL:NAME (STREAM OPCODE)
                   ,@BODY)
@@ -298,11 +299,11 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 
 (DEFUN PROCESS-FILE (STREAM &KEY (TEXT-FN (AND *LOAD-VERBOSE* #'(LAMBDA (TEXT)
-                                                                           (PRINC TEXT)
-                                                                           (TERPRI))))
-                               (ITEM-FN NIL))
+                                                                       (PRINC TEXT)
+                                                                       (TERPRI))))
+                           (ITEM-FN NIL))
 
-(IL:* IL:|;;;| "Calls FASL:PROCESS-SEGMENT with the approriate arguments for each segment in the file. The stream should be positioned at the beginning.")
+(IL:* IL:|;;;| "Calls FASL:PROCESS-SEGMENT with the approriate arguments for each segment in the file. The stream should be positioned at the beginning.")
 
    (UNLESS (EQL (IL:BIN STREAM)
                 SIGNATURE)
@@ -310,8 +311,8 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
    (LET ((IL:FILEPKGFLG NIL)
          (IL:DFNFLG T)
          (IL:LISPXHIST NIL)
-         (IL:ADDSPELLFLG NIL))                               (IL:* IL:\; 
-                                  "Bind these so that LOADing a FASL file is like LOADing SYSLOAD.")
+         (IL:ADDSPELLFLG NIL))                               (IL:* IL:\; 
+                                    "Bind these so that LOADing a FASL file is like LOADing SYSLOAD.")
         (DECLARE (SPECIAL IL:FILEPKGFLG IL:DFNFLG IL:LISPXHIST IL:ADDSPELLFLG))
         (IF (< (CHECK-VERSION STREAM)
                5)
@@ -346,9 +347,9 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFUN READ-TEXT (STREAM)
 
-   (IL:* IL:|;;| "RMK:  This really should be doing READCCODE to read the bytes, but that fails because this string is not delimited by quotes, rather it has 255 as the end marker.  255 is the XCCS characterset shift, will presumably do something else in Unicode.")
+   (IL:* IL:|;;| "RMK:  This really should be doing READCCODE to read the bytes, but that fails because this string is not delimited by quotes, rather it has 255 as the end marker.  255 is the XCCS characterset shift, will presumably do something else in Unicode.")
 
-   (IL:* IL:|;;| "Any reason not to print the string as a string?")
+   (IL:* IL:|;;| "Any reason not to print the string as a string?")
 
    (DO ((RESULT (MAKE-ARRAY 512 :ELEMENT-TYPE 'CHARACTER :ADJUSTABLE T :FILL-POINTER 0))
         (BYTE (IL:BIN STREAM)
@@ -362,10 +363,10 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
    (IL:WITH-READER-ENVIRONMENT IL:*COMMON-LISP-READ-ENVIRONMENT*
        (CATCH 'FASL-BLOCK-FINISHED
            (WITH-OPTABLE OPTABLE (DO ((*VALUE-TABLE* (NEW-VALUE-TABLE))
-                                          VAL)
-                                         ()
-                                       (SETF VAL (DO-OP STREAM 0))
-                                       (WHEN ITEM-FN (FUNCALL ITEM-FN VAL)))))))
+                                      VAL)
+                                     ()
+                                   (SETF VAL (DO-OP STREAM 0))
+                                   (WHEN ITEM-FN (FUNCALL ITEM-FN VAL)))))))
 
 (DEFUN SKIP-TEXT (STREAM)
    (DO ((BYTE (IL:BIN STREAM)
@@ -400,8 +401,8 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFUN STORE-VALUE (OBJ &OPTIONAL (TABLE *VALUE-TABLE*))
 
-   (IL:* IL:|;;| 
-"This may want to change to another representation if we can't make VECTOR-PUSH-EXTEND fast enough.")
+   (IL:* IL:|;;| 
+ "This may want to change to another representation if we can't make VECTOR-PUSH-EXTEND fast enough.")
 
    (VECTOR-PUSH-EXTEND OBJ TABLE VALUE-TABLE-INCREMENT)
    OBJ)
@@ -416,7 +417,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
    (WHEN DOTTED (DECF NELTS))
    (LET ((RESULT (IL:|to| NELTS IL:|collect| (DO-OP STREAM))))
 
-        (IL:* IL:|;;| "Assume dotted and other than a simple cons is rare.")
+        (IL:* IL:|;;| "Assume dotted and other than a simple cons is rare.")
 
         (WHEN DOTTED
             (SETF (CDR (LAST RESULT))
@@ -518,17 +519,17 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFOP FASL-FAT-STRING (141)
 
-   (IL:* IL:|;;| "Read a string of specified length that has been encoded in standard NS format.")
+   (IL:* IL:|;;| "Read a string of specified length that has been encoded in standard NS format.")
 
    (LET* ((NCHARS (NEXT-VALUE))
           (STRING (IL:ALLOCSTRING NCHARS)))
-         (IL:ACCESS-CHARSET STREAM 0)                        (IL:* IL:\; 
-                                                           "Make sure we're in charset zero")
+         (IL:ACCESS-CHARSET STREAM 0)                        (IL:* IL:\; 
+                                                             "Make sure we're in charset zero")
          (UNWIND-PROTECT
              (DOTIMES (I NCHARS STRING)
                  (SETF (SVREF STRING I)
-                       (CODE-CHAR (IL:READCCODE STREAM))))   (IL:* IL:\; 
-                                                       "Restore charset zero, in case anyone cares")
+                       (CODE-CHAR (IL:READCCODE STREAM))))   (IL:* IL:\; 
+                                                         "Restore charset zero, in case anyone cares")
              (IL:ACCESS-CHARSET STREAM 0))))
 
 (DEFOP FASL-CHARACTER (142)
@@ -571,7 +572,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFOP FASL-DCODE (150)
 
-(IL:* IL:|;;;| "DIRE WARNING!!! Be sure you have your pointy hat with lots of stars on if you're going to muck around with this code. Due to unfortunately unavoidable performance requirements, this code duplicates D-ASSEM:INTERN-DCODE. If you make a change here, you should probably change the corresponding code there.")
+(IL:* IL:|;;;| "DIRE WARNING!!! Be sure you have your pointy hat with lots of stars on if you're going to muck around with this code. Due to unfortunately unavoidable performance requirements, this code duplicates D-ASSEM:INTERN-DCODE. If you make a change here, you should probably change the corresponding code there.")
 
    (LET ((OVERHEADBYTES (* (IL:FETCH (IL:FNHEADER IL:OVERHEADWORDS) IL:OF T)
                            IL:BYTESPERWORD))
@@ -583,24 +584,21 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
              (IL:\\BINS STREAM RAW-CODE START-PC CODE-LEN)
              (IL:REPLACE (IL:FNHEADER IL:STARTPC) IL:OF RAW-CODE IL:WITH START-PC))
 
-        (IL:* IL:|;;| "Set up the free variable lookup name table.")
+        (IL:* IL:|;;| "Set up the free variable lookup name table.")
 
         (DO* ((I 0 (1+ I))
               (INDEX OVERHEADBYTES (+ INDEX (IL:CONSTANT (IL:BYTESPERNAMEENTRY))))
 
-              (IL:* IL:|;;| 
-            "NTSIZE and NTBYTESIZE the sizes of half the table in words and bytes resp.")
+              (IL:* IL:|;;| 
+              "NTSIZE and NTBYTESIZE the sizes of half the table in words and bytes resp.")
 
               (NTSIZE (IL:CEIL (1+ (IL:UNFOLD NT-COUNT (IL:CONSTANT (IL:WORDSPERNAMEENTRY))))
                              IL:WORDSPERQUAD))
               (NTBYTESIZE (* NTSIZE IL:BYTESPERWORD))
               PFI OFFSET NAME FVAROFFSET)
              ((>= I NT-COUNT)
-              (IL:REPLACE (IL:FNHEADER IL:FVAROFFSET) IL:OF RAW-CODE IL:WITH (OR 
-                                                                                           FVAROFFSET
-                                                                                             0))
-              (IL:REPLACE (IL:FNHEADER IL:NTSIZE) IL:OF RAW-CODE IL:WITH
-                                                                         (IF (ZEROP NT-COUNT)
+              (IL:REPLACE (IL:FNHEADER IL:FVAROFFSET) IL:OF RAW-CODE IL:WITH (OR FVAROFFSET 0))
+              (IL:REPLACE (IL:FNHEADER IL:NTSIZE) IL:OF RAW-CODE IL:WITH (IF (ZEROP NT-COUNT)
                                                                              0
                                                                              NTSIZE)))
            (SETF PFI (IL:BIN STREAM))
@@ -614,32 +612,30 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
                       (= PFI D-ASSEM:+FVAR-CODE+))
                (SETF FVAROFFSET (FLOOR INDEX IL:BYTESPERWORD))))
 
-        (IL:* IL:|;;| "Fill in the fixed-size fields at the front of the block.")
+        (IL:* IL:|;;| "Fill in the fixed-size fields at the front of the block.")
 
         (LET ((FRAME-NAME (NEXT-VALUE)))
              (IL:UNINTERRUPTABLY
                  (IL:\\ADDREF FRAME-NAME)
-                 (IL:REPLACE (IL:FNHEADER IL:\#FRAMENAME) IL:OF RAW-CODE IL:WITH 
-                                                                                       FRAME-NAME)))
+                 (IL:REPLACE (IL:FNHEADER IL:\#FRAMENAME) IL:OF RAW-CODE IL:WITH FRAME-NAME)))
         (LET ((NLOCALS (IL:BIN STREAM))
               (NFREEVARS (IL:BIN STREAM)))
              (IL:REPLACE (IL:FNHEADER IL:NLOCALS) IL:OF RAW-CODE IL:WITH NLOCALS)
-             (IL:REPLACE (IL:FNHEADER IL:PV) IL:OF RAW-CODE
-                IL:WITH (1- (CEILING (+ NLOCALS NFREEVARS)
-                                       IL:CELLSPERQUAD))))
+             (IL:REPLACE (IL:FNHEADER IL:PV) IL:OF RAW-CODE IL:WITH (1- (CEILING (+ NLOCALS NFREEVARS
+                                                                                    )
+                                                                               IL:CELLSPERQUAD))))
         (IL:REPLACE (IL:FNHEADER IL:ARGTYPE) IL:OF RAW-CODE IL:WITH (IL:BIN STREAM))
         (IL:REPLACE (IL:FNHEADER IL:NA) IL:OF RAW-CODE IL:WITH (NEXT-VALUE))
         (SETF CLOSURE-INFO (NEXT-VALUE))
-        (IL:REPLACE (IL:FNHEADER IL:CLOSUREP) IL:OF RAW-CODE IL:WITH (EQ CLOSURE-INFO 
-                                                                                     :CLOSURE))
+        (IL:REPLACE (IL:FNHEADER IL:CLOSUREP) IL:OF RAW-CODE IL:WITH (EQ CLOSURE-INFO :CLOSURE))
         (IL:REPLACE (IL:FNHEADER IL:FIXED) IL:OF RAW-CODE IL:WITH T)
 
-        (IL:* IL:|;;| "Fill in debugging info. It goes into the spare cell just before the code: it's -3 instead of -bytespercell to right-justify the pointer in the cell. Aren't you glad I told you this?")
+        (IL:* IL:|;;| "Fill in debugging info. It goes into the spare cell just before the code: it's -3 instead of -bytespercell to right-justify the pointer in the cell. Aren't you glad I told you this?")
 
         (D-ASSEM:FIXUP-PTR RAW-CODE (- START-PC (IL:BIG-VMEM-CODE 4 3))
                (NEXT-VALUE))
 
-        (IL:* IL:|;;| "Do fixups")
+        (IL:* IL:|;;| "Do fixups")
 
         (DO ((FN-FIXUP-COUNT (NEXT-VALUE))
              (I 0 (1+ I))
@@ -674,15 +670,15 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
           (D-ASSEM:FIXUP-WORD RAW-CODE (+ START-PC OFFSET)
                  (IL:\\RESOLVE.TYPENUMBER VALUE)))
 
-        (IL:* IL:|;;| "Finally, wrap this up in a closure-object if requested.")
+        (IL:* IL:|;;| "Finally, wrap this up in a closure-object if requested.")
 
         (IF (EQ CLOSURE-INFO :FUNCTION)
             (IL:MAKE-COMPILED-CLOSURE RAW-CODE NIL)
             RAW-CODE)))
 
 (DEFOP FASL-LOCAL-FN-FIXUPS (151)
-   (LET ((PASS-THROUGH (NEXT-VALUE)))                    (IL:* IL:\; 
-            "This will typically correspond to the DCODE that had the fixups, but can be anything.")
+   (LET ((PASS-THROUGH (NEXT-VALUE)))                        (IL:* IL:\; 
+              "This will typically correspond to the DCODE that had the fixups, but can be anything.")
         (DO ((FIXUP-COUNT (NEXT-VALUE))
              (I 0 (IL:ADD1 I))
              CODE-TO-FIX OFFSET VALUE)
@@ -701,8 +697,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
                                         ,THING))))
                  (IF (EQ CODE-TO-FIX VALUE)
                      (LET ((CODE (GET-CODE CODE-TO-FIX)))
-                          (D-ASSEM:FIXUP-PTR-NO-REF CODE (IL:IPLUS (IL:FETCH (IL:FNHEADER 
-                                                                                        IL:STARTPC)
+                          (D-ASSEM:FIXUP-PTR-NO-REF CODE (IL:IPLUS (IL:FETCH (IL:FNHEADER IL:STARTPC)
                                                                       IL:OF CODE)
                                                                 OFFSET)
                                  VALUE))
@@ -740,7 +735,7 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFOP FASL-BITMAP16 (158)
 
-(IL:* IL:|;;;| "Load an Interlisp BITMAP.")
+(IL:* IL:|;;;| "Load an Interlisp BITMAP.")
 
    (LET* ((WIDTH (NEXT-VALUE))
           (HEIGHT (NEXT-VALUE))
@@ -753,32 +748,29 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 (DEFOP FASL-STRUCTURE (159)
 
-(IL:* IL:|;;;| "Load a DEFSTRUCT-defined structure instance.")
+(IL:* IL:|;;;| "Load a DEFSTRUCT-defined structure instance.")
 
    (IL:CREATE-STRUCTURE (CONS (NEXT-VALUE)
                               (NEXT-VALUE))))
 
 (XCL:DEFOPTIMIZER FIXUP-NTOFFSET (RAW-CODE OFFSET TYPE VALUE &ENVIRONMENT IL:ENV)
 
-                                 (IL:* IL:|;;| "Do the fixups for a name-table offset entry, given a code block, the NTOffset's offset within the codeblock, and the variable type and FVAR offset.")
+                                 (IL:* IL:|;;| "Do the fixups for a name-table offset entry, given a code block, the NTOffset's offset within the codeblock, and the variable type and FVAR offset.")
 
-                                     (COND
-                                        ((IL:FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE IL:ENV)
-                                                )
+                                 (COND
+                                    ((IL:FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE IL:ENV))
 
-                                         (IL:* IL:|;;| 
-                                       "3-byte case; the nametable entry is a full cell.")
+                                     (IL:* IL:|;;| "3-byte case; the nametable entry is a full cell.")
 
-                                         `(PROGN (D-ASSEM:FIXUP-WORD ,RAW-CODE ,OFFSET ,TYPE)
-                                                 (D-ASSEM:FIXUP-WORD ,RAW-CODE (+ ,OFFSET 
-                                                                                  IL:BYTESPERWORD)
-                                                        ,VALUE)))
-                                        (T 
-                                           (IL:* IL:|;;| "Old nametable case, it's just a word.")
+                                     `(PROGN (D-ASSEM:FIXUP-WORD ,RAW-CODE ,OFFSET ,TYPE)
+                                             (D-ASSEM:FIXUP-WORD ,RAW-CODE (+ ,OFFSET IL:BYTESPERWORD
+                                                                              )
+                                                    ,VALUE)))
+                                    (T 
+                                       (IL:* IL:|;;| "Old nametable case, it's just a word.")
 
-                                           `(D-ASSEM:FIXUP-WORD ,RAW-CODE ,OFFSET (IL:IPLUS
-                                                                                   ,TYPE
-                                                                                   ,VALUE)))))
+                                       `(D-ASSEM:FIXUP-WORD ,RAW-CODE ,OFFSET (IL:IPLUS ,TYPE
+                                                                                     ,VALUE)))))
 
 
 
@@ -791,18 +783,20 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 
 
 
-(IL:* IL:|;;| "ADDITION TO FILEDATE so it will handle FASL files as well as LCOMs and source files."
-)
+(IL:* IL:|;;| "ADDITION TO FILEDATE so it will handle FASL files as well as LCOMs and source files.")
 
 (IL:DEFINEQ
 
 (IL:FASL-FILEDATE
-  (IL:LAMBDA (STREAM IL:CFLG)                       (IL:* IL:\; "Edited 17-Feb-89 11:25 by jds")
+  (IL:LAMBDA (STREAM IL:CFLG)                                (IL:* IL:\; 
+                                                             "Edited 23-Nov-2021 08:26 by rmk:")
                                                              (IL:* IL:\; 
-                                                           "CFLG IS T FOR COMPILED FILES")
+                                                             "Edited 17-Feb-89 11:25 by jds")
+                                                             (IL:* IL:\; 
+                                                             "CFLG IS T FOR COMPILED FILES")
 
     (IL:* IL:|;;| 
-  "If STREAM is open on a FASL file, returns the FILEDATE for that file.  Otherwise, returns NIL.")
+    "If STREAM is open on a FASL file, returns the FILEDATE for that file.  Otherwise, returns NIL.")
 
     (IL:* IL:|;;| "Used in FILEDATE; kept a separate function because FILEDATE is defined before the FASL package is loaded.")
 
@@ -810,36 +804,39 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
        ((EQL (IL:BIN STREAM)
              SIGNATURE)                                      (IL:* IL:\; " \"Aha, a Dfasl file\"")
         (IL:SETFILEPTR STREAM 0)
-        (IL:SETQ IL:VALUE (CONVERT-FASL-DATE (PROCESS-FILE STREAM :TEXT-FN
-                                                        #'(IL:LAMBDA (IL:X)
-                                                            (IL:RETFROM 'PROCESS-FILE IL:X))
-                                                        :ITEM-FN
-                                                        'IL:NILL)
-                                 IL:CFLG))))))
+        (CONVERT-FASL-DATE (PROCESS-FILE STREAM :TEXT-FN #'(IL:LAMBDA (IL:X)
+                                                             (IL:RETFROM 'PROCESS-FILE IL:X))
+                                  :ITEM-FN
+                                  'IL:NILL)
+               IL:CFLG)))))
 
 (CONVERT-FASL-DATE
-  (IL:LAMBDA (IL:DATESTRING IL:CFLG)             (IL:* IL:\; "Edited 17-Apr-2018 07:55 by rmk:")
-                                                             (IL:* IL:\; 
-                                                           "Edited 23-Jan-89 13:55 by gadener")
+  (IL:LAMBDA (IL:DATESTRING IL:CFLG)                 (IL:* IL:\; "Edited 23-Nov-2021 12:29 by rmk:")
+                                                     (IL:* IL:\; "Edited 17-Apr-2018 07:55 by rmk:")
+                                                    (IL:* IL:\; "Edited 23-Jan-89 13:55 by gadener")
 
-    (IL:* IL:|;;| "CONVERT-FASL-DATE takes the file text info from a DFASL file describing creation dates for source and compiled code and returns either one of these dates,  depending on the value of CLFG, in da-mon-yr hr:mn:sc format.")
+    (IL:* IL:|;;| "CONVERT-FASL-DATE takes the file text info from a DFASL file describing creation dates for source and compiled code and returns either one of these dates,  depending on the value of CLFG, in da-mon-yr hr:mn:sc format.")
 
-    (IL:* IL:|;;| "")
+    (IL:* IL:|;;| "")
 
-    (IL:* IL:|;;| "RMK: The SHORT-DATE-STRING has all of the information in the right order, most likely with 4-digit years too.  But it seems to have spaces between the day and month and month and year, whereas (DATE) with the default format produces strings with hyphens.  It also has comma-space after the year while (DATE) has just space.  The month is also spelled out (April instead of Apr).  But those differences don't seem to matter to IDATE, which is where comparisons should be done. I commented out all the junky code.")
+    (IL:* IL:|;;| "RMK: 23-Nov-2021.  Some DFASL files have a different date format, without the day before a comma and without a period at the end of the lines.  It seems that the easiest thing is just to isolate the full date strings, stripping off the period at the end and then canonicalize the return date with (GDATE (IDATE )). IDATE in particular seems to recognize all the formats.")
 
-    (LET* ((IL:DATE-POS (IF IL:CFLG
-                            (IL:STRPOS "Source file created" IL:DATESTRING)
-                            (IL:STRPOS "FASL file created" IL:DATESTRING)))
-           (IL:BEGIN-POS (IL:STRPOS "," IL:DATESTRING IL:DATE-POS))
-           (IL:END-POS (IL:STRPOS "." IL:DATESTRING IL:DATE-POS))
-           (IL:SHORT-DATE-STRING (IL:SUBSTRING IL:DATESTRING (+ IL:BEGIN-POS 2)
-                                        (IL:SUB1 IL:END-POS)))
-           IL:TEMP-DATE IL:DATE-RESULT)
+    (IL:* IL:|;;| "")
 
-          (IL:* IL:|;;| "(SETQ TEMP-DATE (CONCAT (GNC SHORT-DATE-STRING) (GNC SHORT-DATE-STRING))) (if (EQUAL \" \" (SUBSTRING TEMP-DATE 2)) then (SETQ TEMP-DATE (CONCAT \" \" (GNC TEMP-DATE))) else (GNC SHORT-DATE-STRING)) (SETQ DATE-RESULT (CONCAT TEMP-DATE \"-\" (GNC SHORT-DATE-STRING) (GNC SHORT-DATE-STRING) (GNC SHORT-DATE-STRING) \"-\")) (SETQ TEMP-DATE (SUBSTRING SHORT-DATE-STRING (PLUS 3 (STRPOS \" \" SHORT-DATE-STRING)))) (SETQ DATE-RESULT (CONCAT DATE-RESULT (GNC TEMP-DATE) (GNC TEMP-DATE) \" \")) (GNC TEMP-DATE) (GNC TEMP-DATE) (if (LESSP (STRPOS \":\" TEMP-DATE) 3) then (CONCAT DATE-RESULT \"0\" TEMP-DATE) else (CONCAT DATE-RESULT TEMP-DATE))")
-                                                             (IL:* IL:\; "")
-          IL:SHORT-DATE-STRING)))
+    (IL:* IL:|;;| 
+    "END-POS is the end of the line that contains the key substring, last char could be period")
+
+    (LET* ((IL:DATE-SUFFIX (IL:SUBSTRING IL:DATESTRING (IL:STRPOS (IF IL:CFLG
+                                                                      "FASL file created "
+                                                                      "Source file created ")
+                                                              IL:DATESTRING 1 NIL NIL T)))
+           (IL:END-POS (OR (IL:STRPOS (IL:CHARACTER (IL:CHARCODE EOL))
+                                  IL:DATE-SUFFIX)
+                           (IL:SUB1 (IL:NCHARS IL:DATE-SUFFIX)))))
+          (IL:GDATE (IL:IDATE (IL:SUBSTRING IL:DATE-SUFFIX 1 (IF (EQ (IL:CHARCODE \.)
+                                                                     (IL:NTHCHARCODE IL:END-POS -1))
+                                                                 (IL:SUB1 IL:END-POS 1)
+                                                                 IL:END-POS)))))))
 )
 
 
@@ -853,15 +850,15 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3|)
 (IL:PUTPROPS IL:FASLOAD IL:COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1989 1990 1991 1992 
 2018 2021))
 (IL:DECLARE\: IL:DONTCOPY
-  (IL:FILEMAP (NIL (6461 6877 (TABLE-STATS 6461 . 6877)) (7039 7318 (MAKE-OPTABLE 7039 . 7318)) (7320 
-7963 (DEFINE-OPCODE-RANGE 7320 . 7963)) (7965 8515 (DEFINE-SINGLE-OPCODE 7965 . 8515)) (8517 8775 (
-ADD-OP-TRANSLATION 8517 . 8775)) (8777 9141 (OPCODE-SEQUENCE 8777 . 9141)) (10735 10901 (
-FASL-END-OF-BLOCK 10735 . 10901)) (10903 11024 (FASL-EXTENDED 10903 . 11024)) (11026 11151 (SETESCAPE 
-11026 . 11151)) (11153 11249 (UNIMPLEMENTED-OPCODE 11153 . 11249)) (11610 12960 (PROCESS-FILE 11610 . 
-12960)) (12962 13192 (PROCESS-SEGMENT 12962 . 13192)) (13297 13609 (CHECK-VERSION 13297 . 13609)) (
-13611 14272 (READ-TEXT 13611 . 14272)) (14274 14776 (PROCESS-BLOCK 14274 . 14776)) (14778 14917 (
-SKIP-TEXT 14778 . 14917)) (14972 15579 (DO-OP 14972 . 15579)) (15581 15682 (NEW-VALUE-TABLE 15581 . 
-15682)) (15684 15783 (CLEAR-TABLE 15684 . 15783)) (15785 16039 (STORE-VALUE 15785 . 16039)) (16041 
-16126 (FETCH-VALUE 16041 . 16126)) (16128 16656 (COLLECT-LIST 16128 . 16656)) (31623 35206 (
-IL:FASL-FILEDATE 31636 . 32797) (CONVERT-FASL-DATE 32799 . 35204)))))
+  (IL:FILEMAP (NIL (6469 6885 (TABLE-STATS 6469 . 6885)) (7047 7326 (MAKE-OPTABLE 7047 . 7326)) (7328 
+7975 (DEFINE-OPCODE-RANGE 7328 . 7975)) (7977 8527 (DEFINE-SINGLE-OPCODE 7977 . 8527)) (8529 8787 (
+ADD-OP-TRANSLATION 8529 . 8787)) (8789 9149 (OPCODE-SEQUENCE 8789 . 9149)) (10727 10893 (
+FASL-END-OF-BLOCK 10727 . 10893)) (10895 11016 (FASL-EXTENDED 10895 . 11016)) (11018 11143 (SETESCAPE 
+11018 . 11143)) (11145 11241 (UNIMPLEMENTED-OPCODE 11145 . 11241)) (11602 12942 (PROCESS-FILE 11602 . 
+12942)) (12944 13174 (PROCESS-SEGMENT 12944 . 13174)) (13279 13591 (CHECK-VERSION 13279 . 13591)) (
+13593 14254 (READ-TEXT 13593 . 14254)) (14256 14742 (PROCESS-BLOCK 14256 . 14742)) (14744 14883 (
+SKIP-TEXT 14744 . 14883)) (14938 15545 (DO-OP 14938 . 15545)) (15547 15648 (NEW-VALUE-TABLE 15547 . 
+15648)) (15650 15749 (CLEAR-TABLE 15650 . 15749)) (15751 16006 (STORE-VALUE 15751 . 16006)) (16008 
+16093 (FETCH-VALUE 16008 . 16093)) (16095 16623 (COLLECT-LIST 16095 . 16623)) (30975 34345 (
+IL:FASL-FILEDATE 30988 . 32271) (CONVERT-FASL-DATE 32273 . 34343)))))
 IL:STOP
diff --git a/sources/FASLOAD.LCOM b/sources/FASLOAD.LCOM
index b480be22..6e4d14be 100644
Binary files a/sources/FASLOAD.LCOM and b/sources/FASLOAD.LCOM differ
diff --git a/sources/FILEPKG b/sources/FILEPKG
index 2e65e312..51d74d28 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "10-Oct-2021 20:36:54" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;10 284821 
+(FILECREATED " 8-Nov-2021 10:52:49" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>FILEPKG.;15 284792 
 
-      changes to%:  (FNS MAKEFILE)
+      changes to%:  (FNS COMPAREDEFS)
 
-      previous date%: " 8-Oct-2021 23:56:39" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;9)
+      previous date%: "30-Oct-2021 20:03:07" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>FILEPKG.;14)
 
 
 (* ; "
@@ -21,7 +20,7 @@ with the terms of said license.
 
 (RPAQQ FILEPKGCOMS
        [(COMS                                                (* ; 
-            "standard records for accessing file  package type/command parts.  Exported for PRETTY")
+              "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)
@@ -87,7 +86,7 @@ with the terms of said license.
                  (MOVD? 'MOVETOFILE 'MOVEITEM NIL T))
               (ADDVARS (SYSPROPS PROPTYPE VARTYPE)))
         [COMS                                                (* ; 
-                      "functions for doing things and marking them changed and auxiliary functions")
+                        "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]
@@ -95,7 +94,7 @@ with the terms of said license.
               (ADDVARS (LISPXFNS (PUT . SAVEPUT)
                               (PUTPROP . SAVEPUT]
         (COMS                                                (* ; 
-                                                  "sub-functions for file package commands & types")
+                                                    "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 
@@ -109,7 +108,7 @@ with the terms of said license.
                     LISPXHISTORYMACROS LISPXMACROS PRETTYDEFMACROS PRETTYEQUIVLST PRETTYPRINTMACROS 
                     PRETTYPRINTYPEMACROS USERMACROS))
         (COMS                                                (* ; 
-                    "Define the commands below AFTER the various properties have been established.")
+                      "Define the commands below AFTER the various properties have been established.")
               (USERMACROS M))
         (COMS                                                (* ; "GETDEF methods")
               (FNS RENAME CHANGECALLERS)
@@ -120,7 +119,7 @@ with the terms of said license.
                                                              (* ; "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)
@@ -211,99 +210,91 @@ with the terms of said license.
 (* ; "standard records for accessing file  package type/command parts.  Exported for PRETTY")
 
 
-(RPAQQ FILEPKGTYPEPROPS (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED 
-                                   HASDEF EDITDEF CANFILEDEF FILEGETDEF))
+(RPAQQ FILEPKGTYPEPROPS (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED HASDEF
+                               EDITDEF CANFILEDEF FILEGETDEF))
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE DONTCOPY 
 
 (RPAQQ FILEPKGRECORDS (FILEPKGCOM FILEPKGTYPE FILE FILEDATEPAIR FILEPROP))
 (DECLARE%: EVAL@COMPILE
 
 (ACCESSFNS FILEPKGCOM [[ADD (GETPROP DATUM 'ADDTOPRETTYCOM)
-                                  (UNDOABLE (COND
-                                               (NEWVALUE (/PUTPROP DATUM 'ADDTOPRETTYCOM NEWVALUE))
-                                               (T (/REMPROP DATUM 'ADDTOPRETTYCOM]
-                           [DELETE (GETPROP DATUM 'DELFROMPRETTYCOM)
-                                  (UNDOABLE (COND
-                                               (NEWVALUE (/PUTPROP DATUM 'DELFROMPRETTYCOM NEWVALUE))
-                                               (T (/REMPROP DATUM 'DELFROMPRETTYCOM]
-                           [PRETTYTYPE (GETPROP DATUM 'PRETTYTYPE)
-                                  (UNDOABLE (COND
-                                               (NEWVALUE (/PUTPROP DATUM 'PRETTYTYPE NEWVALUE))
-                                               (T (/REMPROP DATUM 'PRETTYTYPE]
-                           [CONTENTS (GETPROP DATUM 'FILEPKGCONTENTS)
-                                  (UNDOABLE (COND
-                                               (NEWVALUE (/PUTPROP DATUM 'FILEPKGCONTENTS NEWVALUE))
-                                               (T (/REMPROP DATUM 'FILEPKGCONTENTS]
-                           (MACRO [CDR (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS]
-                                  (STANDARD [COND
-                                               [NEWVALUE (PUTASSOC DATUM NEWVALUE
-                                                                (OR (LISTP (GETTOPVAL 
+                            (UNDOABLE (COND
+                                         (NEWVALUE (/PUTPROP DATUM 'ADDTOPRETTYCOM NEWVALUE))
+                                         (T (/REMPROP DATUM 'ADDTOPRETTYCOM]
+                       [DELETE (GETPROP DATUM 'DELFROMPRETTYCOM)
+                              (UNDOABLE (COND
+                                           (NEWVALUE (/PUTPROP DATUM 'DELFROMPRETTYCOM NEWVALUE))
+                                           (T (/REMPROP DATUM 'DELFROMPRETTYCOM]
+                       [PRETTYTYPE (GETPROP DATUM 'PRETTYTYPE)
+                              (UNDOABLE (COND
+                                           (NEWVALUE (/PUTPROP DATUM 'PRETTYTYPE NEWVALUE))
+                                           (T (/REMPROP DATUM 'PRETTYTYPE]
+                       [CONTENTS (GETPROP DATUM 'FILEPKGCONTENTS)
+                              (UNDOABLE (COND
+                                           (NEWVALUE (/PUTPROP DATUM 'FILEPKGCONTENTS NEWVALUE))
+                                           (T (/REMPROP DATUM 'FILEPKGCONTENTS]
+                       (MACRO [CDR (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS]
+                              (STANDARD [COND
+                                           [NEWVALUE (PUTASSOC DATUM NEWVALUE
+                                                            (OR (LISTP (GETTOPVAL 'PRETTYDEFMACROS))
+                                                                (SETTOPVAL 'PRETTYDEFMACROS
+                                                                       (LIST (LIST DATUM]
+                                           (T (SETTOPVAL 'PRETTYDEFMACROS
+                                                     (REMOVE (FASSOC DATUM (GETTOPVAL 
                                                                                   'PRETTYDEFMACROS))
-                                                                    (SETTOPVAL 'PRETTYDEFMACROS
-                                                                           (LIST (LIST DATUM]
-                                               (T (SETTOPVAL 'PRETTYDEFMACROS
-                                                         (REMOVE (FASSOC DATUM (GETTOPVAL
-                                                                                'PRETTYDEFMACROS))
-                                                                (GETTOPVAL 'PRETTYDEFMACROS]
-                                         UNDOABLE
-                                         (COND
-                                            [NEWVALUE (/PUTASSOC DATUM NEWVALUE
-                                                             (OR (LISTP (GETTOPVAL 'PRETTYDEFMACROS))
-                                                                 (/SETTOPVAL 'PRETTYDEFMACROS
-                                                                        (LIST (LIST DATUM]
-                                            (T (/SETTOPVAL 'PRETTYDEFMACROS
-                                                      (REMOVE (FASSOC DATUM (GETTOPVAL 
-                                                                                   'PRETTYDEFMACROS))
-                                                             (GETTOPVAL 'PRETTYDEFMACROS]
+                                                            (GETTOPVAL 'PRETTYDEFMACROS]
+                                     UNDOABLE
+                                     (COND
+                                        [NEWVALUE (/PUTASSOC DATUM NEWVALUE
+                                                         (OR (LISTP (GETTOPVAL 'PRETTYDEFMACROS))
+                                                             (/SETTOPVAL 'PRETTYDEFMACROS
+                                                                    (LIST (LIST DATUM]
+                                        (T (/SETTOPVAL 'PRETTYDEFMACROS
+                                                  (REMOVE (FASSOC DATUM (GETTOPVAL 'PRETTYDEFMACROS))
+                                                         (GETTOPVAL 'PRETTYDEFMACROS]
                                                              (* Not an atom record cause want 
-                                                           REMPROP on NILs.)
+                                                             REMPROP on NILs.)
                                                              (* NOTE%: PRETTCOM on PRETTY has 
-                                                           open-coded access to the MACRO 
-                                                           property.)
-                          (INIT (FILEPKGCOMPROPS ADDTOPRETTYCOM DELFROMPRETTYCOM PRETTYTYPE 
-                                       FILEPKGCONTENTS)))
+                                                             open-coded access to the MACRO 
+                                                             property.)
+                      (INIT (FILEPKGCOMPROPS ADDTOPRETTYCOM DELFROMPRETTYCOM PRETTYTYPE 
+                                   FILEPKGCONTENTS)))
 
-(ATOMRECORD FILEPKGTYPE (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED 
-                                   HASDEF EDITDEF FILEGETDEF CANFILEDEF)
-                            (ACCESSFNS FILEPKGTYPE [(CHANGEDLST (CAR (SEARCHPRETTYTYPELST DATUM))
-                                                           (CAR (SEARCHPRETTYTYPELST DATUM NEWVALUE))
-                                                           )
-                                                    (CHANGED (GETTOPVAL (CAR (SEARCHPRETTYTYPELST
-                                                                              DATUM)))
-                                                           (STANDARD (SETTOPVAL (CAR (
-                                                                                  SEARCHPRETTYTYPELST
-                                                                                      DATUM NEWVALUE)
-                                                                                     )
-                                                                            NEWVALUE)
-                                                                  UNDOABLE
-                                                                  (/SETTOPVAL (CAR (
-                                                                                  SEARCHPRETTYTYPELST
-                                                                                    DATUM NEWVALUE))
-                                                                         NEWVALUE)))
-                                                    (DESCRIPTION (CAR (CDDR (SEARCHPRETTYTYPELST
-                                                                             DATUM)))
-                                                           (CAR (RPLACA (CDDR (SEARCHPRETTYTYPELST
-                                                                               DATUM NEWVALUE))
-                                                                       NEWVALUE)))
-                                                    (ALLFIELDS NIL (/SETTOPVAL
-                                                                    'PRETTYTYPELST
-                                                                    (REMOVE (SEARCHPRETTYTYPELST
-                                                                             DATUM)
-                                                                           (GETTOPVAL 'PRETTYTYPELST]
+(ATOMRECORD FILEPKGTYPE (NEWCOM WHENFILED WHENUNFILED GETDEF NULLDEF DELDEF PUTDEF WHENCHANGED HASDEF
+                               EDITDEF FILEGETDEF CANFILEDEF)
+                        (ACCESSFNS FILEPKGTYPE [(CHANGEDLST (CAR (SEARCHPRETTYTYPELST DATUM))
+                                                       (CAR (SEARCHPRETTYTYPELST DATUM NEWVALUE)))
+                                                (CHANGED (GETTOPVAL (CAR (SEARCHPRETTYTYPELST DATUM))
+                                                                )
+                                                       (STANDARD (SETTOPVAL (CAR (SEARCHPRETTYTYPELST
+                                                                                  DATUM NEWVALUE))
+                                                                        NEWVALUE)
+                                                              UNDOABLE
+                                                              (/SETTOPVAL (CAR (SEARCHPRETTYTYPELST
+                                                                                DATUM NEWVALUE))
+                                                                     NEWVALUE)))
+                                                (DESCRIPTION (CAR (CDDR (SEARCHPRETTYTYPELST DATUM)))
+                                                       (CAR (RPLACA (CDDR (SEARCHPRETTYTYPELST DATUM
+                                                                                 NEWVALUE))
+                                                                   NEWVALUE)))
+                                                (ALLFIELDS NIL (/SETTOPVAL 'PRETTYTYPELST
+                                                                      (REMOVE (SEARCHPRETTYTYPELST
+                                                                               DATUM)
+                                                                             (GETTOPVAL 
+                                                                                    'PRETTYTYPELST]
                                                              (* 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
-                                                                                        'PROPTYPE
-                                                                                        'FILEPKGCOMS]
-                                         (ADDTOVAR PRETTYTYPELST ))))
+                                                             open-coded access to GETDEF property)
+                               (INIT [PROGN (SETQ SYSPROPS (UNION FILEPKGTYPEPROPS SYSPROPS))
+                                            (MAPC FILEPKGTYPEPROPS (FUNCTION (LAMBDA (X)
+                                                                               (PUT X 'PROPTYPE
+                                                                                    'FILEPKGCOMS]
+                                     (ADDTOVAR PRETTYTYPELST ))))
 
 (ATOMRECORD FILE (FILECHANGES FILEDATES FILEMAP)
-                     [ACCESSFNS FILE ((FILEPROP (GETPROP DATUM 'FILE)
-                                             (STANDARD (PUTPROP DATUM 'FILE NEWVALUE)
-                                                    UNDOABLE
-                                                    (/PUTPROP DATUM 'FILE NEWVALUE])
+                 [ACCESSFNS FILE ((FILEPROP (GETPROP DATUM 'FILE)
+                                         (STANDARD (PUTPROP DATUM 'FILE NEWVALUE)
+                                                UNDOABLE
+                                                (/PUTPROP DATUM 'FILE NEWVALUE])
 
 (RECORD FILEDATEPAIR (FILEDATE . DATEFILENAME))
 
@@ -956,12 +947,12 @@ compiling " T)
 (RPAQ? NILCOMS )
 
 (ADDTOVAR MAKEFILEOPTIONS RC C LIST FAST CLISP CLISPIFY NIL REMAKE NEW NOCLISP CLISP%  F ST STF 
-                                 FORMAT (REC . RC)
-                                 (BREC . RC)
-                                 (TC . C)
-                                 (BC . C)
-                                 (TCOMPL . C)
-                                 (BCOMPL . C))
+                             FORMAT (REC . RC)
+                             (BREC . RC)
+                             (TC . C)
+                             (BC . C)
+                             (TCOMPL . C)
+                             (BCOMPL . C))
 
 (RPAQ? MAKEFILEREMAKEFLG T)
 
@@ -2705,7 +2696,7 @@ compiling " T)
 )
 
 (ADDTOVAR LISPXFNS (PUT . SAVEPUT)
-                       (PUTPROP . SAVEPUT))
+                   (PUTPROP . SAVEPUT))
 
 
 
@@ -3119,14 +3110,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)))
-          (M NIL (MAKE FILE FILE)))
+             (ORIGINAL (M X . Y))))
 
 (ADDTOVAR EDITMACROS
           (M (X . Y)
@@ -3272,11 +3263,15 @@ compiling " T)
 (DEFINEQ
 
 (SHOWDEF
-  [LAMBDA (NAME TYPE FILE)                              (* ; "Edited 16-Apr-2018 21:35 by rmk:")
-                                                             (* ; 
-                                                 "prettyprint NAME as it would be dumped as a TYPE")
+  [LAMBDA (NAME TYPE FILE)                              (* ; "Edited 26-Oct-2021 09:21 by rmk:")
+                                                            (* ; "Edited 16-Apr-2018 21:35 by rmk:")
+                                                             (* ; 
+             "prettyprint NAME as it would be dumped as a TYPE (in the current reader environment)")
     (RESETLST
-        (PROG (ORIGFLG FNSLST FL PRETTYCOMSLST NEWFILEMAP)
+        (PROG (ORIGFLG FNSLST FL PRETTYCOMSLST NEWFILEMAP (SOURCEFILENV (MAKE-READER-ENVIRONMENT
+                                                                         
+                                                                       *DEFAULT-MAKEFILE-ENVIRONMENT*
+                                                                         )))
               (DECLARE (SPECVARS . T))
               [AND FILE (NEQ FILE (OUTPUT))
                    (if (SETQ FL (OPENP FILE 'OUTPUT))
@@ -3955,7 +3950,9 @@ compiling " T)
               (RETURN TYPE])
 
 (COMPAREDEFS
-  [LAMBDA (NAME TYPE SOURCES)                            (* lmm " 4-Jul-85 14:37")
+  [LAMBDA (NAME TYPE SOURCES)                               (* ; "Edited  8-Nov-2021 10:52 by rmk:")
+                                                            (* ; "Edited 30-Oct-2021 20:01 by rmk:")
+                                                             (* lmm " 4-Jul-85 14:37")
     (COND
        ((AND (LISTP TYPE)
              (GETFILEPKGTYPE SOURCES NIL T))
@@ -3969,41 +3966,45 @@ compiling " T)
                                               (MEMBER NAME (CDR (ASSOC TYPE
                                                                        (fetch TOBEDUMPED
                                                                           of (fetch FILEPROP
-                                                                                    of FILE]
+                                                                                of FILE]
                    (push SRCS 'CURRENT]
-          (SETQ SRCS (for SRC in SRCS
-                        when (COND
-                                    ((NEQ [SETQ DEF (GETDEF NAME TYPE SRC '(NOERROR NOCOPY]
-                                          (fetch NULLDEF of TYPE))
-                                     (OR [SOME DEFS (FUNCTION (LAMBDA (DP)
-                                                                (COMPARELST DEF (CDR DP]
-                                         (push DEFS (CONS SRC DEF)))
-                                     T)
-                                    (T (PRINTOUT T "No " SRC " definition found for " NAME T)
-                                       NIL)) collect SRC))
+          (SETQ SRCS (for SRC in SRCS when (COND
+                                              ((NEQ [SETQ DEF (GETDEF NAME TYPE SRC
+                                                                     '(NOERROR NOCOPY]
+                                                    (fetch NULLDEF of TYPE))
+                                               (OR [SOME DEFS (FUNCTION (LAMBDA (DP)
+                                                                          (COMPARELST DEF
+                                                                                 (CDR DP]
+                                                   (push DEFS (CONS SRC DEF)))
+                                               T)
+                                              (T (PRINTOUT T "No " SRC " definition found for " NAME
+                                                        T)
+                                                 NIL)) collect SRC))
           (RETURN (COND
                      ((NULL SRCS)
                       '(no definitions found))
                      ((NULL (CDR SRCS))
                       '(only one definition found))
                      ((CDR DEFS)
-                      [for S1 on (DREVERSE DEFS)
+                      [for S1 [FILECOL _ (IPLUS (NCHARS NAME)
+                                                (CONSTANT (NCHARS " from "] on (DREVERSE DEFS)
                          do (for S2 on (CDR S1) do (PRIN2 NAME T T)
-                                                                  (AND (CAAR S1)
-                                                                       (PRIN1 " from " T)
-                                                                       (PRIN2 (CAAR S1)
-                                                                              T T))
-                                                                  (PRIN1 " and " T)
-                                                                  (PRIN2 NAME T T)
-                                                                  (COND
-                                                                     ((CAAR S2)
-                                                                      (PRIN1 " from " T)
-                                                                      (PRIN2 (CAAR S2)
-                                                                             T T)))
-                                                                  (PRIN1 " differ:" T)
-                                                                  (TERPRI T)
-                                                                  (COMPARELISTS (CDAR S1)
-                                                                         (CDAR S2]
+                                                   (AND (CAAR S1)
+                                                        (PRIN1 " from " T)
+                                                        (PRIN2 (CAAR S1)
+                                                               T T))
+                                                   (TAB (IDIFFERENCE FILECOL (CONSTANT (NCHARS 
+                                                                                              " and "
+                                                                                              )))
+                                                        NIL T)
+                                                   (PRIN1 " and " T)
+                                                   (COND
+                                                      ((CAAR S2)
+                                                       (PRIN2 (CAAR S2)
+                                                              T T)))
+                                                   (TERPRI T)
+                                                   (COMPARELISTS (CDAR S1)
+                                                          (CDAR S2]
                       'DIFFERENT)
                      (T 'SAME])
 
@@ -4508,7 +4509,7 @@ compiling " T)
                                                                      (P (CONSTANTS . X])
 
 (ADDTOVAR SHADOW-TYPES (FUNCTIONS FNS)
-                           (VARIABLES VARS CONSTANTS))
+                       (VARIABLES VARS CONSTANTS))
 
 (RPAQ? SAVEDDEFS )
 
@@ -4971,10 +4972,10 @@ compiling " T)
 )
 
 (ADDTOVAR GAINSPACEFORMS (FILELST "erase filepkg information" (CLEARFILEPKG RESPONSE)
-                                    ((Y "es")
-                                     (N "o")
-                                     (E . "verything")
-                                     (F "ilemaps only
+                                ((Y "es")
+                                 (N "o")
+                                 (E . "verything")
+                                 (F "ilemaps only
 "))))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
@@ -5031,8 +5032,7 @@ compiling " T)
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
 
 (ADDTOVAR NLAMA \DUMPEXPORTS MAKEUSERMACROSCOMS MAKEPROPSCOMS MAKELISPXMACROSCOMS MAKEFILESCOMS 
-                          MAKEALISTCOMS LISTFILES COMPILEFILES CLEANUP FILEPKGCOMPROPS 
-                          PRETTYDEFMACROS)
+                      MAKEALISTCOMS LISTFILES COMPILEFILES CLEANUP FILEPKGCOMPROPS PRETTYDEFMACROS)
 
 (ADDTOVAR NLAML )
 
@@ -5041,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 (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)))))
+  (FILEMAP (NIL (19760 21465 (SEARCHPRETTYTYPELST 19770 . 20749) (PRETTYDEFMACROS 20751 . 21209) (
+FILEPKGCOMPROPS 21211 . 21463)) (22267 57085 (CLEANUP 22277 . 23665) (COMPILEFILES 23667 . 23943) (
+COMPILEFILES0 23945 . 24665) (CONTINUEDIT 24667 . 26087) (MAKEFILE 26089 . 38426) (FILECHANGES 38428
+ . 40763) (FILEPKG.MERGECHANGES 40765 . 41588) (FILEPKG.CHANGEDFNS 41590 . 41902) (MAKEFILE1 41904 . 
+46131) (COMPILE-FILE? 46133 . 47690) (MAKEFILES 47692 . 49385) (ADDFILE 49387 . 51908) (ADDFILE0 51910
+ . 56046) (LISTFILES 56048 . 57083)) (57757 92997 (FILEPKGCHANGES 57767 . 59117) (GETFILEPKGTYPE 59119
+ . 62192) (MARKASCHANGED 62194 . 63831) (FILECOMS 63833 . 64217) (WHEREIS 64219 . 65639) (
+SMASHFILECOMS 65641 . 65876) (FILEFNSLST 65878 . 66040) (FILECOMSLST 66042 . 66526) (UPDATEFILES 66528
+ . 71828) (INFILECOMS? 71830 . 73733) (INFILECOMTAIL 73735 . 74875) (INFILECOMS 74877 . 75038) (
+INFILECOM 75040 . 85249) (INFILECOMSVALS 85251 . 85578) (INFILECOMSVAL 85580 . 86582) (INFILECOMSPROP 
+86584 . 87413) (IFCPROPS 87415 . 88676) (IFCEXPRTYPE 88678 . 89189) (IFCPROPSCAN 89191 . 90244) (
+IFCDECLARE 90246 . 91557) (INFILEPAIRS 91559 . 91891) (INFILECOMSMACRO 91893 . 92995)) (93032 124452 (
+FILES? 93042 . 95235) (FILES?1 95237 . 95935) (FILES?PRINTLST 95937 . 96719) (ADDTOFILES? 96721 . 
+107767) (ADDTOFILE 107769 . 108685) (WHATIS 108687 . 110663) (ADDTOCOMS 110665 . 112309) (ADDTOCOM 
+112311 . 118858) (ADDTOCOM1 118860 . 120031) (ADDNEWCOM 120033 . 121083) (MAKENEWCOM 121085 . 122928) 
+(DEFAULTMAKENEWCOM 122930 . 124450)) (124522 127339 (MERGEINSERT 124532 . 126875) (MERGEINSERT1 126877
+ . 127337)) (127493 128850 (ADDTOFILEKEYLST 127503 . 128848)) (128967 139879 (DELFROMFILES 128977 . 
+129827) (DELFROMCOMS 129829 . 131508) (DELFROMCOM 131510 . 137378) (DELFROMCOM1 137380 . 138177) (
+REMOVEITEM 138179 . 139053) (MOVETOFILE 139055 . 139877)) (140093 142462 (SAVEPUT 140103 . 142460)) (
+142587 150911 (UNMARKASCHANGED 142597 . 144305) (PREEDITFN 144307 . 146818) (POSTEDITPROPS 146820 . 
+149321) (POSTEDITALISTS 149323 . 150909)) (151056 171610 (ALISTS.GETDEF 151066 . 151445) (
+ALISTS.WHENCHANGED 151447 . 152091) (CLEARCLISPARRAY 152093 . 153267) (EXPRESSIONS.WHENCHANGED 153269
+ . 153643) (MAKEALISTCOMS 153645 . 154718) (MAKEFILESCOMS 154720 . 156157) (MAKELISPXMACROSCOMS 156159
+ . 158177) (MAKEPROPSCOMS 158179 . 158877) (MAKEUSERMACROSCOMS 158879 . 160679) (PROPS.WHENCHANGED 
+160681 . 161302) (FILEGETDEF.LISPXMACROS 161304 . 162746) (FILEGETDEF.ALISTS 162748 . 163367) (
+FILEGETDEF.RECORDS 163369 . 164300) (FILEGETDEF.PROPS 164302 . 165094) (FILEGETDEF.MACROS 165096 . 
+166156) (FILEGETDEF.VARS 166158 . 166574) (FILEGETDEF.FNS 166576 . 167940) (FILEPKGCOMS.PUTDEF 167942
+ . 170382) (FILES.PUTDEF 170384 . 171341) (VARS.PUTDEF 171343 . 171486) (FILES.WHENCHANGED 171488 . 
+171608)) (173632 181065 (RENAME 173642 . 175043) (CHANGECALLERS 175045 . 181063)) (181066 229922 (
+SHOWDEF 181076 . 182269) (COPYDEF 182271 . 184745) (GETDEF 184747 . 187023) (GETDEFCOM 187025 . 187991
+) (GETDEFCOM0 187993 . 189339) (GETDEFCURRENT 189341 . 195761) (GETDEFERR 195763 . 197064) (
+GETDEFFROMFILE 197066 . 201346) (GETDEFSAVED 201348 . 202452) (PUTDEF 202454 . 203157) (EDITDEF 203159
+ . 204136) (DEFAULT.EDITDEF 204138 . 206974) (EDITDEF.FILES 206976 . 207177) (LOADDEF 207179 . 207355)
+ (DWIMDEF 207357 . 208211) (DELDEF 208213 . 211227) (DELFROMLIST 211229 . 211733) (HASDEF 211735 . 
+218057) (GETFILEDEF 218059 . 218581) (SAVEDEF 218583 . 220242) (UNSAVEDEF 220244 . 221140) (
+COMPAREDEFS 221142 . 224952) (COMPARE 224954 . 225658) (TYPESOF 225660 . 229920)) (229989 235032 (
+FIXEDITDATE 229999 . 233502) (EDITDATE? 233504 . 235030)) (235451 244222 (FILEPKGCOM 235461 . 240394) 
+(FILEPKGTYPE 240396 . 244220)) (256255 271187 (FINDCALLERS 256265 . 256780) (EDITCALLERS 256782 . 
+264692) (EDITFROMFILE 264694 . 270502) (FINDATS 270504 . 270776) (LOOKIN 270778 . 271185)) (271188 
+272915 (SEPRCASE 271198 . 272913)) (273432 278989 (IMPORTFILE 273442 . 274416) (IMPORTEVAL 274418 . 
+275298) (IMPORTFILESCAN 275300 . 275721) (CHECKIMPORTS 275723 . 277059) (GATHEREXPORTS 277061 . 278399
+) (\DUMPEXPORTS 278401 . 278987)) (279327 281535 (CLEARFILEPKG 279337 . 281533)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index 83298c1c..c23fc0ba 100644
Binary files a/sources/FILEPKG.LCOM and b/sources/FILEPKG.LCOM differ
diff --git a/sources/FILESETS b/sources/FILESETS
index 1810132b..4ff9a8e4 100644
--- a/sources/FILESETS
+++ b/sources/FILESETS
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "17-Oct-2021 13:52:47" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;15 6457   
+(FILECREATED "17-Oct-2021 16:06:59" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;17 6482   
 
       changes to%:  (VARS EXPORTFILES)
 
-      previous date%: "17-Oct-2021 12:43:39" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;14)
+      previous date%: "17-Oct-2021 13:52:47" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;16)
 
 
 (* ; "
@@ -72,7 +72,8 @@ Copyright (c) 1981-1990, 1998, 2021 by Xerox Corporation.
        (MODARITH LLPARAMS LLCODE AERROR AOFD APRINT ATERM LLARRAYELT LLDATATYPE LLNEW LLBASIC LLCHAR
               LLSTK PMAP LLGC ATBL FILEIO EXTERNALFORMAT LLARITH LLFLOAT FONT LLKEY LLDISPLAY 
               ADISPLAY AINTERRUPT RENAMEMACROS HLDISPLAY WINDOW MACROAUX ADDARITH LLFAULT LLTIMER 
-              IMAGEIO PROC XCCS PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS LLETHER PUP UFS))
+              IMAGEIO PROC XCCS PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS LLETHER PUP UFS 
+              DTDECLARE))
 
 (RPAQQ MAKEINITFILES (MAKEINIT MEM I-NEW))
 
diff --git a/sources/IMAGEIO b/sources/IMAGEIO
index bb3fd43c..05347d4e 100644
--- a/sources/IMAGEIO
+++ b/sources/IMAGEIO
@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "25-Sep-2021 20:58:07" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;4 79783  
 
-      changes to%:  (VARS IMAGEIOCOMS)
-                    (FNS \DISPLAYINIT \4DISPLAYINIT \8DISPLAYINIT \24DISPLAYINIT)
+(FILECREATED "30-Oct-2021 19:09:48" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>IMAGEIO.;7 80279  
 
-      previous date%: " 2-Aug-2021 19:41:35" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;2)
+      changes to%:  (FNS \NOIMAGE.DSPFONT)
+
+      previous date%: "25-Sep-2021 20:58:07" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>IMAGEIO.;5)
 
 
 (* ; "
@@ -756,16 +755,20 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                              IMDRAWPOINT _ (FUNCTION NILL])
 
 (\NOIMAGE.DSPFONT
-  [LAMBDA (STREAM FONT)                                  (* ; "Edited 28-Oct-87 20:10 by jds")
+  [LAMBDA (STREAM FONT)                                     (* ; "Edited 30-Oct-2021 19:09 by rmk:")
+                                                             (* ; "Edited 28-Oct-87 20:10 by jds")
 
     (* ;; "DSPFONT method for non-image streams:  Put out font-change characters.")
 
-    (LET ((OLDFONT (ffetch IMAGEDATA of STREAM)))
+    (* ;; "RMK: Save and restore CHARPOSITION")
+
+    (LET ((OLDFONT (ffetch (STREAM IMAGEDATA) of STREAM)))
          (PROG1 OLDFONT
              [AND (NEQ OLDFONT 0)
-                  (LET [(FONTN (OR (SMALLP FONT)
+                  (LET ([FONTN (OR (SMALLP FONT)
                                    (AND (type? FONTCLASS FONT)
                                         (fetch (FONTCLASS PRETTYFONT#) of FONT]
+                        CHARPOS)
                        (COND
                           ((AND FONTN (NEQ FONTN OLDFONT))
 
@@ -773,9 +776,11 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 
                            (COND
                               ((NEQ FONTN 0)
+                               (SETQ CHARPOS (FFETCH (STREAM CHARPOSITION) OF STREAM))
                                (\OUTCHAR STREAM (CONSTANT (CHCON1 FONTESCAPECHAR)))
-                               (\OUTCHAR STREAM FONTN)))
-                           (freplace IMAGEDATA of STREAM with FONTN])])
+                               (\OUTCHAR STREAM FONTN)
+                               (FREPLACE (STREAM CHARPOSITION) OF STREAM WITH CHARPOS)))
+                           (freplace (STREAM IMAGEDATA) of STREAM with FONTN])])
 
 (\UNIMPIMAGEOP
   [LAMBDA (STREAM OP)                                    (* rmk%: "26-Jun-84 13:28")
@@ -904,7 +909,7 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (RECORD BRUSH (BRUSHSHAPE BRUSHSIZE BRUSHCOLOR)
-                  BRUSHSHAPE _ 'ROUND BRUSHSIZE _ 1)
+              BRUSHSHAPE _ 'ROUND BRUSHSIZE _ 1)
 )
 
 (* "END EXPORTED DEFINITIONS")
@@ -922,17 +927,18 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 (DECLARE%: DONTCOPY 
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
 
-(PUTPROPS IMAGEOP MACRO [ARGS (CONS 'SPREADAPPLY*
-                                            (CONS (COND
-                                                     [(EQ (CAR (LISTP (CAR ARGS)))
-                                                          'QUOTE)
-                                                      (LIST 'fetch (LIST 'IMAGEOPS (CADAR ARGS))
-                                                            'of
-                                                            (LIST 'fetch '(STREAM IMAGEOPS)
+(PUTPROPS IMAGEOP MACRO [ARGS (CONS 'SPREADAPPLY* (CONS (COND
+                                                           [(EQ (CAR (LISTP (CAR ARGS)))
+                                                                'QUOTE)
+                                                            (LIST 'fetch (LIST 'IMAGEOPS (CADAR
+                                                                                          ARGS))
                                                                   'of
-                                                                  (CADR ARGS]
-                                                     (T (HELP "IMAGEOP - OPNAME not quoted:" ARGS)))
-                                                  (CDDR ARGS])
+                                                                  (LIST 'fetch '(STREAM IMAGEOPS)
+                                                                        'of
+                                                                        (CADR ARGS]
+                                                           (T (HELP "IMAGEOP - OPNAME not quoted:" 
+                                                                    ARGS)))
+                                                        (CDDR ARGS])
 )
 (DECLARE%: EVAL@COMPILE
 
@@ -1513,24 +1519,24 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 (PUTPROPS IMAGEIO COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 
 1993 1994 1999 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3423 12180 (IMAGESTREAMP 3433 . 4265) (IMAGESTREAMTYPE 4267 . 4480) (IMAGESTREAMTYPEP 
-4482 . 5117) (OPENIMAGESTREAM 5119 . 10073) (\GOOD.DASHLST 10075 . 12178)) (12215 14512 (
-DRAWDASHEDLINE 12225 . 14510)) (14513 21853 (DSPBACKCOLOR 14523 . 14895) (DSPBOTTOMMARGIN 14897 . 
-15282) (DSPCOLOR 15284 . 15648) (DSPCLIPPINGREGION 15650 . 16355) (DSPRESET 16357 . 16637) (DSPFONT 
-16639 . 17003) (DSPLEFTMARGIN 17005 . 17386) (DSPLINEFEED 17388 . 17688) (DSPOPERATION 17690 . 18067) 
-(DSPRIGHTMARGIN 18069 . 18452) (DSPTOPMARGIN 18454 . 18833) (DSPSCALE 18835 . 19202) (DSPSPACEFACTOR 
-19204 . 19597) (DSPXPOSITION 19599 . 19904) (DSPYPOSITION 19906 . 20211) (DSPROTATE 20213 . 20508) (
-DSPPUSHSTATE 20510 . 20756) (DSPPOPSTATE 20758 . 21001) (DSPDEFAULTSTATE 21003 . 21255) (DSPSCALE2 
-21257 . 21548) (DSPTRANSLATE 21550 . 21851)) (21854 30655 (DSPNEWPAGE 21864 . 22556) (DRAWBETWEEN 
-22558 . 23260) (DRAWCIRCLE 23262 . 23758) (DRAWARC 23760 . 24277) (DRAWCURVE 24279 . 24956) (
-DRAWELLIPSE 24958 . 25744) (DRAWLINE 25746 . 26136) (DRAWPOLYGON 26138 . 26593) (DRAWPOINT 26595 . 
-27014) (FILLPOLYGON 27016 . 27582) (DRAWTO 27584 . 28002) (FILLCIRCLE 28004 . 28227) (MOVETO 28229 . 
-28593) (RELDRAWTO 28595 . 29512) (BITMAPIMAGESIZE 29514 . 29685) (SCALEDBITBLT 29687 . 30653)) (30656 
-37695 (\DRAWPOINT.GENERIC 30666 . 31013) (\DRAWPOLYGON.GENERIC 31015 . 33323) (\DRAWCIRCLE.GENERIC 
-33325 . 34983) (\DRAWELLIPSE.GENERIC 34985 . 37693)) (37696 43082 (\IMAGEIOINIT 37706 . 41839) (
-\NOIMAGE.DSPFONT 41841 . 42916) (\UNIMPIMAGEOP 42918 . 43080)) (43205 46329 (INSURE.BRUSH 43215 . 
-44589) (BRUSHP 44591 . 45381) (\POSSIBLECOLOR 45383 . 45934) (NEGSHADE 45936 . 46327)) (46885 47569 (
-DASHINGP 46895 . 47225) (INSURE.DASHING 47227 . 47567)) (58050 78596 (\DisplayEventFn 58060 . 58570) (
-\DISPLAYINIT 58572 . 64155) (\4DISPLAYINIT 64157 . 68858) (\8DISPLAYINIT 68860 . 73563) (
-\24DISPLAYINIT 73565 . 78337) (\DISPLAYSTREAMTYPEBPP 78339 . 78594)))))
+  (FILEMAP (NIL (3343 12100 (IMAGESTREAMP 3353 . 4185) (IMAGESTREAMTYPE 4187 . 4400) (IMAGESTREAMTYPEP 
+4402 . 5037) (OPENIMAGESTREAM 5039 . 9993) (\GOOD.DASHLST 9995 . 12098)) (12135 14432 (DRAWDASHEDLINE 
+12145 . 14430)) (14433 21773 (DSPBACKCOLOR 14443 . 14815) (DSPBOTTOMMARGIN 14817 . 15202) (DSPCOLOR 
+15204 . 15568) (DSPCLIPPINGREGION 15570 . 16275) (DSPRESET 16277 . 16557) (DSPFONT 16559 . 16923) (
+DSPLEFTMARGIN 16925 . 17306) (DSPLINEFEED 17308 . 17608) (DSPOPERATION 17610 . 17987) (DSPRIGHTMARGIN 
+17989 . 18372) (DSPTOPMARGIN 18374 . 18753) (DSPSCALE 18755 . 19122) (DSPSPACEFACTOR 19124 . 19517) (
+DSPXPOSITION 19519 . 19824) (DSPYPOSITION 19826 . 20131) (DSPROTATE 20133 . 20428) (DSPPUSHSTATE 20430
+ . 20676) (DSPPOPSTATE 20678 . 20921) (DSPDEFAULTSTATE 20923 . 21175) (DSPSCALE2 21177 . 21468) (
+DSPTRANSLATE 21470 . 21771)) (21774 30575 (DSPNEWPAGE 21784 . 22476) (DRAWBETWEEN 22478 . 23180) (
+DRAWCIRCLE 23182 . 23678) (DRAWARC 23680 . 24197) (DRAWCURVE 24199 . 24876) (DRAWELLIPSE 24878 . 25664
+) (DRAWLINE 25666 . 26056) (DRAWPOLYGON 26058 . 26513) (DRAWPOINT 26515 . 26934) (FILLPOLYGON 26936 . 
+27502) (DRAWTO 27504 . 27922) (FILLCIRCLE 27924 . 28147) (MOVETO 28149 . 28513) (RELDRAWTO 28515 . 
+29432) (BITMAPIMAGESIZE 29434 . 29605) (SCALEDBITBLT 29607 . 30573)) (30576 37615 (\DRAWPOINT.GENERIC 
+30586 . 30933) (\DRAWPOLYGON.GENERIC 30935 . 33243) (\DRAWCIRCLE.GENERIC 33245 . 34903) (
+\DRAWELLIPSE.GENERIC 34905 . 37613)) (37616 43413 (\IMAGEIOINIT 37626 . 41759) (\NOIMAGE.DSPFONT 41761
+ . 43247) (\UNIMPIMAGEOP 43249 . 43411)) (43536 46660 (INSURE.BRUSH 43546 . 44920) (BRUSHP 44922 . 
+45712) (\POSSIBLECOLOR 45714 . 46265) (NEGSHADE 46267 . 46658)) (47216 47900 (DASHINGP 47226 . 47556) 
+(INSURE.DASHING 47558 . 47898)) (58546 79092 (\DisplayEventFn 58556 . 59066) (\DISPLAYINIT 59068 . 
+64651) (\4DISPLAYINIT 64653 . 69354) (\8DISPLAYINIT 69356 . 74059) (\24DISPLAYINIT 74061 . 78833) (
+\DISPLAYSTREAMTYPEBPP 78835 . 79090)))))
 STOP
diff --git a/sources/IMAGEIO.LCOM b/sources/IMAGEIO.LCOM
index 7d6574b9..80ab52d2 100644
Binary files a/sources/IMAGEIO.LCOM and b/sources/IMAGEIO.LCOM differ
diff --git a/sources/IOCHAR b/sources/IOCHAR
index 622d2cfb..8c2d0824 100644
--- a/sources/IOCHAR
+++ b/sources/IOCHAR
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "24-Oct-2021 23:57:27" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IOCHAR.;3 90360  
+(FILECREATED "26-Oct-2021 10:07:31" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IOCHAR.;5 90395  
 
       changes to%:  (VARS IOCHARCOMS)
 
-      previous date%: "24-Oct-2021 23:53:23" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IOCHAR.;2)
+      previous date%: "24-Oct-2021 23:57:27" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IOCHAR.;4)
 
 
 (* ; "
@@ -46,7 +46,11 @@ Copyright (c) 1981-1988, 1990-1991, 2018, 2020 by Venue & Xerox Corporation.
                    \OUTDATE-STRING \RPLRIGHT \UNPACKDATE \PACKDATE \DTSCAN \ISDST? \CHECKDSTCHANGE)
               (OPTIMIZERS DATEFORMAT)
               
-              (* ;; "Because DST begins the FIRST weekend in April now, \BeginDST changed from 120 to 98 as of 4/3/87 (JDS)  Note: this only affects standalone users--those with time servers automatically get correct local info (bvm)")
+              (* ;; "Default values for \BeginDST and \EndDST are set for (most places in) the U.S., 74 and 312 as of 2021.")
+
+              
+              (* ;; 
+      " Note: this might not be relevant to users with local time servers that do the right thing.")
 
               (INITVARS (\TimeZoneComp 8)
                      (\BeginDST 74)
@@ -1322,10 +1326,15 @@ DONTCOPY
 
 
 (* ;; 
-"Because DST begins the FIRST weekend in April now, \BeginDST changed from 120 to 98 as of 4/3/87 (JDS)  Note: this only affects standalone users--those with time servers automatically get correct local info (bvm)"
+"Default values for \BeginDST and \EndDST are set for (most places in) the U.S., 74 and 312 as of 2021."
 )
 
 
+
+
+(* ;; " Note: this might not be relevant to users with local time servers that do the right thing.")
+
+
 (RPAQ? \TimeZoneComp 8)
 
 (RPAQ? \BeginDST 74)
@@ -1374,15 +1383,15 @@ DONTCOPY
 (PUTPROPS IOCHAR COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
 1991 2018 2020))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3448 7242 (CHCON 3458 . 4308) (UNPACK 4310 . 5204) (DCHCON 5206 . 6473) (DUNPACK 6475
- . 7240)) (7243 18758 (UALPHORDER 7253 . 7349) (ALPHORDER 7351 . 9154) (CONCAT 9156 . 9801) (
-CONCATCODES 9803 . 9989) (PACKC 9991 . 12594) (PACK 12596 . 13175) (PACK* 13177 . 14899) (\PACK.ITEM 
-14901 . 15356) (STRPOS 15358 . 18756)) (18760 19049 (XCL:PACK 18760 . 19049)) (19051 19301 (XCL:PACK* 
-19051 . 19301)) (20019 22410 (STRPOSL 20029 . 21655) (MAKEBITTABLE 21657 . 22408)) (22572 23049 (
-CASEARRAY 22582 . 22772) (UPPERCASEARRAY 22774 . 23047)) (23371 46973 (FILEPOS 23381 . 33293) (
-FFILEPOS 33295 . 44408) (\SETUP.FFILEPOS 44410 . 46971)) (47761 89008 (DATE 47771 . 47857) (DATEFORMAT
- 47859 . 47951) (GDATE 47953 . 48064) (IDATE 48066 . 59737) (\IDATESCANTOKEN 59739 . 61018) (
-\IDATE-PARSE-MONTH 61020 . 64716) (\OUTDATE 64718 . 77466) (\OUTDATE-STRING 77468 . 78083) (\RPLRIGHT 
-78085 . 78323) (\UNPACKDATE 78325 . 84116) (\PACKDATE 84118 . 87438) (\DTSCAN 87440 . 87582) (\ISDST? 
-87584 . 88091) (\CHECKDSTCHANGE 88093 . 89006)))))
+  (FILEMAP (NIL (3484 7278 (CHCON 3494 . 4344) (UNPACK 4346 . 5240) (DCHCON 5242 . 6509) (DUNPACK 6511
+ . 7276)) (7279 18794 (UALPHORDER 7289 . 7385) (ALPHORDER 7387 . 9190) (CONCAT 9192 . 9837) (
+CONCATCODES 9839 . 10025) (PACKC 10027 . 12630) (PACK 12632 . 13211) (PACK* 13213 . 14935) (\PACK.ITEM
+ 14937 . 15392) (STRPOS 15394 . 18792)) (18796 19085 (XCL:PACK 18796 . 19085)) (19087 19337 (XCL:PACK*
+ 19087 . 19337)) (20055 22446 (STRPOSL 20065 . 21691) (MAKEBITTABLE 21693 . 22444)) (22608 23085 (
+CASEARRAY 22618 . 22808) (UPPERCASEARRAY 22810 . 23083)) (23407 47009 (FILEPOS 23417 . 33329) (
+FFILEPOS 33331 . 44444) (\SETUP.FFILEPOS 44446 . 47007)) (47797 89044 (DATE 47807 . 47893) (DATEFORMAT
+ 47895 . 47987) (GDATE 47989 . 48100) (IDATE 48102 . 59773) (\IDATESCANTOKEN 59775 . 61054) (
+\IDATE-PARSE-MONTH 61056 . 64752) (\OUTDATE 64754 . 77502) (\OUTDATE-STRING 77504 . 78119) (\RPLRIGHT 
+78121 . 78359) (\UNPACKDATE 78361 . 84152) (\PACKDATE 84154 . 87474) (\DTSCAN 87476 . 87618) (\ISDST? 
+87620 . 88127) (\CHECKDSTCHANGE 88129 . 89042)))))
 STOP
diff --git a/sources/IOCHAR.LCOM b/sources/IOCHAR.LCOM
index 87b89102..0d56c916 100644
Binary files a/sources/IOCHAR.LCOM and b/sources/IOCHAR.LCOM differ
diff --git a/sources/XCCS b/sources/XCCS
index cb502115..ad3210a9 100644
--- a/sources/XCCS
+++ b/sources/XCCS
@@ -1,10 +1,10 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED "13-Aug-2021 14:08:48" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;48 13416  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "10-Sep-2021 19:49:22" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;47 13404  
 
-      changes to%:  (FNS \XCCSBACKCCODE \XCCSOUTCHAR)
+      changes to%:  (FNS \CREATE.XCCS.EXTERNALFORMAT)
 
-      previous date%: " 8-Aug-2021 12:56:55" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;45)
+      previous date%: "13-Aug-2021 14:08:48" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;46)
 
 
 (PRETTYCOMPRINT XCCSCOMS)
@@ -210,9 +210,9 @@
 (DEFINEQ
 
 (\CREATE.XCCS.EXTERNALFORMAT
-  [LAMBDA (NAME EOL)                                    (* ; "Edited  1-Aug-2021 23:13 by rmk:")
+  [LAMBDA (NAME EOL)                                    (* ; "Edited 10-Sep-2021 19:49 by rmk:")
 
-(* ;;; "Create the :XCCS external format.  Stream's EOL overrides the (vacuous) default here")
+(* ;;; "Create the :XCCS external format.  Stream's EOL overrides the (vacuous) default here")
 
     (CL:UNLESS NAME (SETQ NAME :XCCS))
     (CL:UNLESS EOL
@@ -222,7 +222,7 @@
            (FUNCTION \XCCSBACKCCODE)
            (FUNCTION \XCCSOUTCHAR)
            (FUNCTION \XCCSFORMATBYTESTREAM)
-           EOL])
+           EOL T])
 )
 (DEFINEQ
 
@@ -268,9 +268,9 @@
 
 (PUTPROPS \RUNCODED MACRO (OPENLAMBDA (STREAM)
 
-                                    (* ;; "returns NIL is the stream is not runcoded, that is, if the stream has 16 bit bytes explicitly represented")
-                                                             (* ; 
-                                      "note that neq is ok since charsets are known to be SMALLP's")
+                                    (* ;; "returns NIL is the stream is not runcoded, that is, if the stream has 16 bit bytes explicitly represented")
+                                                             (* ; 
+                                      "note that neq is ok since charsets are known to be SMALLP's")
                                     (NEQ (fetch CHARSET of STREAM)
                                          \NORUNCODE)))
 )
@@ -290,8 +290,8 @@
 (\CREATE.XCCS.EXTERNALFORMAT)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1333 1562 (ACCESS-CHARSET 1343 . 1560)) (1563 10431 (\XCCSINCCODE 1573 . 4345) (
-\XCCSPEEKCCODE 4347 . 6883) (\XCCSOUTCHAR 6885 . 9105) (\XCCSBACKCCODE 9107 . 10102) (
-\XCCSFORMATBYTESTREAM 10104 . 10429)) (10432 10988 (\CREATE.XCCS.EXTERNALFORMAT 10442 . 10986)) (10989
- 11820 (\NSIN.24BITENCODING.ERROR 10999 . 11818)))))
+  (FILEMAP (NIL (1319 1548 (ACCESS-CHARSET 1329 . 1546)) (1549 10417 (\XCCSINCCODE 1559 . 4331) (
+\XCCSPEEKCCODE 4333 . 6869) (\XCCSOUTCHAR 6871 . 9091) (\XCCSBACKCCODE 9093 . 10088) (
+\XCCSFORMATBYTESTREAM 10090 . 10415)) (10418 10976 (\CREATE.XCCS.EXTERNALFORMAT 10428 . 10974)) (10977
+ 11808 (\NSIN.24BITENCODING.ERROR 10987 . 11806)))))
 STOP
diff --git a/sources/XCCS.LCOM b/sources/XCCS.LCOM
index 7fbe6386..7e051bc0 100644
Binary files a/sources/XCCS.LCOM and b/sources/XCCS.LCOM differ
