diff --git a/sources/ADIR b/sources/ADIR
index c2f27f11..638c2267 100644
--- a/sources/ADIR
+++ b/sources/ADIR
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 5-Jan-2022 11:06:37" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ADIR.;10 65596  
+(FILECREATED "25-Jan-2022 17:19:00" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ADIR.;11 65609  
 
       :CHANGES-TO (FNS UNPACKFILENAME.STRING)
 
-      :PREVIOUS-DATE "13-Jun-2021 11:25:58" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ADIR.;9)
+      :PREVIOUS-DATE " 5-Jan-2022 11:06:37" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>ADIR.;10)
 
 
 (* ; "
@@ -286,7 +286,8 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
     (UNPACKFILENAME.STRING FILE ONEFIELDFLG NIL OSTYPE T])
 
 (UNPACKFILENAME.STRING
-  [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG)     (* ; "Edited  5-Jan-2022 11:03 by rmk")
+  [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG)     (* ; "Edited 25-Jan-2022 17:16 by rmk")
+                                                             (* ; "Edited  5-Jan-2022 11:03 by rmk")
                                                              (* ; "Edited 30-Mar-90 22:37 by nm")
 
 (* ;;; "Given a string or atom representation of a file name, unpack it into its component parts")
@@ -350,9 +351,7 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
              ((AND (SETQ TEM (\UPF.NEXTPOS (CHARCODE (%: < /))
                                     FILE POS))
                    (EQ (CHARCODE %:)
-                       (NTHCHARCODE FILE TEM))
-                   (SETQ TEM (LASTCHPOS (CHARCODE %:)
-                                    FILE TEM)))              (* ; 
+                       (NTHCHARCODE FILE TEM)))              (* ; 
                                    "all device returned have DEVICE.END on it so that NIL: will work")
               (UNPACKFILE1 'DEVICE POS (if CLFLG
                                            then (SUB1 TEM)
@@ -1157,14 +1156,14 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo
 (PUTPROPS ADIR COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
 1991 1992 1920 2017 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2686 13811 (DELFILE 2696 . 2857) (FULLNAME 2859 . 3226) (INFILE 3228 . 3376) (INFILEP 
-3378 . 3513) (IOFILE 3515 . 3655) (OPENFILE 3657 . 4057) (OPENSTREAM 4059 . 8399) (OUTFILE 8401 . 8552
-) (OUTFILEP 8554 . 8690) (RENAMEFILE 8692 . 8998) (SIMPLE.FINDFILE 9000 . 9410) (VMEMSIZE 9412 . 9579)
- (\COPYSYS 9581 . 12530) (\FLUSHVM 12532 . 13604) (\LOGOUT0 13606 . 13809)) (14183 34403 (
-UNPACKFILENAME 14193 . 14379) (UNPACKFILENAME.STRING 14381 . 31282) (LASTCHPOS 31284 . 31978) (
-\UPF.NEXTPOS 31980 . 32625) (\UPF.TEMPFILEP 32627 . 33204) (FILENAMEFIELD 33206 . 33691) (PACKFILENAME
- 33693 . 34036) (PACKFILENAME.STRING 34038 . 34401)) (56043 63223 (LOGOUT 56053 . 56970) (MAKESYS 
-56972 . 58601) (SYSOUT 58603 . 60155) (SAVEVM 60157 . 60957) (HERALD 60959 . 61119) (INTERPRET.REM.CM 
-61121 . 62846) (\USEREVENT 62848 . 63221)) (63405 65132 (USERNAME 63415 . 64371) (SETUSERNAME 64373 . 
-65130)))))
+  (FILEMAP (NIL (2687 13812 (DELFILE 2697 . 2858) (FULLNAME 2860 . 3227) (INFILE 3229 . 3377) (INFILEP 
+3379 . 3514) (IOFILE 3516 . 3656) (OPENFILE 3658 . 4058) (OPENSTREAM 4060 . 8400) (OUTFILE 8402 . 8553
+) (OUTFILEP 8555 . 8691) (RENAMEFILE 8693 . 8999) (SIMPLE.FINDFILE 9001 . 9411) (VMEMSIZE 9413 . 9580)
+ (\COPYSYS 9582 . 12531) (\FLUSHVM 12533 . 13605) (\LOGOUT0 13607 . 13810)) (14184 34416 (
+UNPACKFILENAME 14194 . 14380) (UNPACKFILENAME.STRING 14382 . 31295) (LASTCHPOS 31297 . 31991) (
+\UPF.NEXTPOS 31993 . 32638) (\UPF.TEMPFILEP 32640 . 33217) (FILENAMEFIELD 33219 . 33704) (PACKFILENAME
+ 33706 . 34049) (PACKFILENAME.STRING 34051 . 34414)) (56056 63236 (LOGOUT 56066 . 56983) (MAKESYS 
+56985 . 58614) (SYSOUT 58616 . 60168) (SAVEVM 60170 . 60970) (HERALD 60972 . 61132) (INTERPRET.REM.CM 
+61134 . 62859) (\USEREVENT 62861 . 63234)) (63418 65145 (USERNAME 63428 . 64384) (SETUSERNAME 64386 . 
+65143)))))
 STOP
diff --git a/sources/ADIR.LCOM b/sources/ADIR.LCOM
index 370a9cb6..da993a54 100644
Binary files a/sources/ADIR.LCOM and b/sources/ADIR.LCOM differ
