diff --git a/lispusers/MANAGER b/lispusers/MANAGER
index 3f735c76..304f957c 100644
--- a/lispusers/MANAGER
+++ b/lispusers/MANAGER
@@ -1,12 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "21-May-2024 18:45:54" {LU}MANAGER.;4 102968 
+(FILECREATED " 5-Jan-2026 12:41:54" {DSK}<home>matt>Interlisp>medley>lispusers>MANAGER.;5 106149 
 
       :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS Manager.DO.COMMAND)
+      :CHANGES-TO (ADVICE ADDTOFILES? ADDTOCOMS LOAD LOADFNS MAKEFILE MARKASCHANGED UNMARKASCHANGED 
+                         DELFROMCOMS UPDATEFILES \ADDTOFILEBLOCK/ADDNEWCOM ADDFILE)
 
-      :PREVIOUS-DATE "20-May-2024 11:16:10" {LU}MANAGER.;3)
+      :PREVIOUS-DATE " 5-Jan-2026 12:35:04" {DSK}<home>matt>Interlisp>medley>lispusers>MANAGER.;4)
 
 
 (PRETTYCOMPRINT MANAGERCOMS)
@@ -1545,66 +1546,105 @@ Will load DataBaseFNS if necessary" (SUBITEMS ("All" 'DB
                                                                        (RPLACA LST (CDAR LST)))])
 )
 
-[XCL:REINSTALL-ADVICE 'ADDFILE :AROUND '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                                            *)
-                                                    (AND Manager.ACTIVEFLG (Manager.CHECKFILE FILE)))
-                                                ]
+[XCL:REINSTALL-ADVICE 'ADDFILE :AROUND '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                                                       (Manager.ACTIVEFLG NIL))
+                                                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                                                      (PROG1 *
+                                                          (AND (SETQ Manager.ACTIVEFLG 
+                                                                Orig.Manager.ACTIVELFG)
+                                                               (Manager.CHECKFILE FILE)))]
 
-[XCL:REINSTALL-ADVICE 'ADDTOFILES? :AROUND '((:LAST (PROG1 (LET ((MANAGER-ADDTOFILES? T))
-                                                                *)
-                                                        (AND Manager.ACTIVEFLG (Manager.ADDTOFILES?)))
-                                                    ]
+[XCL:REINSTALL-ADVICE 'ADDTOFILES? :AROUND '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                                                           (Manager.ACTIVEFLG NIL))
+                                                          (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                                                          (PROG1 *
+                                                              (AND (SETQ Manager.ACTIVEFLG 
+                                                                    Orig.Manager.ACTIVELFG)
+                                                                   (Manager.ADDTOFILES?)))]
 
-[XCL:REINSTALL-ADVICE 'MAKEFILE :AROUND '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                                             *)
-                                                     (AND Manager.ACTIVEFLG (Manager.MAKEFILE.ADV
-                                                                             FILE OPTIONS)))]
+[XCL:REINSTALL-ADVICE 'MAKEFILE :AROUND '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                                                        (Manager.ACTIVEFLG NIL))
+                                                       (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                                                       (PROG1 *
+                                                           (AND (SETQ Manager.ACTIVEFLG 
+                                                                 Orig.Manager.ACTIVELFG)
+                                                                (Manager.MAKEFILE.ADV FILE OPTIONS)))
+                                                       ]
 
-[XCL:REINSTALL-ADVICE 'MARKASCHANGED :AROUND '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                                                  *)
-                                                          (AND Manager.ACTIVEFLG
-                                                               (Manager.ALTERMARKING NAME TYPE
-                                                                      (OR REASON T))))]
+[XCL:REINSTALL-ADVICE 'MARKASCHANGED :AROUND
+       '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                       (Manager.ACTIVEFLG NIL))
+                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                      (PROG1 *
+                          (AND (SETQ Manager.ACTIVEFLG Orig.Manager.ACTIVELFG)
+                               (Manager.ALTERMARKING NAME TYPE (OR REASON T))))]
 
 [XCL:REINSTALL-ADVICE 'UNMARKASCHANGED :AROUND
-       '((:LAST (LET (!VALUE)
-                     (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                 (SETQ !VALUE *))
-                         (AND Manager.ACTIVEFLG !VALUE (Manager.ALTERMARKING NAME TYPE NIL)))]
+       '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                       (Manager.ACTIVEFLG NIL)
+                       !VALUE)
+                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                      (PROG1 (SETQ !VALUE *)
+                          (AND (SETQ Manager.ACTIVEFLG Orig.Manager.ACTIVELFG)
+                               !VALUE
+                               (Manager.ALTERMARKING NAME TYPE NIL)))]
 
-[XCL:REINSTALL-ADVICE 'UPDATEFILES :AROUND '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                                                *)
-                                                        (AND Manager.ACTIVEFLG (Manager.MAINUPDATE
-                                                                                T)))]
+[XCL:REINSTALL-ADVICE 'UPDATEFILES :AROUND '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                                                           (Manager.ACTIVEFLG NIL))
+                                                          (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                                                          (PROG1 *
+                                                              (AND (SETQ Manager.ACTIVEFLG 
+                                                                    Orig.Manager.ACTIVELFG)
+                                                                   (Manager.MAINUPDATE T)))]
 
 [XCL:REINSTALL-ADVICE 'ADDTOCOMS :AROUND
-       '((:LAST (LET (!VALUE)
-                     (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                 (SETQ !VALUE *))
-                         (AND Manager.ACTIVEFLG (Manager.ADDADV !VALUE COMS NAME TYPE)))]
+       '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                       (Manager.ACTIVEFLG NIL)
+                       !VALUE)
+                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                      (PROG1 (SETQ !VALUE *)
+                          (AND (SETQ Manager.ACTIVEFLG Orig.Manager.ACTIVELFG)
+                               (Manager.ADDADV !VALUE COMS NAME TYPE)))]
 
 [XCL:REINSTALL-ADVICE 'DELFROMCOMS :AROUND
-       '((:LAST (LET (!VALUE)
-                     (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                 (SETQ !VALUE *))
-                         (AND Manager.ACTIVEFLG (Manager.ADDADV !VALUE COMS NAME TYPE)))]
+       '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                       (Manager.ACTIVEFLG NIL)
+                       !VALUE)
+                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                      (PROG1 (SETQ !VALUE *)
+                          (AND (SETQ Manager.ACTIVEFLG Orig.Manager.ACTIVELFG)
+                               (Manager.ADDADV !VALUE COMS NAME TYPE)))]
 
 [XCL:REINSTALL-ADVICE '\ADDTOFILEBLOCK/ADDNEWCOM :AROUND
-       '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                            *)
-                    (AND Manager.ACTIVEFLG (Manager.RESETSUBITEMS FILE TYPE)))]
+       '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                       (Manager.ACTIVEFLG NIL))
+                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                      (PROG1 *
+                          (AND (SETQ Manager.ACTIVEFLG Orig.Manager.ACTIVELFG)
+                               (Manager.RESETSUBITEMS FILE TYPE)))]
 
-[XCL:REINSTALL-ADVICE 'LOAD :AROUND '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                                         *)
-                                                 (if Manager.ACTIVEFLG
-                                                     then (Manager.REMOVE.DUPLICATE.ADVICE FILE)
-                                                          (Manager.CHECKFILE FILE)))]
+[XCL:REINSTALL-ADVICE 'LOAD :AROUND '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                                                    (Manager.ACTIVEFLG NIL))
+                                                   (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                                                   (PROG1 *
+                                                       (AND (SETQ Manager.ACTIVEFLG 
+                                                             Orig.Manager.ACTIVELFG)
+                                                            (if Manager.ACTIVEFLG
+                                                                then (Manager.REMOVE.DUPLICATE.ADVICE
+                                                                      FILE)
+                                                                     (Manager.CHECKFILE FILE))))]
 
-[XCL:REINSTALL-ADVICE 'LOADFNS :AROUND '((:LAST (PROG1 (LET ((Manager.ACTIVEFLG NIL))
-                                                            *)
-                                                    (if Manager.ACTIVEFLG
-                                                        then (Manager.REMOVE.DUPLICATE.ADVICE FILE)
-                                                             (Manager.CHECKFILE FILE)))]
+[XCL:REINSTALL-ADVICE 'LOADFNS :AROUND '((:LAST (LET* ((Orig.Manager.ACTIVELFG Manager.ACTIVEFLG)
+                                                       (Manager.ACTIVEFLG NIL))
+                                                      (DECLARE (SPECVARS Manager.ACTIVEFLG))
+                                                      (PROG1 *
+                                                          (AND (SETQ Manager.ACTIVEFLG 
+                                                                Orig.Manager.ACTIVELFG)
+                                                               (if Manager.ACTIVEFLG
+                                                                   then (
+                                                                      Manager.REMOVE.DUPLICATE.ADVICE
+                                                                         FILE)
+                                                                        (Manager.CHECKFILE FILE))))]
 
 [XCL:REINSTALL-ADVICE '(MARKASCHANGED :IN DEFAULT.EDITDEFA0001)
        :AROUND
@@ -1710,20 +1750,20 @@ Will load DataBaseFNS if necessary" (SUBITEMS ("All" 'DB
 )
 (PUTPROPS MANAGER COPYRIGHT (NONE))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (25632 93132 (MANAGER 25642 . 26441) (MANAGER.RESET 26443 . 27957) (Manager.ADDADV 27959
- . 29312) (Manager.ADDTOFILES? 29314 . 29592) (Manager.ALTERMARKING 29594 . 31204) (
-Manager.ANCHORED-SET-POSITION 31206 . 32309) (Manager.DO.COMMAND 32311 . 33918) (
-Manager.DO.COMMAND.PROCFN 33920 . 53275) (Manager.HIGHLIGHT 53277 . 53574) (Manager.PROMPT 53576 . 
-53889) (Manager.WINDOW 53891 . 54524) (Manager.insurefilehighlights 54526 . 55597) (Manager.CHANGED? 
-55599 . 56148) (Manager.CHECKFILE 56150 . 57249) (Manager.COLLECTCOMS 57251 . 58689) (Manager.COMS.WSF
- 58691 . 61361) (Manager.COMSOPEN 61363 . 66101) (Manager.COMSUPDATE 66103 . 67195) (
-Manager.HIGHLIGHTED 67197 . 67503) (Manager.INSUREHIGHLIGHTS 67505 . 68063) (Manager.FILECHANGES 68065
- . 68364) (Manager.FILELSTCHANGED? 68366 . 68694) (Manager.FILESUBTYPES 68696 . 69334) (
-Manager.GET.ENVIRONMENT 69336 . 71874) (Manager.GETFILE 71876 . 74190) (Manager.INTITLE? 74192 . 74870
-) (Manager.MAIN.WSF 74872 . 77516) (Manager.MAINCLOSE 77518 . 78628) (Manager.MAINMENUITEMS 78630 . 
-79707) (Manager.MAINOPEN 79709 . 85102) (Manager.MAINUPDATE 85104 . 85740) (Manager.MAKEFILE.ADV 85742
- . 86778) (Manager.MENUCOLUMNS 86780 . 87584) (Manager.MENUHASITEM 87586 . 87943) (Manager.MENUITEMS 
-87945 . 88190) (Manager.REMOVE.DUPLICATE.ADVICE 88192 . 89798) (Manager.RESETSUBITEMS 89800 . 91037) (
-Manager.SET-ANCHOR 91039 . 91358) (Manager.SORT.COMS 91360 . 91892) (Manager.SORTBYCOLUMN 91894 . 
-93130)))))
+  (FILEMAP (NIL (25852 93352 (MANAGER 25862 . 26661) (MANAGER.RESET 26663 . 28177) (Manager.ADDADV 28179
+ . 29532) (Manager.ADDTOFILES? 29534 . 29812) (Manager.ALTERMARKING 29814 . 31424) (
+Manager.ANCHORED-SET-POSITION 31426 . 32529) (Manager.DO.COMMAND 32531 . 34138) (
+Manager.DO.COMMAND.PROCFN 34140 . 53495) (Manager.HIGHLIGHT 53497 . 53794) (Manager.PROMPT 53796 . 
+54109) (Manager.WINDOW 54111 . 54744) (Manager.insurefilehighlights 54746 . 55817) (Manager.CHANGED? 
+55819 . 56368) (Manager.CHECKFILE 56370 . 57469) (Manager.COLLECTCOMS 57471 . 58909) (Manager.COMS.WSF
+ 58911 . 61581) (Manager.COMSOPEN 61583 . 66321) (Manager.COMSUPDATE 66323 . 67415) (
+Manager.HIGHLIGHTED 67417 . 67723) (Manager.INSUREHIGHLIGHTS 67725 . 68283) (Manager.FILECHANGES 68285
+ . 68584) (Manager.FILELSTCHANGED? 68586 . 68914) (Manager.FILESUBTYPES 68916 . 69554) (
+Manager.GET.ENVIRONMENT 69556 . 72094) (Manager.GETFILE 72096 . 74410) (Manager.INTITLE? 74412 . 75090
+) (Manager.MAIN.WSF 75092 . 77736) (Manager.MAINCLOSE 77738 . 78848) (Manager.MAINMENUITEMS 78850 . 
+79927) (Manager.MAINOPEN 79929 . 85322) (Manager.MAINUPDATE 85324 . 85960) (Manager.MAKEFILE.ADV 85962
+ . 86998) (Manager.MENUCOLUMNS 87000 . 87804) (Manager.MENUHASITEM 87806 . 88163) (Manager.MENUITEMS 
+88165 . 88410) (Manager.REMOVE.DUPLICATE.ADVICE 88412 . 90018) (Manager.RESETSUBITEMS 90020 . 91257) (
+Manager.SET-ANCHOR 91259 . 91578) (Manager.SORT.COMS 91580 . 92112) (Manager.SORTBYCOLUMN 92114 . 
+93350)))))
 STOP
diff --git a/lispusers/MANAGER.DFASL b/lispusers/MANAGER.DFASL
index 4e8028f1..ea108eab 100644
Binary files a/lispusers/MANAGER.DFASL and b/lispusers/MANAGER.DFASL differ
