diff --git a/lispusers/HANOI b/lispusers/HANOI
index cc1ccf2b..99143961 100644
--- a/lispusers/HANOI
+++ b/lispusers/HANOI
@@ -1,70 +1,74 @@
-(FILECREATED "25-Feb-86 19:07:01" {ERIS}<LISPUSERS>KOTO>HANOI.;7 19947  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to:  (VARS HANOICOMS)
+(FILECREATED "21-Aug-2022 18:08:56" {DSK}<home>larry>medley>lispusers>HANOI.;2 22228  
 
-      previous date: "17-Feb-86 14:59:01" {ERIS}<LISPUSERS>KOTO>HANOI.;5)
+      :CHANGES-TO (VARS HANOICOMS)
+
+      :PREVIOUS-DATE "25-Feb-86 19:07:01" {DSK}<home>larry>medley>lispusers>HANOI.;1)
 
 
-(* Copyright (c) 1982, 1983, 1984, 1985, 1986 by Xerox Corporation. All rights reserved.)
+(* ; "
+Copyright (c) 1982-1986 by Xerox Corporation.
+")
 
 (PRETTYCOMPRINT HANOICOMS)
 
-(RPAQQ HANOICOMS ((FNS DISPLAYPEGSANDRINGS DOHANOI FINDOTHER HANOI HANOIDEMO MOVEDIS MOVERING 
-			 RINGSHADE SETUPRINGBITMAPS TRACK WHANOI XHANOI)
-		    (VARS (HANOIWINDOW))
-		    (DECLARE: DONTCOPY (RECORDS PEG RING)
-			      (CONSTANTS XRINGSHADE ORINGSHADE XPEGSHADE)
-			      (CONSTANTS PEGMIN HANOIMARGIN (MAXVERTSPEED 30)
-					 (MAXHORIZSPEED 44))
-			      (MACROS PEGN))
-		    (VARS EVENRINGSHADE ODDRINGSHADE PEGSHADE)
-		    (ALISTS (IDLE.FUNCTIONS Hanoi HanoiUsername))))
+(RPAQQ HANOICOMS
+       ((FNS DISPLAYPEGSANDRINGS DOHANOI FINDOTHER HANOI HANOIDEMO MOVEDIS MOVERING RINGSHADE 
+             SETUPRINGBITMAPS TRACK WHANOI XHANOI)
+        (VARS (HANOIWINDOW))
+        (DECLARE%: DONTCOPY (RECORDS PEG RING)
+               (CONSTANTS XRINGSHADE ORINGSHADE XPEGSHADE)
+               (CONSTANTS PEGMIN HANOIMARGIN (MAXVERTSPEED 30)
+                      (MAXHORIZSPEED 44))
+               (MACROS PEGN))
+        (VARS EVENRINGSHADE ODDRINGSHADE PEGSHADE)
+        (ALISTS (IDLE.FUNCTIONS Hanoi HanoiUsername))))
 (DEFINEQ
 
 (DISPLAYPEGSANDRINGS
-  [LAMBDA (PEGS W)                                           (* edited: " 1-Oct-84 12:41")
-                                                             (* displays the pegs and the rings on them.)
-    (for PEG in PEGS
-       do (\CLEARBM W PEGSHADE (fetch PEGREGION of PEG))
-	  (for RING in (fetch RINGS of PEG)
-	     do (\CLEARBM W (RINGSHADE (fetch RINGNUMBER of RING))
-			  (fetch RINGREGION of RING))
-		(COND
-		  ((fetch RINGLABEL of RING)
-		    (CENTERPRINTINREGION (fetch RINGLABEL of RING)
-					 (fetch RINGREGION of RING)
-					 W])
+  [LAMBDA (PEGS W)                                           (* edited%: " 1-Oct-84 12:41")
+                                                             (* displays the pegs and the rings on 
+                                                             them.)
+    (for PEG in PEGS do (\CLEARBM W PEGSHADE (fetch PEGREGION of PEG))
+                        (for RING in (fetch RINGS of PEG)
+                           do (\CLEARBM W (RINGSHADE (fetch RINGNUMBER of RING))
+                                     (fetch RINGREGION of RING))
+                              (COND
+                                 ((fetch RINGLABEL of RING)
+                                  (CENTERPRINTINREGION (fetch RINGLABEL of RING)
+                                         (fetch RINGREGION of RING)
+                                         W])
 
 (DOHANOI
-  [LAMBDA (N SRC DST W)                                      (* lmm " 8-MAR-82 12:05")
-    (COND
-      ((EQ N 1)
-	(MOVERING SRC DST W))
-      (T (DOHANOI (SUB1 N)
-		  SRC
-		  (FINDOTHER SRC DST)
-		  W)
-	 (MOVERING SRC DST W)
-	 (DOHANOI (SUB1 N)
-		  (FINDOTHER SRC DST)
-		  DST W])
+  [LAMBDA (N SRC DST W)                                      (* lmm " 8-MAR-82 12:05")
+    (COND
+       ((EQ N 1)
+        (MOVERING SRC DST W))
+       (T (DOHANOI (SUB1 N)
+                 SRC
+                 (FINDOTHER SRC DST)
+                 W)
+          (MOVERING SRC DST W)
+          (DOHANOI (SUB1 N)
+                 (FINDOTHER SRC DST)
+                 DST W])
 
 (FINDOTHER
-  [LAMBDA (S D)                                              (* bas: "10-DEC-80 14:01")
-    (for Z from 1 to 3 thereis (NOT (OR (EQ Z S)
-					(EQ Z D])
+  [LAMBDA (S D)                                              (* bas%: "10-DEC-80 14:01")
+    (for Z from 1 to 3 thereis (NOT (OR (EQ Z S)
+                                        (EQ Z D])
 
 (HANOI
-  [LAMBDA (NRINGS WINDOW FONT ONCE)                          (* lmm " 9-MAR-82 09:52")
+  [LAMBDA (NRINGS WINDOW FONT ONCE)                          (* lmm " 9-MAR-82 09:52")
     (WHANOI NRINGS WINDOW FONT ONCE])
 
 (HANOIDEMO
-  [LAMBDA NIL                                                          (* lmm 
-                                                                           "17-Feb-86 14:58")
+  [LAMBDA NIL                                                (* lmm "17-Feb-86 14:58")
     (PROG (HANOI.MOUSE.SPEED)
           (WHANOI 7
                  [COND
-                    ((TYPENAMEP HANOIWINDOW (QUOTE WINDOW))
+                    ((TYPENAMEP HANOIWINDOW 'WINDOW)
                      HANOIWINDOW)
                     (T (SETQ HANOIWINDOW
                         (CREATEW (create REGION
@@ -75,18 +79,16 @@
                  NIL T])
 
 (MOVEDIS
-  [LAMBDA (RING DY SX DX W)                                            (* lmm 
-                                                                           "17-Feb-86 14:58")
-            
-            (* moves RING from its position on the source peg whose left is SX to 
-            the peg whose left is DX at a height of DY)
+  [LAMBDA (RING DY SX DX W)                                  (* lmm "17-Feb-86 14:58")
+
+         (* moves RING from its position on the source peg whose left is SX to the peg 
+         whose left is DX at a height of DY)
 
     (PROG ((RINGREGION (fetch RINGREGION of RING))
            RINGWIDTH HORIZWIDTH MOVERIGHTFLG)
           [COND
-             (HANOI.MOUSE.SPEED (GETMOUSESTATE)                            (* IPLUS 16 is 
-                                                                           because cursor can go 
-                                                                           negative.)
+             (HANOI.MOUSE.SPEED (GETMOUSESTATE)              (* IPLUS 16 is because cursor can go 
+                                                             negative.)
                     (SETQ VERTSPEED (IMIN (IMAX (IDIFFERENCE 17 (IQUOTIENT LASTMOUSEY 50))
                                                 1)
                                           MAXVERTSPEED))
@@ -95,333 +97,298 @@
                                            MAXHORIZSPEED]
           (SETUPRINGBITMAPS RING (SETQ RINGWIDTH (fetch WIDTH of RINGREGION))
                  (SETQ MOVERIGHTFLG (IGREATERP DX SX))
-                 W)                                                        (* PROG is because 
-                                                                           FOR loop bug.)
+                 W)                                          (* PROG is because FOR loop bug.)
           (PROG ((I (fetch BOTTOM of RINGREGION))
                  (TOPLIMIT (IDIFFERENCE PEGTOP VERTSPEED)))
             LP  (COND
                    ((IGREATERP TOPLIMIT I)
                     (BITBLT UPRINGBM 0 0 W SX I RINGWIDTH (IPLUS RINGHEIGHT VERTSPEED)
-                           (QUOTE INPUT)
-                           (QUOTE REPLACE))
+                           'INPUT
+                           'REPLACE)
                     (SETQ I (IPLUS VERTSPEED I))
                     (GO LP)))
                 (BITBLT UPRINGBM 0 (IDIFFERENCE I TOPLIMIT)
                        W SX I RINGWIDTH (IPLUS RINGHEIGHT VERTSPEED)
-                       (QUOTE INPUT)
-                       (QUOTE REPLACE)))
+                       'INPUT
+                       'REPLACE))
           (BITBLT TOPUPRINGBM 0 0 W SX PEGTOP RINGWIDTH (IPLUS RINGHEIGHT VERTSPEED)
-                 (QUOTE INPUT)
-                 (QUOTE REPLACE))
+                 'INPUT
+                 'REPLACE)
           (SETQ HORIZWIDTH (IPLUS RINGWIDTH HORIZSPEED))
           (for I from (COND
-                                 (MOVERIGHTFLG SX)
-                                 (T (IDIFFERENCE SX HORIZSPEED)))
+                         (MOVERIGHTFLG SX)
+                         (T (IDIFFERENCE SX HORIZSPEED)))
              to (COND
-                       (MOVERIGHTFLG (SUB1 (IDIFFERENCE DX HORIZSPEED)))
-                       (T (ADD1 DX))) by (ITIMES (COND
-                                                        ((IGREATERP DX SX)
-                                                         1)
-                                                        (T -1))
-                                                    HORIZSPEED)
-             do (BITBLT HORIZRINGBM 0 0 W I (IPLUS PEGTOP VERTSPEED)
-                           HORIZWIDTH RINGHEIGHT (QUOTE INPUT)
-                           (QUOTE REPLACE)))
+                   (MOVERIGHTFLG (SUB1 (IDIFFERENCE DX HORIZSPEED)))
+                   (T (ADD1 DX))) by (ITIMES (COND
+                                                ((IGREATERP DX SX)
+                                                 1)
+                                                (T -1))
+                                            HORIZSPEED) do (BITBLT HORIZRINGBM 0 0 W I
+                                                                  (IPLUS PEGTOP VERTSPEED)
+                                                                  HORIZWIDTH RINGHEIGHT 'INPUT
+                                                                  'REPLACE))
           (BITBLT HORIZRINGBM 0 0 W (COND
                                        (MOVERIGHTFLG (IDIFFERENCE DX HORIZSPEED))
                                        (T DX))
                  (IPLUS PEGTOP VERTSPEED)
-                 HORIZWIDTH NIL (QUOTE INPUT)
-                 (QUOTE REPLACE))                                          (* Update the ring 
-                                                                           region's left)
+                 HORIZWIDTH NIL 'INPUT 'REPLACE)             (* Update the ring region's left)
           (replace LEFT of RINGREGION with (IPLUS (fetch LEFT of RINGREGION)
-                                                              (IDIFFERENCE DX SX)))
-          (for I from PEGTOP to (SUB1 (IDIFFERENCE PEGTOP RINGHEIGHT))
-             by (IMINUS VERTSPEED) do (BITBLT TOPDOWNRINGBM NIL NIL W DX I RINGWIDTH
-                                                     (IPLUS RINGHEIGHT VERTSPEED)
-                                                     (QUOTE INPUT)
-                                                     (QUOTE REPLACE)))
+                                                  (IDIFFERENCE DX SX)))
+          (for I from PEGTOP to (SUB1 (IDIFFERENCE PEGTOP RINGHEIGHT)) by (IMINUS VERTSPEED)
+             do (BITBLT TOPDOWNRINGBM NIL NIL W DX I RINGWIDTH (IPLUS RINGHEIGHT VERTSPEED)
+                       'INPUT
+                       'REPLACE))
           (BITBLT TOPDOWNRINGBM NIL NIL W DX (IDIFFERENCE PEGTOP RINGHEIGHT)
                  RINGWIDTH
                  (IPLUS RINGHEIGHT VERTSPEED)
-                 (QUOTE INPUT)
-                 (QUOTE REPLACE))
+                 'INPUT
+                 'REPLACE)
           (PROG [(I (IDIFFERENCE PEGTOP (IPLUS VERTSPEED RINGHEIGHT]
             LP  (COND
-                   ((IGREATERP DY I)                                       (* blt last ring 
-                                                                           image)
+                   ((IGREATERP DY I)                         (* blt last ring image)
                     (BITBLT DOWNRINGBM 0 0 W DX DY RINGWIDTH (COND
                                                                 ((IGREATERP VERTSPEED RINGHEIGHT)
                                                                  (IDIFFERENCE (IPLUS RINGHEIGHT 
                                                                                      VERTSPEED)
                                                                         (IDIFFERENCE DY I)))
                                                                 (T (IPLUS RINGHEIGHT VERTSPEED)))
-                           (QUOTE INPUT)
-                           (QUOTE REPLACE))
+                           'INPUT
+                           'REPLACE)
                     (RETURN)))
                 (BITBLT DOWNRINGBM 0 0 W DX I RINGWIDTH (IPLUS RINGHEIGHT VERTSPEED)
-                       (QUOTE INPUT)
-                       (QUOTE REPLACE))
+                       'INPUT
+                       'REPLACE)
                 (SETQ I (IDIFFERENCE I VERTSPEED))
                 (GO LP))
           (replace BOTTOM of RINGREGION with DY)
           (RETURN RING])
 
 (MOVERING
-  [LAMBDA (SRC DST W)                                        (* rrb " 2-AUG-82 17:41")
-    (PROG ([X (fetch RINGREGION of (CAR (fetch RINGS of (PEGN DST]
-	   RING)
+  [LAMBDA (SRC DST W)                                        (* rrb " 2-AUG-82 17:41")
+    (PROG ([X (fetch RINGREGION of (CAR (fetch RINGS of (PEGN DST]
+           RING)
           (push (fetch RINGS of (PEGN DST))
-		(MOVEDIS [SETQ RING (pop (fetch RINGS of (PEGN SRC]
-			 (IPLUS (fetch BOTTOM of X)
-				(fetch HEIGHT of X))
-			 (TRACK SRC (fetch RINGREGION of RING))
-			 (TRACK DST (fetch RINGREGION of RING))
-			 W))
-          (BLOCK])
+                (MOVEDIS [SETQ RING (pop (fetch RINGS of (PEGN SRC]
+                       (IPLUS (fetch BOTTOM of X)
+                              (fetch HEIGHT of X))
+                       (TRACK SRC (fetch RINGREGION of RING))
+                       (TRACK DST (fetch RINGREGION of RING))
+                       W))
+          (BLOCK])
 
 (RINGSHADE
-  [LAMBDA (RINGN)                                            (* rrb " 9-JUN-81 15:11")
-    (COND
-      ((EQ RINGN (QUOTE BASE))
-	PEGSHADE)
-      ((ZEROP (LOGAND RINGN 1))
-	EVENRINGSHADE)
-      (T ODDRINGSHADE])
+  [LAMBDA (RINGN)                                            (* rrb " 9-JUN-81 15:11")
+    (COND
+       ((EQ RINGN 'BASE)
+        PEGSHADE)
+       ((ZEROP (LOGAND RINGN 1))
+        EVENRINGSHADE)
+       (T ODDRINGSHADE])
 
 (SETUPRINGBITMAPS
-  [LAMBDA (RING RINGWIDTH MOVERIGHTFLG W)                    (* edited: " 1-Oct-84 12:43")
+  [LAMBDA (RING RINGWIDTH MOVERIGHTFLG W)                    (* edited%: " 1-Oct-84 12:43")
 
-          (* sets up the ring bitmaps. There are 5 ring bitmaps: up while on peg, up above peg, horizontal, down above peg and
-	  down while on peg.)
+         (* sets up the ring bitmaps. There are 5 ring bitmaps%: up while on peg, up above 
+         peg, horizontal, down above peg and down while on peg.)
 
-
-    (PROG ((PEGOFFSET (IQUOTIENT (IDIFFERENCE RINGWIDTH PEGWIDTH)
-				 2))
-	   (RINGREGION (fetch RINGREGION of RING))
-	   (RINGN (fetch RINGNUMBER of RING)))
-          (AND FONT (DSPFONT FONT RDEST))
-          (DSPOPERATION (QUOTE ERASE)
-			RDEST)
-          [PROGN (\CLEARBM UPRINGBM)
-		 (BITBLT NIL NIL NIL UPRINGBM 0 VERTSPEED RINGWIDTH RINGHEIGHT (QUOTE TEXTURE)
-			 (QUOTE REPLACE)
-			 (RINGSHADE RINGN))                  (* put in peg)
-		 (BITBLT NIL NIL NIL UPRINGBM PEGOFFSET 0 PEGWIDTH VERTSPEED (QUOTE TEXTURE)
-			 (QUOTE REPLACE)
-			 PEGSHADE)
-		 (COND
-		   ((fetch RINGLABEL of RING)                (* print in label if there is one.)
-		     (DSPDESTINATION UPRINGBM RDEST)
-		     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
-					0 VERTSPEED RINGWIDTH RINGHEIGHT RDEST]
-          [PROGN (\CLEARBM TOPUPRINGBM)
-		 (BITBLT NIL NIL NIL TOPUPRINGBM 0 VERTSPEED RINGWIDTH RINGHEIGHT (QUOTE TEXTURE)
-			 (QUOTE REPLACE)
-			 (RINGSHADE RINGN))
-		 (COND
-		   ((fetch RINGLABEL of RING)                (* print in label if there is one.)
-		     (DSPDESTINATION TOPUPRINGBM RDEST)
-		     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
-					0 VERTSPEED RINGWIDTH RINGHEIGHT RDEST]
-          (PROGN (\CLEARBM DOWNRINGBM)
-		 (BITBLT NIL NIL NIL DOWNRINGBM 0 0 RINGWIDTH RINGHEIGHT (QUOTE TEXTURE)
-			 (QUOTE REPLACE)
-			 (RINGSHADE RINGN))
-		 (COND
-		   ((fetch RINGLABEL of RING)                (* print in label if there is one.)
-		     (DSPDESTINATION DOWNRINGBM RDEST)
-		     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
-					0 0 RINGWIDTH RINGHEIGHT RDEST)))
-                                                             (* put in peg)
-		 (BITBLT NIL NIL NIL DOWNRINGBM PEGOFFSET RINGHEIGHT PEGWIDTH VERTSPEED (QUOTE 
-											  TEXTURE)
-			 (QUOTE REPLACE)
-			 PEGSHADE))
-          [PROGN (\CLEARBM TOPDOWNRINGBM)
-		 (BITBLT NIL NIL NIL TOPDOWNRINGBM 0 0 RINGWIDTH RINGHEIGHT (QUOTE TEXTURE)
-			 (QUOTE REPLACE)
-			 (RINGSHADE RINGN))
-		 (COND
-		   ((fetch RINGLABEL of RING)                (* print in label if there is one.)
-		     (DSPDESTINATION TOPDOWNRINGBM RDEST)
-		     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
-					0 0 RINGWIDTH RINGHEIGHT RDEST]
-          [PROGN (\CLEARBM HORIZRINGBM)
-		 (BITBLT NIL NIL NIL HORIZRINGBM (COND
-			   (MOVERIGHTFLG HORIZSPEED)
-			   (T 0))
-			 0 RINGWIDTH RINGHEIGHT (QUOTE TEXTURE)
-			 (QUOTE REPLACE)
-			 (RINGSHADE RINGN))
-		 (COND
-		   ((fetch RINGLABEL of RING)                (* print in label if there is one.)
-		     (DSPDESTINATION HORIZRINGBM RDEST)
-		     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
-					(COND
-					  (MOVERIGHTFLG HORIZSPEED)
-					  (T 0))
-					0 RINGWIDTH RINGHEIGHT RDEST]
-          (RETURN])
+    (PROG ((PEGOFFSET (IQUOTIENT (IDIFFERENCE RINGWIDTH PEGWIDTH)
+                             2))
+           (RINGREGION (fetch RINGREGION of RING))
+           (RINGN (fetch RINGNUMBER of RING)))
+          (AND FONT (DSPFONT FONT RDEST))
+          (DSPOPERATION 'ERASE RDEST)
+          [PROGN (\CLEARBM UPRINGBM)
+                 (BITBLT NIL NIL NIL UPRINGBM 0 VERTSPEED RINGWIDTH RINGHEIGHT 'TEXTURE 'REPLACE
+                        (RINGSHADE RINGN))                   (* put in peg)
+                 (BITBLT NIL NIL NIL UPRINGBM PEGOFFSET 0 PEGWIDTH VERTSPEED 'TEXTURE 'REPLACE 
+                        PEGSHADE)
+                 (COND
+                    ((fetch RINGLABEL of RING)               (* print in label if there is one.)
+                     (DSPDESTINATION UPRINGBM RDEST)
+                     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
+                            0 VERTSPEED RINGWIDTH RINGHEIGHT RDEST]
+          [PROGN (\CLEARBM TOPUPRINGBM)
+                 (BITBLT NIL NIL NIL TOPUPRINGBM 0 VERTSPEED RINGWIDTH RINGHEIGHT 'TEXTURE
+                        'REPLACE
+                        (RINGSHADE RINGN))
+                 (COND
+                    ((fetch RINGLABEL of RING)               (* print in label if there is one.)
+                     (DSPDESTINATION TOPUPRINGBM RDEST)
+                     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
+                            0 VERTSPEED RINGWIDTH RINGHEIGHT RDEST]
+          (PROGN (\CLEARBM DOWNRINGBM)
+                 (BITBLT NIL NIL NIL DOWNRINGBM 0 0 RINGWIDTH RINGHEIGHT 'TEXTURE 'REPLACE
+                        (RINGSHADE RINGN))
+                 (COND
+                    ((fetch RINGLABEL of RING)               (* print in label if there is one.)
+                     (DSPDESTINATION DOWNRINGBM RDEST)
+                     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
+                            0 0 RINGWIDTH RINGHEIGHT RDEST)))(* put in peg)
+                 (BITBLT NIL NIL NIL DOWNRINGBM PEGOFFSET RINGHEIGHT PEGWIDTH VERTSPEED 'TEXTURE
+                        'REPLACE PEGSHADE))
+          [PROGN (\CLEARBM TOPDOWNRINGBM)
+                 (BITBLT NIL NIL NIL TOPDOWNRINGBM 0 0 RINGWIDTH RINGHEIGHT 'TEXTURE 'REPLACE
+                        (RINGSHADE RINGN))
+                 (COND
+                    ((fetch RINGLABEL of RING)               (* print in label if there is one.)
+                     (DSPDESTINATION TOPDOWNRINGBM RDEST)
+                     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
+                            0 0 RINGWIDTH RINGHEIGHT RDEST]
+          [PROGN (\CLEARBM HORIZRINGBM)
+                 (BITBLT NIL NIL NIL HORIZRINGBM (COND
+                                                    (MOVERIGHTFLG HORIZSPEED)
+                                                    (T 0))
+                        0 RINGWIDTH RINGHEIGHT 'TEXTURE 'REPLACE (RINGSHADE RINGN))
+                 (COND
+                    ((fetch RINGLABEL of RING)               (* print in label if there is one.)
+                     (DSPDESTINATION HORIZRINGBM RDEST)
+                     (CENTERPRINTINAREA (fetch RINGLABEL of RING)
+                            (COND
+                               (MOVERIGHTFLG HORIZSPEED)
+                               (T 0))
+                            0 RINGWIDTH RINGHEIGHT RDEST]
+          (RETURN])
 
 (TRACK
-  [LAMBDA (PN REGION)                                        (* lmm " 8-MAR-82 12:10")
-                                                             (* returns the track offset for ring movement on a 
-							     peg.)
-    (IPLUS HANOIMARGIN (IPLUS (ITIMES RINGLARGEST (SUB1 PN))
-			      (IQUOTIENT (IDIFFERENCE RINGLARGEST (fetch WIDTH of REGION))
-					 2])
+  [LAMBDA (PN REGION)                                        (* lmm " 8-MAR-82 12:10")
+                                                             (* returns the track offset for ring 
+                                                             movement on a peg.)
+    (IPLUS HANOIMARGIN (IPLUS (ITIMES RINGLARGEST (SUB1 PN))
+                              (IQUOTIENT (IDIFFERENCE RINGLARGEST (fetch WIDTH of REGION))
+                                     2])
 
 (WHANOI
-  [LAMBDA (RINGS W FONT ONCE)                                (* lmm " 3-Dec-85 12:51")
-                                                             (* runs hanoi in a region of a displaystream)
-    (PROG ([REGION (DSPCLIPPINGREGION NIL (SETQ W (COND
-					      [(NULL W)
-						(OR HANOIWINDOW (SETQ HANOIWINDOW (CREATEW]
-					      ((WINDOWP W))
-					      (T (CREATEW W]
-	     [NRINGS (COND
-		       ((NUMBERP RINGS)
-			 RINGS)
-		       (T (LENGTH RINGS]
-	     (HORIZSPEED 21)
-	     (VERTSPEED 17)
-	     PEGS RINGBM TOPUPRINGBM RINGLARGEST TOPDOWNRINGBM PEGWIDTH BASEWIDTH RINGHEIGHT 
-	     MOVEMENTHEIGHT BASEHEIGHT PEGTOP RINGDISPLAYSTREAM HANOIWINDOW RINGDELTA UPRINGBM 
-	     HORIZRINGBM DOWNRINGBM (RDEST (DSPCREATE)))
-	    (DECLARE (SPECVARS . T))
-	    (PROG (IMAGEHEIGHT)
-		    (SETQ BASEWIDTH (IDIFFERENCE (fetch WIDTH of REGION)
-						     (ITIMES HANOIMARGIN 2)))
-		    (SETQ RINGLARGEST (IQUOTIENT BASEWIDTH 3))
-                                                             (* RINGDELTA is the difference in peg size on each 
-							     side.)
-		    (COND
-		      ([ZEROP (SETQ RINGDELTA (IQUOTIENT (IDIFFERENCE RINGLARGEST PEGMIN)
-							       (ADD1 (ITIMES NRINGS 2]
-			(HELP "Not enough width for a display.")))
+  [LAMBDA (RINGS W FONT ONCE)                                (* lmm " 3-Dec-85 12:51")
+                                                             (* runs hanoi in a region of a 
+                                                             displaystream)
+    (PROG ([REGION (DSPCLIPPINGREGION NIL (SETQ W (COND
+                                                     [(NULL W)
+                                                      (OR HANOIWINDOW (SETQ HANOIWINDOW (CREATEW]
+                                                     ((WINDOWP W))
+                                                     (T (CREATEW W]
+           [NRINGS (COND
+                      ((NUMBERP RINGS)
+                       RINGS)
+                      (T (LENGTH RINGS]
+           (HORIZSPEED 21)
+           (VERTSPEED 17)
+           PEGS RINGBM TOPUPRINGBM RINGLARGEST TOPDOWNRINGBM PEGWIDTH BASEWIDTH RINGHEIGHT 
+           MOVEMENTHEIGHT BASEHEIGHT PEGTOP RINGDISPLAYSTREAM HANOIWINDOW RINGDELTA UPRINGBM 
+           HORIZRINGBM DOWNRINGBM (RDEST (DSPCREATE)))
+          (DECLARE (SPECVARS . T))
+          (PROG (IMAGEHEIGHT)
+                (SETQ BASEWIDTH (IDIFFERENCE (fetch WIDTH of REGION)
+                                       (ITIMES HANOIMARGIN 2)))
+                (SETQ RINGLARGEST (IQUOTIENT BASEWIDTH 3))   (* RINGDELTA is the difference in peg 
+                                                             size on each side.)
+                (COND
+                   ([ZEROP (SETQ RINGDELTA (IQUOTIENT (IDIFFERENCE RINGLARGEST PEGMIN)
+                                                  (ADD1 (ITIMES NRINGS 2]
+                    (HELP "Not enough width for a display.")))
 
-          (* leave one ring width for base, one for top of peg and two above peg for movement. Doesn't really use two heights
-	  at top, only one plus VERTSPEED)
+         (* leave one ring width for base, one for top of peg and two above peg for 
+         movement. Doesn't really use two heights at top, only one plus VERTSPEED)
 
-
-		    (SETQ RINGHEIGHT (IQUOTIENT (SETQ IMAGEHEIGHT (IDIFFERENCE (fetch
-											 HEIGHT
-											  of REGION)
-										       (ITIMES
-											 HANOIMARGIN 
-											 2)))
-						    (IPLUS NRINGS 4)))
-		    (COND
-		      ((ZEROP RINGHEIGHT)
-			(HELP "Not enough height for display.")))
-		    (SETQ PEGWIDTH (IQUOTIENT (IDIFFERENCE RINGLARGEST (ITIMES RINGDELTA
-										       (SUB1 NRINGS)
-										       2))
-						  3))        (* put extra in base if it comes out closer to 
-							     pegwidth.)
-		    (COND
-		      [(IGREATERP PEGWIDTH RINGHEIGHT)
-			(SETQ BASEHEIGHT (IMIN PEGWIDTH (IPLUS RINGHEIGHT
-								     (IDIFFERENCE
-								       IMAGEHEIGHT
-								       (ITIMES (IPLUS NRINGS 4)
-										 RINGHEIGHT]
-		      (T (SETQ BASEHEIGHT RINGHEIGHT)))
-		    (SETQ MOVEMENTHEIGHT (IPLUS [SETQ PEGTOP (IPLUS HANOIMARGIN BASEHEIGHT
-									    (ITIMES RINGHEIGHT
-										      (ADD1 NRINGS]
-						    VERTSPEED))
-		    (DSPFONT FONT RDEST)
-		    (DSPFONT FONT W)
-		    (DSPOPERATION (QUOTE ERASE)
-				    RDEST)
-		    (DSPOPERATION (QUOTE ERASE)
-				    W))
-	    [PROG ((BASE (create REGION
-				     LEFT _ HANOIMARGIN
-				     BOTTOM _ HANOIMARGIN
-				     WIDTH _ BASEWIDTH
-				     HEIGHT _ BASEHEIGHT)))
-		    (SETQ PEGS (for PLEFT from (IPLUS HANOIMARGIN (IQUOTIENT (IDIFFERENCE
-											 RINGLARGEST 
-											 PEGWIDTH)
-										       2))
-				    by RINGLARGEST as I from 1 to 3
-				    collect (create PEG
-							PEGREGION _(create REGION
-									     LEFT _ PLEFT
-									     BOTTOM _(IPLUS 
-										       BASEHEIGHT 
-										      HANOIMARGIN)
-									     WIDTH _ PEGWIDTH
-									     HEIGHT _(ITIMES
-									       RINGHEIGHT
-									       (ADD1 NRINGS)))
-							RINGS _(LIST (create RING
-										 RINGREGION _ BASE
-										 RINGNUMBER _(QUOTE
-										   BASE]
-	    [PROG [(SOURCEPEG (PEGN 1))
-		     (RINGLABELS (COND
-				   ((LISTP RINGS)
-				     (REVERSE RINGS))
-				   (T                        (* collect n NILs as lables.)
-				      (for I from 1 to RINGS collect NIL]
-		    (for RINGBOTTOM from (IPLUS HANOIMARGIN BASEHEIGHT) by RINGHEIGHT
-		       as RINGLEFT from (IPLUS HANOIMARGIN (ITIMES RINGLARGEST (SUB1 1)))
-		       by RINGDELTA as I from 0 to (SUB1 NRINGS) as LABEL in RINGLABELS
-		       do (push (fetch RINGS of SOURCEPEG)
-				    (create RING
-					      RINGREGION _(create REGION
-								    LEFT _ RINGLEFT
-								    BOTTOM _ RINGBOTTOM
-								    WIDTH _(IDIFFERENCE
-								      RINGLARGEST
-								      (ITIMES I 2 RINGDELTA))
-								    HEIGHT _ RINGHEIGHT)
-					      RINGNUMBER _(ADD1 (IDIFFERENCE NRINGS I))
-					      RINGLABEL _ LABEL)))
-                                                             (* allocate bitmaps for ring movement)
-		    (SETQ HORIZRINGBM (BITMAPCREATE (IPLUS RINGLARGEST MAXHORIZSPEED)
-							RINGHEIGHT))
-		    (SETQ UPRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED)))
-		    (SETQ DOWNRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED)))
-		    (SETQ TOPUPRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED))
-		      )
-		    (SETQ TOPDOWNRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT 
-									       MAXVERTSPEED]
-	    (\CLEARBM W)
-	    (DISPLAYPEGSANDRINGS PEGS W)
-	    (bind (HERE _ 1)
-		    (THERE _ 3)
-	       do (DOHANOI NRINGS HERE THERE W)
-		    (COND
-		      (ONCE (RETURN)))
-		    (DISMISS 2000)
-		    (SETQ HERE (PROG1 THERE (SETQ THERE (FINDOTHER HERE THERE])
+                (SETQ RINGHEIGHT (IQUOTIENT (SETQ IMAGEHEIGHT (IDIFFERENCE (fetch HEIGHT of REGION)
+                                                                     (ITIMES HANOIMARGIN 2)))
+                                        (IPLUS NRINGS 4)))
+                (COND
+                   ((ZEROP RINGHEIGHT)
+                    (HELP "Not enough height for display.")))
+                (SETQ PEGWIDTH (IQUOTIENT (IDIFFERENCE RINGLARGEST (ITIMES RINGDELTA (SUB1 NRINGS)
+                                                                          2))
+                                      3))                    (* put extra in base if it comes out 
+                                                             closer to pegwidth.)
+                (COND
+                   [(IGREATERP PEGWIDTH RINGHEIGHT)
+                    (SETQ BASEHEIGHT (IMIN PEGWIDTH (IPLUS RINGHEIGHT (IDIFFERENCE
+                                                                       IMAGEHEIGHT
+                                                                       (ITIMES (IPLUS NRINGS 4)
+                                                                              RINGHEIGHT]
+                   (T (SETQ BASEHEIGHT RINGHEIGHT)))
+                (SETQ MOVEMENTHEIGHT (IPLUS [SETQ PEGTOP (IPLUS HANOIMARGIN BASEHEIGHT
+                                                                (ITIMES RINGHEIGHT (ADD1 NRINGS]
+                                            VERTSPEED))
+                (DSPFONT FONT RDEST)
+                (DSPFONT FONT W)
+                (DSPOPERATION 'ERASE RDEST)
+                (DSPOPERATION 'ERASE W))
+          [PROG ((BASE (create REGION
+                              LEFT _ HANOIMARGIN
+                              BOTTOM _ HANOIMARGIN
+                              WIDTH _ BASEWIDTH
+                              HEIGHT _ BASEHEIGHT)))
+                (SETQ PEGS (for PLEFT from (IPLUS HANOIMARGIN (IQUOTIENT (IDIFFERENCE RINGLARGEST 
+                                                                                PEGWIDTH)
+                                                                     2)) by RINGLARGEST as I
+                              from 1 to 3
+                              collect (create PEG
+                                             PEGREGION _ (create REGION
+                                                                LEFT _ PLEFT
+                                                                BOTTOM _ (IPLUS BASEHEIGHT 
+                                                                                HANOIMARGIN)
+                                                                WIDTH _ PEGWIDTH
+                                                                HEIGHT _ (ITIMES RINGHEIGHT
+                                                                                (ADD1 NRINGS)))
+                                             RINGS _ (LIST (create RING
+                                                                  RINGREGION _ BASE
+                                                                  RINGNUMBER _ 'BASE]
+          [PROG [(SOURCEPEG (PEGN 1))
+                 (RINGLABELS (COND
+                                ((LISTP RINGS)
+                                 (REVERSE RINGS))
+                                (T                           (* collect n NILs as lables.)
+                                   (for I from 1 to RINGS collect NIL]
+                (for RINGBOTTOM from (IPLUS HANOIMARGIN BASEHEIGHT) by RINGHEIGHT as RINGLEFT
+                   from (IPLUS HANOIMARGIN (ITIMES RINGLARGEST (SUB1 1))) by RINGDELTA as I
+                   from 0 to (SUB1 NRINGS) as LABEL in RINGLABELS
+                   do (push (fetch RINGS of SOURCEPEG)
+                            (create RING
+                                   RINGREGION _ (create REGION
+                                                       LEFT _ RINGLEFT
+                                                       BOTTOM _ RINGBOTTOM
+                                                       WIDTH _ (IDIFFERENCE RINGLARGEST
+                                                                      (ITIMES I 2 RINGDELTA))
+                                                       HEIGHT _ RINGHEIGHT)
+                                   RINGNUMBER _ (ADD1 (IDIFFERENCE NRINGS I))
+                                   RINGLABEL _ LABEL)))      (* allocate bitmaps for ring movement)
+                (SETQ HORIZRINGBM (BITMAPCREATE (IPLUS RINGLARGEST MAXHORIZSPEED)
+                                         RINGHEIGHT))
+                (SETQ UPRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED)))
+                (SETQ DOWNRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED)))
+                (SETQ TOPUPRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED)))
+                (SETQ TOPDOWNRINGBM (BITMAPCREATE RINGLARGEST (IPLUS RINGHEIGHT MAXVERTSPEED]
+          (\CLEARBM W)
+          (DISPLAYPEGSANDRINGS PEGS W)
+          (bind (HERE _ 1)
+                (THERE _ 3) do (DOHANOI NRINGS HERE THERE W)
+                               (COND
+                                  (ONCE (RETURN)))
+                               (DISMISS 2000)
+                               (SETQ HERE (PROG1 THERE
+                                              (SETQ THERE (FINDOTHER HERE THERE)))])
 
 (XHANOI
-  [LAMBDA NIL                                                (* lmm " 8-MAR-82 15:59")
-    (PROG ((EVENRINGSHADE XRINGSHADE)
-	   (ODDRINGSHADE ORINGSHADE)
-	   (PEGSHADE XPEGSHADE))
-          (WHANOI (QUOTE (X E R O X))
-		  (QUOTE (0 0 400 280))
-		  (FONTCREATE (QUOTE LOGO)
-			      24])
+  [LAMBDA NIL                                                (* lmm " 8-MAR-82 15:59")
+    (PROG ((EVENRINGSHADE XRINGSHADE)
+           (ODDRINGSHADE ORINGSHADE)
+           (PEGSHADE XPEGSHADE))
+          (WHANOI '(X E R O X)
+                 '(0 0 400 280)
+                 (FONTCREATE 'LOGO 24])
 )
 
 (RPAQQ HANOIWINDOW NIL)
-(DECLARE: DONTCOPY 
-[DECLARE: EVAL@COMPILE 
+(DECLARE%: DONTCOPY 
+(DECLARE%: EVAL@COMPILE
 
 (RECORD PEG (PEGREGION RINGS))
 
 (RECORD RING (RINGREGION RINGNUMBER RINGLABEL))
-]
+)
 
-(DECLARE: EVAL@COMPILE 
+(DECLARE%: EVAL@COMPILE 
 
 (RPAQQ XRINGSHADE 42405)
 
@@ -429,10 +396,11 @@
 
 (RPAQQ XPEGSHADE 65535)
 
+
 (CONSTANTS XRINGSHADE ORINGSHADE XPEGSHADE)
 )
 
-(DECLARE: EVAL@COMPILE 
+(DECLARE%: EVAL@COMPILE 
 
 (RPAQQ PEGMIN 2)
 
@@ -442,15 +410,18 @@
 
 (RPAQQ MAXHORIZSPEED 44)
 
+
 (CONSTANTS PEGMIN HANOIMARGIN (MAXVERTSPEED 30)
-	   (MAXHORIZSPEED 44))
+       (MAXHORIZSPEED 44))
 )
 
-(DECLARE: EVAL@COMPILE 
-[PUTPROPS PEGN MACRO ((N)
-	   (CAR (SELECTQ N (1 PEGS)
-			 (2 (CDR PEGS))
-			 (CDDR PEGS]
+(DECLARE%: EVAL@COMPILE 
+
+(PUTPROPS PEGN MACRO [(N)
+                      (CAR (SELECTQ N
+                               (1 PEGS)
+                               (2 (CDR PEGS))
+                               (CDDR PEGS])
 )
 )
 
@@ -461,17 +432,13 @@
 (RPAQQ PEGSHADE 65535)
 
 (ADDTOVAR IDLE.FUNCTIONS [Hanoi (FUNCTION (LAMBDA (W)
-						    (HANOI (UNPACK (QUOTE "Xerox AI Systems"))
-							   W
-							   (QUOTE (TIMESROMAND 36]
-			   [HanoiUsername (FUNCTION (LAMBDA (W)
-							    (HANOI (UNPACK (USERNAME NIL T T))
-								   W
-								   (QUOTE (TIMESROMAND 36])
+                                                 (HANOI (UNPACK "Interlisp.org")
+                                                        W
+                                                        '(TIMESROMAND 36])
 (PUTPROPS HANOI COPYRIGHT ("Xerox Corporation" 1982 1983 1984 1985 1986))
-(DECLARE: DONTCOPY
-  (FILEMAP (NIL (797 18810 (DISPLAYPEGSANDRINGS 807 . 1479) (DOHANOI 1481 . 1818) (FINDOTHER 1820 . 2022
-) (HANOI 2024 . 2167) (HANOIDEMO 2169 . 2861) (MOVEDIS 2863 . 8440) (MOVERING 8442 . 8994) (RINGSHADE 
-8996 . 9245) (SETUPRINGBITMAPS 9247 . 12568) (TRACK 12570 . 12983) (WHANOI 12985 . 18479) (XHANOI 
-18481 . 18808)))))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL (920 20991 (DISPLAYPEGSANDRINGS 930 . 1875) (DOHANOI 1877 . 2288) (FINDOTHER 2290 . 2512
+) (HANOI 2514 . 2657) (HANOIDEMO 2659 . 3254) (MOVEDIS 3256 . 8151) (MOVERING 8153 . 8808) (RINGSHADE 
+8810 . 9049) (SETUPRINGBITMAPS 9051 . 12799) (TRACK 12801 . 13291) (WHANOI 13293 . 20670) (XHANOI 
+20672 . 20989)))))
 STOP
diff --git a/lispusers/HANOI.LCOM b/lispusers/HANOI.LCOM
index b7a34872..108adda3 100644
Binary files a/lispusers/HANOI.LCOM and b/lispusers/HANOI.LCOM differ
diff --git a/lispusers/IDLEHAX b/lispusers/IDLEHAX
index 7afd3120..57c76286 100644
--- a/lispusers/IDLEHAX
+++ b/lispusers/IDLEHAX
@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "26-Jun-2022 18:21:17" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>IDLEHAX.;4 26796  
+(FILECREATED "28-Sep-2022 19:53:38" {DSK}<home>larry>medley>lispusers>IDLEHAX.;2 31965  
 
-      :CHANGES-TO (FNS KAL.ADVANCE)
+      :CHANGES-TO (FNS IDLE-SWAP)
 
-      :PREVIOUS-DATE " 9-Feb-2022 13:53:05" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>IDLEHAX.;3)
+      :PREVIOUS-DATE "23-Aug-2022 08:50:16" {DSK}<home>larry>medley>lispusers>IDLEHAX.;1)
 
 
 (* ; "
@@ -98,7 +96,7 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 )
 
 (CONNECTPOLYS
-  [LAMBDA (FROMS TOS NSTEPS W OPERATION)                     (* ; "Edited 12-Jan-2022 15:22 by larry")
+  [LAMBDA (FROMS TOS NSTEPS W OPERATION)                   (* ; "Edited 23-Aug-2022 08:10 by larry")
                                                              (* lmm "30-Jul-85 17:19")
     (PROG (DIFFS)
           (CLEARW W)
@@ -120,8 +118,8 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
                                                     (fetch YC of FPT)
                                                     (fetch XC of TPT)
                                                     (fetch YC of TPT)
-                                                    1 OPERATION W))
-          (DISMISS POLYGONWAIT2)
+                                                    1 OPERATION W)
+                                             (DISMISS POLYGONWAIT2))
           (CLEARW W)
           (for I from 1 to POLYGONSTEPS do (DISMISS POLYGONWAIT3)
                                            (LINES2 FROMS 1 W OPERATION)
@@ -148,7 +146,7 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 
 (RPAQ? POLYGONSWINDOW )
 
-(RPAQQ POLYGONWAIT2 250)
+(RPAQQ POLYGONWAIT2 25)
 
 (RPAQQ POLYGONMINPTS 3)
 
@@ -191,8 +189,67 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 (DEFINEQ
 
 (KALDEMO
-(LAMBDA (W PERIOD PERSISTENCE) (* lmm " 5-Aug-85 22:16") (OR PERIOD (SETQ PERIOD (RAND 8 128))) (OR PERSISTENCE (SETQ PERSISTENCE (LSH 1 (RAND 4 13)))) (SETQ W (DEMOWINDOW W)) (LET ((XSTATEB (create KALSTATE A _ 1 B _ -1849 C _ (RAND 2 4) PERIOD _ PERIOD PERIODCOUNT _ 1)) (XSTATEE (create KALSTATE)) (YSTATEB (create KALSTATE A _ 1 B _ -1809 C _ (RAND 0 20) PERIOD _ PERIOD PERIODCOUNT _ 1)) (YSTATEE (create KALSTATE)) (WINDOWSIDE (MIN (WINDOWPROP W (QUOTE HEIGHT)) (WINDOWPROP W (QUOTE WIDTH)))) (TIMER (SETUPTIMER 0 NIL (QUOTE TICKS))) (BLACK (NOT (VIDEOCOLOR))) XOFFSET) (SETQ XOFFSET (QUOTIENT (MAX (DIFFERENCE (WINDOWPROP W (QUOTE WIDTH)) WINDOWSIDE) 0) 2)) (SETQ XSTATEE (COPY XSTATEB)) (SETQ YSTATEE (COPY YSTATEB)) (from 1 to PERSISTENCE do (KAL.ADVANCE XSTATEB) (KAL.ADVANCE YSTATEB) (KAL.SPOTS (ffetch A of XSTATEB) (ffetch A of YSTATEB) WINDOWSIDE W BLACK XOFFSET) (PERIODIC.BLOCK TIMER)) (do (KAL.ADVANCE XSTATEE) (KAL.ADVANCE YSTATEE) (PROG ((X0 (LOGAND (LRSH (ffetch A of XSTATEE) 7) KAL.MASK)) (Y0 (LOGAND (LRSH (ffetch A of YSTATEE) 7) KAL.MASK)) X1 Y1) (COND ((ILESSP X0 Y0) (SETQ X1 (IDIFFERENCE (SUB1 WINDOWSIDE) X0)) (SETQ Y1 (IDIFFERENCE (SUB1 WINDOWSIDE) Y0)) (KAL.BMS W X0 Y0 X1 Y1 (if BLACK then 1 else 0) XOFFSET)))) (KAL.ADVANCE XSTATEB) (KAL.ADVANCE YSTATEB) (KAL.SPOTS (ffetch A of XSTATEB) (ffetch A of YSTATEB) WINDOWSIDE W BLACK XOFFSET) (PERIODIC.BLOCK TIMER))))
-)
+  [LAMBDA (W PERIOD PERSISTENCE)                             (* ; "Edited 23-Aug-2022 08:49 by lmm")
+                                                             (* lmm " 5-Aug-85 22:16")
+    (OR PERIOD (SETQ PERIOD (RAND 16 128)))
+    [OR PERSISTENCE (SETQ PERSISTENCE (LSH 1 (RAND 14 23]
+    (SETQ W (DEMOWINDOW W))
+    (LET ((XSTATEB (create KALSTATE
+                          A _ 1
+                          B _ -1849
+                          C _ (RAND 2 4)
+                          PERIOD _ PERIOD
+                          PERIODCOUNT _ 1))
+          (XSTATEE (create KALSTATE))
+          (YSTATEB (create KALSTATE
+                          A _ 1
+                          B _ -1809
+                          C _ (RAND 0 20)
+                          PERIOD _ PERIOD
+                          PERIODCOUNT _ 1))
+          (YSTATEE (create KALSTATE))
+          [WINDOWSIDE (MIN (WINDOWPROP W 'HEIGHT)
+                           (WINDOWPROP W 'WIDTH]
+          (TIMER (SETUPTIMER 0 NIL 'TICKS))
+          (BLACK (NOT (VIDEOCOLOR)))
+          XOFFSET)
+         (SETQ XOFFSET (QUOTIENT (MAX (DIFFERENCE (WINDOWPROP W 'WIDTH)
+                                             WINDOWSIDE)
+                                      0)
+                              2))
+         (SETQ XSTATEE (COPY XSTATEB))
+         (SETQ YSTATEE (COPY YSTATEB))
+         (from 1 to PERSISTENCE do (KAL.ADVANCE XSTATEB)
+                                   (KAL.ADVANCE YSTATEB)
+                                   (KAL.SPOTS (ffetch A of XSTATEB)
+                                          (ffetch A of YSTATEB)
+                                          WINDOWSIDE W BLACK XOFFSET)
+                                   (BLOCK 100 TIMER))
+         (do (KAL.ADVANCE XSTATEE)
+             (KAL.ADVANCE YSTATEE)
+             [PROG ((X0 (LOGAND (LRSH (ffetch A of XSTATEE)
+                                      7)
+                               KAL.MASK))
+                    (Y0 (LOGAND (LRSH (ffetch A of YSTATEE)
+                                      7)
+                               KAL.MASK))
+                    X1 Y1)
+                   (COND
+                      ((ILESSP X0 Y0)
+                       (SETQ X1 (IDIFFERENCE (SUB1 WINDOWSIDE)
+                                       X0))
+                       (SETQ Y1 (IDIFFERENCE (SUB1 WINDOWSIDE)
+                                       Y0))
+                       (KAL.BMS W X0 Y0 X1 Y1 (if BLACK
+                                                  then 1
+                                                else 0)
+                              XOFFSET]
+             (KAL.ADVANCE XSTATEB)
+             (KAL.ADVANCE YSTATEB)
+             (KAL.SPOTS (ffetch A of XSTATEB)
+                    (ffetch A of YSTATEB)
+                    WINDOWSIDE W BLACK XOFFSET)
+             (PERIODIC.BLOCK TIMER])
 
 (KAL.ADVANCE
   [LAMBDA (STATE)                                            (* ; "Edited 26-Jun-2022 18:20 by rmk")
@@ -231,8 +288,59 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 (DEFINEQ
 
 (BUBBLES
-(LAMBDA (W) (* lmm "30-Jul-85 20:35") (WINDOWPROP (SETQ W (DEMOWINDOW W)) (QUOTE RESHAPEFN) (FUNCTION (LAMBDA (W) (DSPFILL NIL (if (VIDEOCOLOR) then WHITESHADE else BLACKSHADE) (QUOTE REPLACE) W)))) (DSPFILL NIL (if (VIDEOCOLOR) then WHITESHADE else BLACKSHADE) (QUOTE REPLACE) W) (bind (ARRAY _ (ARRAY BUBBLECNT (QUOTE POINTER))) (I _ 1) CIRCLE eachtime (SETQ I (if (EQ I BUBBLECNT) then 1 else (ADD1 I))) do (* * first erase the circle at I in array) (SETQ CIRCLE (ELT ARRAY I)) (DSPOPERATION (if (VIDEOCOLOR) then (QUOTE ERASE) else (QUOTE PAINT)) W) (* there will be no circle at I the first time through) (AND CIRCLE (DRAWCIRCLE (CAR CIRCLE) (CADR CIRCLE) (CADDR CIRCLE) NIL NIL W)) (* * now put a new circle in array at I and draw it) (SETQ CIRCLE (SETA ARRAY I (BUBBLE.CREATE W))) (DSPOPERATION (QUOTE REPLACE) W) (* fill center w/ black so it ocludes ones under) (FILLCIRCLE (CAR CIRCLE) (CADR CIRCLE) (SUB1 (CADDR CIRCLE)) (if (VIDEOCOLOR) then WHITESHADE else BLACKSHADE) W) (DSPOPERATION (QUOTE INVERT) W) (DRAWCIRCLE (CAR CIRCLE) (CADR CIRCLE) (CADDR CIRCLE) NIL NIL W) (BLOCK)))
-)
+  [LAMBDA (W)                                              (* ; "Edited 23-Aug-2022 08:14 by larry")
+                                                             (* lmm "30-Jul-85 20:35")
+    [WINDOWPROP (SETQ W (DEMOWINDOW W))
+           'RESHAPEFN
+           (FUNCTION (LAMBDA (W)
+                       (DSPFILL NIL (if (VIDEOCOLOR)
+                                        then WHITESHADE
+                                      else BLACKSHADE)
+                              'REPLACE W]
+    (DSPFILL NIL (if (VIDEOCOLOR)
+                     then WHITESHADE
+                   else BLACKSHADE)
+           'REPLACE W)
+    (bind (ARRAY _ (ARRAY BUBBLECNT 'POINTER))
+          (I _ 1)
+          CIRCLE eachtime (SETQ I (if (EQ I BUBBLECNT)
+                                      then 1
+                                    else (ADD1 I))) do 
+
+         (* * first erase the circle at I in array)
+
+                                                       (SETQ CIRCLE (ELT ARRAY I))
+                                                       (DSPOPERATION (if (VIDEOCOLOR)
+                                                                         then 'ERASE
+                                                                       else 'PAINT)
+                                                              W) 
+                                                             (* there will be no circle at I the 
+                                                             first time through)
+                                                       (AND CIRCLE (DRAWCIRCLE (CAR CIRCLE)
+                                                                          (CADR CIRCLE)
+                                                                          (CADDR CIRCLE)
+                                                                          NIL NIL W)) 
+
+         (* * now put a new circle in array at I and draw it)
+
+                                                       (SETQ CIRCLE (SETA ARRAY I (BUBBLE.CREATE
+                                                                                   W)))
+                                                       (DSPOPERATION 'REPLACE W) 
+                                                             (* fill center w/ black so it ocludes 
+                                                             ones under)
+                                                       (FILLCIRCLE (CAR CIRCLE)
+                                                              (CADR CIRCLE)
+                                                              (SUB1 (CADDR CIRCLE))
+                                                              (if (VIDEOCOLOR)
+                                                                  then WHITESHADE
+                                                                else BLACKSHADE)
+                                                              W)
+                                                       (DSPOPERATION 'INVERT W)
+                                                       (DRAWCIRCLE (CAR CIRCLE)
+                                                              (CADR CIRCLE)
+                                                              (CADDR CIRCLE)
+                                                              NIL NIL W)
+                                                       (BLOCK 100])
 
 (BUBBLE.CREATE
 (LAMBDA (W) (* drc%: "29-Jul-85 13:51") (LET* ((REGION (WINDOWPROP W (QUOTE REGION))) (WIDTH (SUB1 (fetch WIDTH of REGION))) (HEIGHT (SUB1 (fetch HEIGHT of REGION))) (CENTERX (RAND 1 (SUB1 WIDTH))) (CENTERY (RAND 1 (SUB1 HEIGHT)))) (LIST CENTERX CENTERY (RAND 1 (IMIN (IDIFFERENCE WIDTH CENTERX) CENTERX (IDIFFERENCE HEIGHT CENTERY) CENTERY)))))
@@ -243,8 +351,32 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 (DEFINEQ
 
 (IDLE-WINDOWS
-(LAMBDA (W DELAY) (* lmm " 7-Jun-86 22:21") (SETQ W (DEMOWINDOW W)) (PROG ((D (WINDOWPROP W (QUOTE WIDTH))) (H (WINDOWPROP W (QUOTE HEIGHT))) (TIMER (SETUPTIMER 0 NIL (QUOTE TICKS)))) (LET ((TITLE (WINDOWPROP (CREATEW (LIST 0 0 D (HEIGHTIFWINDOW 0 T)) "Yet another window" NIL T) (QUOTE IMAGECOVERED)))) (while T do (PROG ((X (RAND 0 (- D (+ 2 2 100)))) (Y (RAND 0 (- H 8 100)))) (PROG ((D0 (MAX 100 (RAND 100 (- D X)))) (H0 (MAX 100 (RAND 100 (- H Y))))) (BITBLT NIL NIL NIL W X Y D0 2 (QUOTE TEXTURE) (QUOTE REPLACE) BLACKSHADE) (BITBLT NIL NIL NIL W X Y 2 H0 (QUOTE TEXTURE) (QUOTE REPLACE) BLACKSHADE) (BITBLT NIL NIL NIL W (+ X (- D0 2)) Y 2 H0 (QUOTE TEXTURE) (QUOTE REPLACE) BLACKSHADE) (BITBLT TITLE NIL (+ WBorder (QUOTIENT WBorder 2)) W X (+ Y H0) D0 NIL NIL (QUOTE REPLACE)) (BITBLT NIL NIL NIL W (+ X 2) (+ Y 2) (- D0 (+ 2 2)) (- H0 2) (QUOTE TEXTURE) (QUOTE ERASE) BLACKSHADE))) (if DELAY then (BLOCK DELAY) else (PERIODIC.BLOCK TIMER))))))
-)
+  [LAMBDA (W DELAY)                                          (* ; "Edited 23-Aug-2022 08:35 by lmm")
+                                                             (* lmm " 7-Jun-86 22:21")
+    (SETQ W (DEMOWINDOW W))
+    (PROG [(D (WINDOWPROP W 'WIDTH))
+           (H (WINDOWPROP W 'HEIGHT]
+          (LET [(TITLE (WINDOWPROP (CREATEW (LIST 0 0 D (HEIGHTIFWINDOW 0 T))
+                                          "Yet another window" NIL T)
+                              'IMAGECOVERED]
+               (while T do (PROG [[X (RAND 0 (- D (+ 2 2 100]
+                                  (Y (RAND 0 (- H 8 100]
+                                 (PROG [[D0 (MAX 100 (RAND 100 (- D X]
+                                        (H0 (MAX 100 (RAND 100 (- H Y]
+                                       (BITBLT NIL NIL NIL W X Y D0 2 'TEXTURE 'REPLACE BLACKSHADE)
+                                       (BITBLT NIL NIL NIL W X Y 2 H0 'TEXTURE 'REPLACE BLACKSHADE)
+                                       (BITBLT NIL NIL NIL W (+ X (- D0 2))
+                                              Y 2 H0 'TEXTURE 'REPLACE BLACKSHADE)
+                                       (BITBLT TITLE NIL (+ WBorder (QUOTIENT WBorder 2))
+                                              W X (+ Y H0)
+                                              D0 NIL NIL 'REPLACE)
+                                       (BITBLT NIL NIL NIL W (+ X 2)
+                                              (+ Y 2)
+                                              (- D0 (+ 2 2))
+                                              (- H0 2)
+                                              'TEXTURE
+                                              'ERASE BLACKSHADE)))
+                           (BLOCK (OR DELAY 500])
 )
 
 
@@ -258,8 +390,18 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 )
 
 (LINES1
-(LAMBDA (ENDPOINTS LINES DSP) (* lmm "30-Jul-85 17:33") (PROG (PTS) (COND ((SETQ PTS (CAR LINES)) (* ERASE OLD) (LINES3 (CAR LINES) 1 DSP (QUOTE INVERT) ENDPOINTS)) (T (RPLACA LINES (SETQ PTS (in ENDPOINTS collect (create NPOINT)))) (LINES2 ENDPOINTS 1 DSP (QUOTE INVERT)))) (for PT in PTS as EP in ENDPOINTS do (replace XC of PT with (fetch XC of EP)) (replace YC of PT with (fetch YC of EP)))))
-)
+  [LAMBDA (ENDPOINTS LINES DSP)                            (* ; "Edited 23-Aug-2022 07:59 by larry")
+                                                             (* lmm "30-Jul-85 17:33")
+    (PROG (PTS)
+          [COND
+             ((SETQ PTS (CAR LINES))                         (* ERASE OLD)
+              (LINES3 (CAR LINES)
+                     1 DSP 'INVERT ENDPOINTS))
+             (T [RPLACA LINES (SETQ PTS (in ENDPOINTS collect (create NPOINT]
+                (LINES2 ENDPOINTS 1 DSP 'INVERT]
+          (BLOCK 75)
+          (for PT in PTS as EP in ENDPOINTS do (replace XC of PT with (fetch XC of EP))
+                                               (replace YC of PT with (fetch YC of EP])
 
 (LINES2
 (LAMBDA (ENDPOINTS WIDTH WINDOW OPERATION) (* lmm "30-Jul-85 17:14") (for (X _ ENDPOINTS) while (OR (CDR X) (if (CDDR ENDPOINTS) then X)) do (DRAWLINE (fetch XC (CAR X)) (fetch YC (CAR X)) (fetch XC (CAR (OR (SETQ X (CDR X)) ENDPOINTS))) (fetch YC (CAR (OR X ENDPOINTS))) WIDTH OPERATION WINDOW)))
@@ -283,8 +425,20 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 )
 
 (WARP
-(LAMBDA (W) (* hdj " 1-Apr-86 14:22") (do (CLEARW W) (LET ((OLDOP (DSPOPERATION (QUOTE INVERT) W))) (LET ((WIDTH (WINDOWPROP W (QUOTE WIDTH))) (HEIGHT (WINDOWPROP W (QUOTE HEIGHT)))) (LET ((CENTERX (RAND 0 WIDTH)) (CENTERY (RAND 0 HEIGHT))) (for RADIUS from (RAND 5 250) to 5 by -2 do (FILLCIRCLE (PLUS CENTERX (RAND 0 2)) (PLUS CENTERY (RAND 0 2)) RADIUS BLACKSHADE W) (BLOCK)))) (DSPOPERATION OLDOP W))))
-)
+  [LAMBDA (W)                                              (* ; "Edited 23-Aug-2022 08:01 by larry")
+                                                             (* hdj " 1-Apr-86 14:22")
+    (do (CLEARW W)
+        (LET ((OLDOP (DSPOPERATION 'INVERT W)))
+             [LET [(WIDTH (WINDOWPROP W 'WIDTH))
+                   (HEIGHT (WINDOWPROP W 'HEIGHT]
+                  (LET ((CENTERX (RAND 0 WIDTH))
+                        (CENTERY (RAND 0 HEIGHT)))
+                       (for RADIUS from (RAND 5 250) to 5 by -2
+                          do (FILLCIRCLE (PLUS CENTERX (RAND 0 2))
+                                    (PLUS CENTERY (RAND 0 2))
+                                    RADIUS BLACKSHADE W)
+                             (BLOCK 75]
+             (DSPOPERATION OLDOP W])
 )
 
 
@@ -294,7 +448,8 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 (DEFINEQ
 
 (IDLE-MELT
-  [LAMBDA (WINDOW SIZE INITIAL PATH)                  (* ; "Edited 10-Jun-88 17:15 by MASINTER")
+  [LAMBDA (WINDOW SIZE INITIAL PATH)                       (* ; "Edited 23-Aug-2022 08:20 by larry")
+                                                          (* ; "Edited 10-Jun-88 17:15 by MASINTER")
     (OR SIZE (SETQ SIZE MELT-BLOCK-SIZE))
     (SETQ WINDOW (DEMOWINDOW WINDOW))
     (PROG ((W (WINDOWPROP WINDOW 'WIDTH))
@@ -307,37 +462,34 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
           [SETQ BM (OR (CAR TAIL)
                        (WINDOWPROP WINDOW 'IMAGECOVERED]
           (for BITMAP inside BM do (BITBLT (SETQ BITMAP (if (BITMAPP BITMAP)
-                                                                        then BITMAP
-                                                                      elseif (CL:SYMBOLP BITMAP)
-                                                                        then (CAR (READBRUSHFILE
-                                                                                       BITMAP))
-                                                                      else (IDLE.BITMAP NIL 
-                                                                                      BITMAP)))
-                                                      NIL NIL WINDOW (RAND 0 (- W (BITMAPWIDTH BITMAP
-                                                                                         )))
-                                                      (RAND 0 (- H (BITMAPHEIGHT BITMAP)))
-                                                      NIL NIL (if (VIDEOCOLOR)
-                                                                  then NIL
-                                                                else 'INVERT)
-                                                      'REPLACE))
+                                                            then BITMAP
+                                                          elseif (CL:SYMBOLP BITMAP)
+                                                            then (CAR (READBRUSHFILE BITMAP))
+                                                          else (IDLE.BITMAP NIL BITMAP)))
+                                          NIL NIL WINDOW (RAND 0 (- W (BITMAPWIDTH BITMAP)))
+                                          (RAND 0 (- H (BITMAPHEIGHT BITMAP)))
+                                          NIL NIL (if (VIDEOCOLOR)
+                                                      then NIL
+                                                    else 'INVERT)
+                                          'REPLACE))
           (if INITIAL
               then [SETQ TIMER (AND (CADR TAIL)
-                                        (SETUPTIMER (CADR TAIL)
-                                               TIMER
-                                               'SECONDS
-                                               'SECONDS]
-                    (SETQ TAIL (OR (CDDR TAIL)
-                                   INITIAL)))
+                                    (SETUPTIMER (CADR TAIL)
+                                           TIMER
+                                           'SECONDS
+                                           'SECONDS]
+                   (SETQ TAIL (OR (CDDR TAIL)
+                                  INITIAL)))
           [do (LET [(X (RAND 0 (- W SIZE)))
-                        (Y (RAND 0 (- H SIZE]
-                       (BITBLT WINDOW X Y WINDOW (+ X (RAND -1 1))
-                              (+ Y (RAND -1 1))
-                              SIZE SIZE NIL 'REPLACE))
-                 (BLOCK) repeatuntil (AND TIMER (TIMEREXPIRED? TIMER 'SECONDS]
+                    (Y (RAND 0 (- H SIZE]
+                   (BITBLT WINDOW X Y WINDOW (+ X (RAND -1 1))
+                          (+ Y (RAND -1 1))
+                          SIZE SIZE NIL 'REPLACE))
+              (BLOCK 100) repeatuntil (AND TIMER (TIMEREXPIRED? TIMER 'SECONDS]
           (GO REPAINT])
 
 (IDLE-SLIDE
-  [LAMBDA (W SIZE SPEED COUNT SOURCE)                 (* ; "Edited 10-Jun-88 17:12 by MASINTER")
+  [LAMBDA (W SIZE SPEED COUNT SOURCE)                     (* ; "Edited 10-Jun-88 17:12 by MASINTER")
     (OR SIZE (SETQ SIZE 128))
     (OR COUNT (SETQ COUNT 120))
     (OR SPEED (SETQ SPEED 2))
@@ -354,28 +506,28 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
                X Y DX DY (CNT 1)
                DDX DDY (TIMER (SETUPTIMER 0 NIL 'TICKS]
               (do (COND
-                         ((OR (EQ (add CNT -1)
-                                  0)
-                              (< X 0)
-                              (> X XMAX)
-                              (< Y 0)
-                              (> Y YMAX))
-                          (SETQ X (RAND 0 XMAX))
-                          (SETQ Y (RAND 0 YMAX))
-                          (SETQ DX (RAND (- SPEED)
-                                         SPEED))
-                          (SETQ DY (RAND (- SPEED)
-                                         SPEED))
-                          (BITBLT SOURCE X Y W X Y SIZE SIZE NIL 'REPLACE)
-                          (SETQ DDX DY)
-                          (SETQ DDY DX)
-                          (SETQ CNT COUNT)))
-                     (BITBLT W X Y W (+ X DDX)
-                            (+ Y DDY)
-                            SIZE SIZE NIL 'REPLACE)
-                     (add X DX)
-                     (add Y DY)
-                     (PERIODIC.BLOCK TIMER])
+                     ((OR (EQ (add CNT -1)
+                              0)
+                          (< X 0)
+                          (> X XMAX)
+                          (< Y 0)
+                          (> Y YMAX))
+                      (SETQ X (RAND 0 XMAX))
+                      (SETQ Y (RAND 0 YMAX))
+                      (SETQ DX (RAND (- SPEED)
+                                     SPEED))
+                      (SETQ DY (RAND (- SPEED)
+                                     SPEED))
+                      (BITBLT SOURCE X Y W X Y SIZE SIZE NIL 'REPLACE)
+                      (SETQ DDX DY)
+                      (SETQ DDY DX)
+                      (SETQ CNT COUNT)))
+                  (BITBLT W X Y W (+ X DDX)
+                         (+ Y DDY)
+                         SIZE SIZE NIL 'REPLACE)
+                  (add X DX)
+                  (add Y DY)
+                  (PERIODIC.BLOCK TIMER])
 )
 
 (RPAQQ MELT-BLOCK-SIZE 32)
@@ -399,17 +551,16 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 )
 (DECLARE%: EVAL@COMPILE 
 
-(PUTPROPS PERIODIC.BLOCK MACRO [(TIMER)
-                                (if (TIMEREXPIRED? TIMER 'TICKS)
-                                    then (BLOCK)
-                                         (SETQ TIMER (SETUPTIMER 100 TIMER 'TICKS 'MILLISECONDS])
+(PUTPROPS PERIODIC.BLOCK MACRO ((TIMER)
+                                (BLOCK 100 TIMER)))
 )
 
 (ADDTOVAR IDLE.FUNCTIONS ("Drain" 'IDLE-DRAIN))
 (DEFINEQ
 
 (IDLE-DRAIN
-  [LAMBDA (WINDOW)                                           (* hdj "28-May-86 11:52")
+  [LAMBDA (WINDOW)                                         (* ; "Edited 23-Aug-2022 07:52 by larry")
+                                                             (* hdj "28-May-86 11:52")
     (do (BITBLT (WINDOWPROP WINDOW 'IMAGECOVERED)
                NIL NIL WINDOW NIL NIL NIL NIL 'INVERT 'REPLACE)
         (LET* ((WIDTH (WINDOWPROP WINDOW 'WIDTH))
@@ -417,7 +568,7 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
                (HALF-WIDTH (IQUOTIENT WIDTH 2))
                (HALF-HEIGHT (IQUOTIENT HEIGHT 2)))
               (for EDGE from 0 to (MIN HALF-WIDTH HALF-HEIGHT)
-                 do (BLOCK)
+                 do (BLOCK 100)
                     (BITBLT WINDOW EDGE 0 WINDOW (PLUS 1 EDGE)
                            0
                            (- HALF-WIDTH EDGE)
@@ -452,13 +603,14 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 (DEFINEQ
 
 (IDLE-SWAP
-  [LAMBDA (WINDOW)                                           (* hdj "29-May-86 23:41")
+  [LAMBDA (WINDOW)                                           (* ; "Edited 28-Sep-2022 19:48 by lmm")
+                                                             (* hdj "29-May-86 23:41")
     (DECLARE (GLOBALVARS IDLE-SWAP-SIZE))
     (BITBLT (WINDOWPROP WINDOW 'IMAGECOVERED)
            NIL NIL WINDOW NIL NIL NIL NIL 'INVERT 'REPLACE)
     (LET [(WIDTH (WINDOWPROP WINDOW 'WIDTH))
           (HEIGHT (WINDOWPROP WINDOW 'HEIGHT]
-         (do (BLOCK (RAND 0 5000))
+         (do (BLOCK 250)
              (LET [[RAND-X-1 (TIMES IDLE-SWAP-SIZE (RAND 0 (IQUOTIENT WIDTH IDLE-SWAP-SIZE]
                    [RAND-Y-1 (TIMES IDLE-SWAP-SIZE (RAND 0 (IQUOTIENT HEIGHT IDLE-SWAP-SIZE]
                    [RAND-X-2 (TIMES IDLE-SWAP-SIZE (RAND 0 (IQUOTIENT WIDTH IDLE-SWAP-SIZE]
@@ -480,12 +632,12 @@ Copyright (c) 1985-1988, 1991, 2022 by Xerox Corporation.
 (ADDTOVAR IDLE.FUNCTIONS ("Swap" 'IDLE-SWAP))
 (PUTPROPS IDLEHAX COPYRIGHT ("Xerox Corporation" 1985 1986 1987 1988 1991 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3812 7852 (POLYGONSDEMO 3822 . 3992) (POLYGONS 3994 . 4358) (CONNECTPOLYS 4360 . 6758) 
-(DRAWPOLY1 6760 . 7397) (RANDOMPT 7399 . 7850)) (8489 12004 (KALDEMO 8499 . 9910) (KAL.ADVANCE 9912 . 
-10846) (KAL.SPOTS 10848 . 11189) (KAL.BMS 11191 . 11678) (KAL.ORAND 11680 . 12002)) (12041 13527 (
-BUBBLES 12051 . 13157) (BUBBLE.CREATE 13159 . 13525)) (13554 14539 (IDLE-WINDOWS 13564 . 14537)) (
-14574 16845 (LINES 14584 . 15643) (LINES1 15645 . 16055) (LINES2 16057 . 16368) (LINES3 16370 . 16843)
-) (16905 18118 (WALKINGSPOKE 16915 . 17696) (WARP 17698 . 18116)) (18143 22426 (IDLE-MELT 18153 . 
-20669) (IDLE-SLIDE 20671 . 22424)) (22597 22843 (DEMOWINDOW 22607 . 22841)) (23255 25128 (IDLE-DRAIN 
-23265 . 25126)) (25160 26641 (IDLE-SWAP 25170 . 26639)))))
+  (FILEMAP (NIL (3756 7833 (POLYGONSDEMO 3766 . 3936) (POLYGONS 3938 . 4302) (CONNECTPOLYS 4304 . 6739) 
+(DRAWPOLY1 6741 . 7378) (RANDOMPT 7380 . 7831)) (8469 13548 (KALDEMO 8479 . 11454) (KAL.ADVANCE 11456
+ . 12390) (KAL.SPOTS 12392 . 12733) (KAL.BMS 12735 . 13222) (KAL.ORAND 13224 . 13546)) (13585 17431 (
+BUBBLES 13595 . 17061) (BUBBLE.CREATE 17063 . 17429)) (17458 19241 (IDLE-WINDOWS 17468 . 19239)) (
+19276 21944 (LINES 19286 . 20345) (LINES1 20347 . 21154) (LINES2 21156 . 21467) (LINES3 21469 . 21942)
+) (22004 23625 (WALKINGSPOKE 22014 . 22795) (WARP 22797 . 23623)) (23650 27551 (IDLE-MELT 23660 . 
+25872) (IDLE-SLIDE 25874 . 27549)) (27722 27968 (DEMOWINDOW 27732 . 27966)) (28212 30198 (IDLE-DRAIN 
+28222 . 30196)) (30230 31810 (IDLE-SWAP 30240 . 31808)))))
 STOP
diff --git a/lispusers/IDLEHAX.LCOM b/lispusers/IDLEHAX.LCOM
index fa3f4b92..5bc2a369 100644
Binary files a/lispusers/IDLEHAX.LCOM and b/lispusers/IDLEHAX.LCOM differ
diff --git a/lispusers/KINETIC b/lispusers/KINETIC
index e3b9892a..48cafeaa 100644
--- a/lispusers/KINETIC
+++ b/lispusers/KINETIC
@@ -1,49 +1,53 @@
-(FILECREATED " 2-Apr-86 00:14:01" {ERIS}<LISPUSERS>KOTO>KINETIC.;2 1626   
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to:  (VARS KINETICCOMS)
+(FILECREATED "23-Sep-2022 08:19:41" {DSK}<home>larry>medley>lispusers>KINETIC.;2 1928   
 
-      previous date: " 3-Dec-85 14:17:48" {ERIS}<LISPUSERS>KOTO>KINETIC.;1)
+      :CHANGES-TO (FNS KINETIC)
+
+      :PREVIOUS-DATE " 2-Apr-86 00:14:01" {DSK}<home>larry>medley>lispusers>KINETIC.;1)
 
 
-(* Copyright (c) 1982, 1985, 1986 by Xerox Corporation. All rights reserved.)
+(* ; "
+Copyright (c) 1982, 1985-1986, 2022 by Xerox Corporation.
+")
 
 (PRETTYCOMPRINT KINETICCOMS)
 
 (RPAQQ KINETICCOMS ((FNS KINETIC)
-		      (VARS (CHECKSHADE 63903)
-			    (KINETICWINDOW))
-		      (ALISTS (IDLE.FUNCTIONS Kinetic))))
+                    (VARS (CHECKSHADE 63903)
+                          (KINETICWINDOW))
+                    (ALISTS (IDLE.FUNCTIONS Kinetic))))
 (DEFINEQ
 
 (KINETIC
-  [LAMBDA (WINDOW)                                           (* lmm " 3-Dec-85 14:16")
-                                                             (* test example (KINETICDEMO) 
-							     (SETQ CHECKSHADE (EDITSHADE CHECKSHADE)))
-    [OR (WINDOWP WINDOW)
-	  (SETQ WINDOW (OR KINETICWINDOW (SETQ KINETICWINDOW (CREATEW NIL "Kinetic Window"]
-    (PROG ((WD (WINDOWPROP WINDOW (QUOTE WIDTH)))
-	     (HT (WINDOWPROP WINDOW (QUOTE HEIGHT)))
-	     X Y)
-	    (do (SETQ X (RAND 0 WD))
-		  (SETQ Y (RAND 0 HT))
-		  (BITBLT NIL NIL NIL WINDOW (RAND 0 (IDIFFERENCE WD X))
-			    (RAND 0 (IDIFFERENCE HT Y))
-			    X Y (QUOTE TEXTURE)
-			    (SELECTQ (RAND 0 5)
-				       (0 (QUOTE PAINT))
-				       (QUOTE INVERT))
-			    (SELECTQ (AND CHECKSHADE (RAND 0 12))
-				       (0 CHECKSHADE)
-				       BLACKSHADE))
-		  (BLOCK])
+  [LAMBDA (WINDOW)                                           (* ; "Edited 22-Sep-2022 22:07 by lmm")
+                                                             (* lmm " 3-Dec-85 14:16")
+                                                             (* test example (KINETICDEMO)
+                                                             (SETQ CHECKSHADE (EDITSHADE CHECKSHADE)))
+    [OR (WINDOWP WINDOW)
+        (SETQ WINDOW (OR KINETICWINDOW (SETQ KINETICWINDOW (CREATEW NIL "Kinetic Window"]
+    (PROG ((WD (WINDOWPROP WINDOW 'WIDTH))
+           (HT (WINDOWPROP WINDOW 'HEIGHT))
+           X Y)
+          (do (SETQ X (RAND 0 WD))
+              (SETQ Y (RAND 0 HT))
+              (BITBLT NIL NIL NIL WINDOW (RAND 0 (IDIFFERENCE WD X))
+                     (RAND 0 (IDIFFERENCE HT Y))
+                     X Y 'TEXTURE (SELECTQ (RAND 0 5)
+                                      (0 'PAINT)
+                                      'INVERT)
+                     (SELECTQ (AND CHECKSHADE (RAND 0 12))
+                         (0 CHECKSHADE)
+                         BLACKSHADE))
+              (BLOCK 100])
 )
 
 (RPAQQ CHECKSHADE 63903)
 
 (RPAQQ KINETICWINDOW NIL)
 
-(ADDTOVAR IDLE.FUNCTIONS (Kinetic (QUOTE KINETIC)))
-(PUTPROPS KINETIC COPYRIGHT ("Xerox Corporation" 1982 1985 1986))
-(DECLARE: DONTCOPY
-  (FILEMAP (NIL (447 1420 (KINETIC 457 . 1418)))))
+(ADDTOVAR IDLE.FUNCTIONS (Kinetic 'KINETIC))
+(PUTPROPS KINETIC COPYRIGHT ("Xerox Corporation" 1982 1985 1986 2022))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL (573 1723 (KINETIC 583 . 1721)))))
 STOP
diff --git a/lispusers/KINETIC.LCOM b/lispusers/KINETIC.LCOM
index 62c65885..e6e4c426 100644
Binary files a/lispusers/KINETIC.LCOM and b/lispusers/KINETIC.LCOM differ
diff --git a/lispusers/PAC-MAN-IDLE b/lispusers/PAC-MAN-IDLE
index ebe8f6aa..e6963ddf 100644
--- a/lispusers/PAC-MAN-IDLE
+++ b/lispusers/PAC-MAN-IDLE
@@ -1,284 +1,187 @@
-(FILECREATED "30-Jun-86 18:01:00" {PHYLUM}<LANNING>LISP>USERS>PAC-MAN-IDLE.;11 14703  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to:  (VARS PAC-MAN-IDLECOMS)
-		   (FNS Pac-Man-Eat-Window Slow-Fade Pac-Man-Idle)
+(FILECREATED "24-Aug-2022 08:54:17" {DSK}<home>larry>medley>lispusers>PAC-MAN-IDLE.;2 17389  
 
-      previous date: " 2-May-86 18:42:49" {PHYLUM}<LANNING>LISP>USERS>PAC-MAN-IDLE.;10)
+      :CHANGES-TO (FNS Pac-Man-Eat-Window Pac-Man-Scout-Food)
+
+      :PREVIOUS-DATE "30-Jun-86 18:01:00" {DSK}<home>larry>medley>lispusers>PAC-MAN-IDLE.;1)
 
 
-(* Copyright (c) 1986 by Xerox Corporation. All rights reserved.)
+(* ; "
+Copyright (c) 1986 by Xerox Corporation.
+")
 
 (PRETTYCOMPRINT PAC-MAN-IDLECOMS)
 
-(RPAQQ PAC-MAN-IDLECOMS [(* * The Pac-Man idle function)
-			   (FNS Pac-Man-Eat-Window Pac-Man-Idle)
-			   (VARS DefaultPacManEatMask DefaultPacManIcon DefaultPacManMask)
-			   (INITVARS (Pac-Man-Delay 100)
-				     (pacManHorizonFactor .75)
-				     (pacManStarvationTime 75)
-				     (pacManEatMask DefaultPacManEatMask)
-				     (pacManIcon DefaultPacManIcon)
-				     (pacManMask DefaultPacManMask))
-			   (GLOBALVARS Pac-Man-Delay pacManHorizonFactor pacManStarvationTime 
-				       pacManEatMask pacManIcon pacManMask)
-			   (FNS Pac-Man-Scout-Food)
-			   (* * Stuff for counting the bits on in a bitmap)
-			   (FNS Pac-Man-Amount-Of-Food)
-			   (MACROS Pac-Man-Convert-Word)
-			   (VARS (Pac-Man-Convert-Byte-Array (\ALLOCBLOCK 256 T)))
-			   (GLOBALVARS Pac-Man-Convert-Byte-Array)
-			   [P (for i from 0 to 255 do (\PUTBASE Pac-Man-Convert-Byte-Array i
-								(bind (j _ i)
-								      while
-								      (NOT (ZEROP j))
-								      count
-								      (SETQ j (LOGAND j (SUB1 j]
-			   (* * Another idle function)
-			   (FNS Slow-Fade)
-			   [INITVARS (Slow-Fade-Delay 1000)
-				     (Default-Slow-Fade-Idle-Function (LISTGET IDLE.PROFILE
-									       (QUOTE DISPLAYFN]
-			   (GLOBALVARS Slow-Fade-Delay Default-Slow-Fade-Idle-Function)
-			   (* * Add them as idle functions)
-			   (ADDVARS (IDLE.FUNCTIONS ("Pac-man" (QUOTE Pac-Man-Idle))
-						    ("Slow fade" (QUOTE Slow-Fade])
+(RPAQQ PAC-MAN-IDLECOMS
+       [(* * The Pac-Man idle function)
+        (FNS Pac-Man-Eat-Window Pac-Man-Idle)
+        (VARS DefaultPacManEatMask DefaultPacManIcon DefaultPacManMask)
+        (INITVARS (Pac-Man-Delay 100)
+               (pacManHorizonFactor 0.75)
+               (pacManStarvationTime 75)
+               (pacManEatMask DefaultPacManEatMask)
+               (pacManIcon DefaultPacManIcon)
+               (pacManMask DefaultPacManMask))
+        (GLOBALVARS Pac-Man-Delay pacManHorizonFactor pacManStarvationTime pacManEatMask pacManIcon 
+               pacManMask)
+        (FNS Pac-Man-Scout-Food)
+        (* * Stuff for counting the bits on in a bitmap)
+        (FNS Pac-Man-Amount-Of-Food)
+        (MACROS Pac-Man-Convert-Word)
+        (VARS (Pac-Man-Convert-Byte-Array (\ALLOCBLOCK 256 T)))
+        (GLOBALVARS Pac-Man-Convert-Byte-Array)
+        [P (for i from 0 to 255 do (\PUTBASE Pac-Man-Convert-Byte-Array i
+                                          (bind (j _ i)
+                                                while
+                                                (NOT (ZEROP j))
+                                                count
+                                                (SETQ j (LOGAND j (SUB1 j]
+        (* * Another idle function)
+        (FNS Slow-Fade)
+        [INITVARS (Slow-Fade-Delay 1000)
+               (Default-Slow-Fade-Idle-Function (LISTGET IDLE.PROFILE 'DISPLAYFN]
+        (GLOBALVARS Slow-Fade-Delay Default-Slow-Fade-Idle-Function)
+        (* * Add them as idle functions)
+        (ADDVARS (IDLE.FUNCTIONS ("Pac-man" 'Pac-Man-Idle)
+                        ("Slow fade" 'Slow-Fade])
 (* * The Pac-Man idle function)
 
 (DEFINEQ
 
 (Pac-Man-Eat-Window
-  [LAMBDA (window)                                           (* smL "30-Jun-86 17:38")
+  [LAMBDA (window)                                           (* smL "30-Jun-86 17:38")
 
-          (* * Comment)
+         (* * Comment)
 
+    (RESETLST
+        (bind (minX _ (MINUS (QUOTIENT (BITMAPWIDTH pacManIcon)
+                                    2)))
+              (minY _ (MINUS (QUOTIENT (BITMAPHEIGHT pacManIcon)
+                                    2)))
+              (maxX _ (DIFFERENCE (WINDOWPROP window 'WIDTH)
+                             (QUOTIENT (BITMAPWIDTH pacManIcon)
+                                    2)))
+              (maxY _ (DIFFERENCE (WINDOWPROP window 'HEIGHT)
+                             (QUOTIENT (BITMAPHEIGHT pacManIcon)
+                                    2)))
+              (minimumSpeed _ 0.2)
+              (maximumSpeed _ 1.0)
+              (icon _ (DEFERREDCONSTANT (BITMAPCOPY pacManIcon)))
+              (delayTimer _ (DEFERREDCONSTANT (SETUPTIMER 250)))
+              [horizon _ (FIX (MAX 2 (TIMES (MIN (BITMAPWIDTH pacManIcon)
+                                                 (BITMAPHEIGHT pacManIcon))
+                                            pacManHorizonFactor]
+              (delta _ '(0 . 0))
+              possibleDeltas x y (xSpeed _ 0)
+              (ySpeed _ 0)
+              [maxSpeed _ (TIMES 10 (MIN (BITMAPWIDTH pacManIcon)
+                                         (BITMAPHEIGHT pacManIcon]
+              (maxAcceleration _ (MIN (BITMAPWIDTH pacManIcon)
+                                      (BITMAPHEIGHT pacManIcon)))
+              (stepsWithoutFood _ 0) first [SETQ possibleDeltas
+                                            (for pair in '((0 . -1)
+                                                           (-1 . 0)
+                                                           (1 . 0)
+                                                           (0 . 1)
+                                                           (0.707 . 0.707)
+                                                           (-0.707 . 0.707)
+                                                           (0.707 . -0.707)
+                                                           (-0.707 . -0.707))
+                                               collect (CONS (FIX (TIMES horizon (CAR pair)))
+                                                             (FIX (TIMES horizon (CDR pair] 
+                                                             (* Pick a random starting place)
+                                           (SELECTQ (RAND 0 1)
+                                               (0 (SETQ x (TIMES (WINDOWPROP window 'WIDTH)
+                                                                 (RAND 0 1)))
+                                                  [SETQ y (RAND 0 (WINDOWPROP window 'HEIGHT])
+                                               (1 [SETQ x (RAND 0 (WINDOWPROP window 'WIDTH]
+                                                  (SETQ y (TIMES (WINDOWPROP window 'WIDTH)
+                                                                 (RAND 0 1))))
+                                               NIL) while T
+           do 
 
-    (RESETLST (bind (minX _(MINUS (QUOTIENT (BITMAPWIDTH pacManIcon)
-						    2)))
-			(minY _(MINUS (QUOTIENT (BITMAPHEIGHT pacManIcon)
-						    2)))
-			(maxX _(DIFFERENCE (WINDOWPROP window (QUOTE WIDTH))
-					     (QUOTIENT (BITMAPWIDTH pacManIcon)
-							 2)))
-			(maxY _(DIFFERENCE (WINDOWPROP window (QUOTE HEIGHT))
-					     (QUOTIENT (BITMAPHEIGHT pacManIcon)
-							 2)))
-			(minimumSpeed _ .2)
-			(maximumSpeed _ 1.0)
-			(icon _(DEFERREDCONSTANT (BITMAPCOPY pacManIcon)))
-			(delayTimer _(DEFERREDCONSTANT (SETUPTIMER 250)))
-			[horizon _(FIX (MAX 2 (TIMES (MIN (BITMAPWIDTH pacManIcon)
-								  (BITMAPHEIGHT pacManIcon))
-							   pacManHorizonFactor]
-			(delta _(QUOTE (0 . 0)))
-			possibleDeltas x y (xSpeed _ 0)
-			(ySpeed _ 0)
-			[maxSpeed _(TIMES 10 (MIN (BITMAPWIDTH pacManIcon)
-						      (BITMAPHEIGHT pacManIcon]
-			(maxAcceleration _(MIN (BITMAPWIDTH pacManIcon)
-						 (BITMAPHEIGHT pacManIcon)))
-			(stepsWithoutFood _ 0)
-		   first [SETQ possibleDeltas (for pair in (QUOTE ((0 . -1)
-									      (-1 . 0)
-									      (1 . 0)
-									      (0 . 1)
-									      (.707 . .707)
-									      (-.707 . .707)
-									      (.707 . -.707)
-									      (-.707 . -.707)))
-						     collect (CONS (FIX (TIMES horizon
-										       (CAR pair)))
-								       (FIX (TIMES horizon
-										       (CDR pair]
-                                                             (* Pick a random starting place)
-			   (SELECTQ (RAND 0 1)
-				      [0 (SETQ x (TIMES (WINDOWPROP window (QUOTE WIDTH))
-							    (RAND 0 1)))
-					 (SETQ y (RAND 0 (WINDOWPROP window (QUOTE HEIGHT]
-				      [1 [SETQ x (RAND 0 (WINDOWPROP window (QUOTE WIDTH]
-					 (SETQ y (TIMES (WINDOWPROP window (QUOTE WIDTH))
-							    (RAND 0 1]
-				      NIL)
-		   while T
-		   do 
+         (* * Try to figure out which direction to go.
+         Pick the one that would get us the most food.
+         Make sure to block, and don't move to quickly
+         (hah!))
 
-          (* * Try to figure out which direction to go. Pick the one that would get us the most food.
-	  Make sure to block, and don't move to quickly (hah!))
+              (SETQ delayTimer (SETUPTIMER Pac-Man-Delay delayTimer))
+              [SETQ delta (Pac-Man-Scout-Food
+                           window x y pacManEatMask possibleDeltas delta
+                           (DEFERREDCONSTANT (BITMAPCREATE
+                                              (PLUS (TIMES 16 (QUOTIENT (BITMAPWIDTH pacManMask)
+                                                                     16))
+                                                    (if (ZEROP (REMAINDER (BITMAPWIDTH pacManMask)
+                                                                      16))
+                                                        then 0
+                                                      else 16))
+                                              (BITMAPHEIGHT pacManMask]
+              (COND
+                 ((NOT (NULL delta))                         (* Found some food)
+                  NIL)
+                 ((GREATERP stepsWithoutFood pacManStarvationTime)
+                                                             (* Starving, so make a random jump)
+                  (change xSpeed (RAND (DIFFERENCE minX x)
+                                       (DIFFERENCE maxX x)))
+                  (change ySpeed (RAND (DIFFERENCE minY y)
+                                       (DIFFERENCE maxY y)))
+                  (SETQ stepsWithoutFood 0)
+                  (SETQ delta (CONS xSpeed ySpeed)))
+                 (T (add stepsWithoutFood 1)
+                    (change xSpeed (RAND (MINUS maxAcceleration)
+                                         maxAcceleration))
+                    (change xSpeed (MAX (DIFFERENCE minX x)
+                                        (MIN (DIFFERENCE maxX x)
+                                             DATUM)))
+                    (change ySpeed (RAND (MINUS maxAcceleration)
+                                         maxAcceleration))
+                    (change ySpeed (MAX (DIFFERENCE minY y)
+                                        (MIN (DIFFERENCE maxY y)
+                                             DATUM)))
+                    (SETQ delta (CONS xSpeed ySpeed)))
+                 (T (SETQ stepsWithoutFood 0)
+                    (SETQ xSpeed 0)
+                    (SETQ ySpeed 0)))
+              (do (BLOCK) repeatuntil (TIMEREXPIRED? delayTimer)) 
 
+         (* * Eat the food at the current location)
 
-			(SETQ delayTimer (SETUPTIMER Pac-Man-Delay delayTimer))
-			[SETQ delta (Pac-Man-Scout-Food
-			    window x y pacManEatMask possibleDeltas delta
-			    (DEFERREDCONSTANT (BITMAPCREATE
-						  (PLUS (TIMES 16 (QUOTIENT (BITMAPWIDTH
-										    pacManMask)
-										  16))
-							  (if (ZEROP (REMAINDER (BITMAPWIDTH
-											pacManMask)
-										      16))
-							      then 0
-							    else 16))
-						  (BITMAPHEIGHT pacManMask]
-			(COND
-			  ((NOT (NULL delta))            (* Found some food)
-			    NIL)
-			  ((GREATERP stepsWithoutFood pacManStarvationTime)
-                                                             (* Starving, so make a random jump)
-			    (change xSpeed (RAND (DIFFERENCE minX x)
-						     (DIFFERENCE maxX x)))
-			    (change ySpeed (RAND (DIFFERENCE minY y)
-						     (DIFFERENCE maxY y)))
-			    (SETQ stepsWithoutFood 0)
-			    (SETQ delta (CONS xSpeed ySpeed)))
-			  (T (add stepsWithoutFood 1)
-			     (change xSpeed (RAND (MINUS maxAcceleration)
-						      maxAcceleration))
-			     (change xSpeed (MAX (DIFFERENCE minX x)
-						     (MIN (DIFFERENCE maxX x)
-							    DATUM)))
-			     (change ySpeed (RAND (MINUS maxAcceleration)
-						      maxAcceleration))
-			     (change ySpeed (MAX (DIFFERENCE minY y)
-						     (MIN (DIFFERENCE maxY y)
-							    DATUM)))
-			     (SETQ delta (CONS xSpeed ySpeed)))
-			  (T (SETQ stepsWithoutFood 0)
-			     (SETQ xSpeed 0)
-			     (SETQ ySpeed 0)))
-			(do (BLOCK) repeatuntil (TIMEREXPIRED? delayTimer)) 
+              (BITBLT pacManEatMask NIL NIL window x y NIL NIL 'INPUT 'ERASE) 
 
-          (* * Eat the food at the current location)
+         (* * Update my location)
 
-
-			(BITBLT pacManEatMask NIL NIL window x y NIL NIL (QUOTE INPUT)
-				  (QUOTE ERASE))
-
-          (* * Update my location)
-
-
-			[change x (FIX (MAX minX (MIN maxX (PLUS DATUM
-									   (TIMES (RAND 
-										     minimumSpeed 
-										     maximumSpeed)
-										    (CAR delta]
-			[change y (FIX (MAX minY (MIN maxY (PLUS DATUM
-									   (TIMES (RAND 
-										     minimumSpeed 
-										     maximumSpeed)
-										    (CDR delta]
-			(BITBLT window x y icon NIL NIL NIL NIL (QUOTE INPUT)
-				  (QUOTE REPLACE))
-			(BITBLT pacManMask NIL NIL icon NIL NIL NIL NIL (QUOTE INPUT)
-				  (QUOTE ERASE))
-			(BITBLT pacManIcon NIL NIL icon NIL NIL NIL NIL (QUOTE INPUT)
-				  (QUOTE PAINT))
-			(BITBLT icon NIL NIL window x y NIL NIL (QUOTE INPUT)
-				  (QUOTE REPLACE])
+              [change x (FIX (MAX minX (MIN maxX (PLUS DATUM (TIMES (RAND minimumSpeed maximumSpeed)
+                                                                    (CAR delta]
+              [change y (FIX (MAX minY (MIN maxY (PLUS DATUM (TIMES (RAND minimumSpeed maximumSpeed)
+                                                                    (CDR delta]
+              (BITBLT window x y icon NIL NIL NIL NIL 'INPUT 'REPLACE)
+              (BITBLT pacManMask NIL NIL icon NIL NIL NIL NIL 'INPUT 'ERASE)
+              (BITBLT pacManIcon NIL NIL icon NIL NIL NIL NIL 'INPUT 'PAINT)
+              (BITBLT icon NIL NIL window x y NIL NIL 'INPUT 'REPLACE)))])
 
 (Pac-Man-Idle
-  [LAMBDA (window)                                           (* smL "30-Jun-86 17:41")
+  [LAMBDA (window)                                           (* smL "30-Jun-86 17:41")
 
-          (* * A hungry idle function)
+         (* * A hungry idle function)
 
-
-    (BITBLT (WINDOWPROP window (QUOTE IMAGECOVERED))
-	      NIL NIL window NIL NIL NIL NIL (QUOTE INVERT)
-	      (QUOTE REPLACE))
+    (BITBLT (WINDOWPROP window 'IMAGECOVERED)
+           NIL NIL window NIL NIL NIL NIL 'INVERT 'REPLACE)
     (Pac-Man-Eat-Window window])
 )
 
-(RPAQ DefaultPacManEatMask (READBITMAP))
-(27 27
-"@@AO@@@@"
-"@@GOL@@@"
-"@AOOO@@@"
-"@GOOOL@@"
-"@OOOON@@"
-"AOOOOO@@"
-"AOOOOO@@"
-"COOOOOH@"
-"COOOOOH@"
-"GOOOOOL@"
-"GOOOOOL@"
-"OOOOOON@"
-"OOOOOON@"
-"OOOOOON@"
-"OOOOOON@"
-"OOOOOON@"
-"GOOOOOL@"
-"GOOOOOL@"
-"COOOOOH@"
-"COOOOOH@"
-"AOOOOO@@"
-"AOOOOO@@"
-"@OOOON@@"
-"@GOOOL@@"
-"@AOOO@@@"
-"@@GOL@@@"
-"@@AO@@@@")
+(RPAQQ DefaultPacManEatMask #*(27 27)@@AO@@@@@@GOL@@@@AOOO@@@@GOOOL@@@OOOON@@AOOOOO@@AOOOOO@@COOOOOH@COOOOOH@GOOOOOL@GOOOOOL@OOOOOON@OOOOOON@OOOOOON@OOOOOON@OOOOOON@GOOOOOL@GOOOOOL@COOOOOH@COOOOOH@AOOOOO@@AOOOOO@@@OOOON@@@GOOOL@@@AOOO@@@@@GOL@@@@@AO@@@@
+)
 
-(RPAQ DefaultPacManIcon (READBITMAP))
-(27 27
-"@@AE@@@@"
-"@@EED@@@"
-"@@JJJ@@@"
-"@BJJJH@@"
-"@EEEED@@"
-"AEEGME@@"
-"@JJONJ@@"
-"BJJONJH@"
-"AEEEEE@@"
-"EEEEEED@"
-"BJJJJJH@"
-"JJJJJJJ@"
-"EEEEEED@"
-"EEEEEED@"
-"JJJH@@@@"
-"JJJJ@@@@"
-"EEEE@@@@"
-"EEEE@@@@"
-"BJJJH@@@"
-"BJJJJ@@@"
-"AEEEE@@@"
-"AEEEE@@@"
-"@JJJJH@@"
-"@BJJJH@@"
-"@AEEE@@@"
-"@@EED@@@"
-"@@@J@@@@")
+(RPAQQ DefaultPacManIcon #*(27 27)@@AE@@@@@@EED@@@@@JJJ@@@@BJJJH@@@EEEED@@AEEGME@@@JJONJ@@BJJONJH@AEEEEE@@EEEEEED@BJJJJJH@JJJJJJJ@EEEEEED@EEEEEED@JJJH@@@@JJJJ@@@@EEEE@@@@EEEE@@@@BJJJH@@@BJJJJ@@@AEEEE@@@AEEEE@@@@JJJJH@@@BJJJH@@@AEEE@@@@@EED@@@@@@J@@@@
+)
 
-(RPAQ DefaultPacManMask (READBITMAP))
-(27 27
-"@@AO@@@@"
-"@@GOL@@@"
-"@AOOO@@@"
-"@GOOOL@@"
-"@OOOON@@"
-"AOOOOO@@"
-"AOOOOO@@"
-"COOOOOH@"
-"COOOOOH@"
-"GOOOOOL@"
-"GOOOOOL@"
-"OOOOOON@"
-"OOOOOON@"
-"OOOOOON@"
-"OOOL@@@@"
-"OOON@@@@"
-"GOOO@@@@"
-"GOOOH@@@"
-"COOOL@@@"
-"COOON@@@"
-"AOOOO@@@"
-"AOOOOH@@"
-"@OOOOL@@"
-"@GOOOL@@"
-"@AOOO@@@"
-"@@GOL@@@"
-"@@AO@@@@")
+(RPAQQ DefaultPacManMask #*(27 27)@@AO@@@@@@GOL@@@@AOOO@@@@GOOOL@@@OOOON@@AOOOOO@@AOOOOO@@COOOOOH@COOOOOH@GOOOOOL@GOOOOOL@OOOOOON@OOOOOON@OOOOOON@OOOL@@@@OOON@@@@GOOO@@@@GOOOH@@@COOOL@@@COOON@@@AOOOO@@@AOOOOH@@@OOOOL@@@GOOOL@@@AOOO@@@@@GOL@@@@@AO@@@@
+)
 
 (RPAQ? Pac-Man-Delay 100)
 
-(RPAQ? pacManHorizonFactor .75)
+(RPAQ? pacManHorizonFactor 0.75)
 
 (RPAQ? pacManStarvationTime 75)
 
@@ -287,164 +190,150 @@
 (RPAQ? pacManIcon DefaultPacManIcon)
 
 (RPAQ? pacManMask DefaultPacManMask)
-(DECLARE: DOEVAL@COMPILE DONTCOPY
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS Pac-Man-Delay pacManHorizonFactor pacManStarvationTime pacManEatMask pacManIcon 
-	    pacManMask)
+       pacManMask)
 )
 (DEFINEQ
 
 (Pac-Man-Scout-Food
   [LAMBDA (window x y mask possibleDeltas prevDelta tempBitMap)
-                                                             (* smL "29-Apr-86 12:55")
-
-          (* * Return the x-y pair of directions to go to get the most food)
+                                                             (* smL "29-Apr-86 12:55")
 
+         (* * Return the x-y pair of directions to go to get the most food)
 
     (for i from 1 to 8 bind direction
-       thereis [SETQ direction (for offsetPair in [for x in possibleDeltas
-							     collect (CONS (TIMES i
-											(CAR x))
-									       (TIMES i
-											(CDR x]
-				      bind xoffset yoffset amountOfFood (mostFood _ 0)
-					     (mostFoodDirections _ NIL)
-				      do (SETQ xoffset (CAR offsetPair))
-					   (SETQ yoffset (CDR offsetPair)) 
+       thereis [SETQ direction (for offsetPair in [for x in possibleDeltas
+                                                     collect (CONS (TIMES i (CAR x))
+                                                                   (TIMES i (CDR x]
+                                  bind xoffset yoffset amountOfFood (mostFood _ 0)
+                                       (mostFoodDirections _ NIL)
+                                  do (SETQ xoffset (CAR offsetPair))
+                                     (SETQ yoffset (CDR offsetPair)) 
 
-          (* * Build a bitmap of the food available at the location. -
-	  This requires computing the number of bits that are black both in the window and in the mask.
-	  -
-	  We want black bits in the window because things have been inverted by idle and we are trying to eat white bits, and
-	  we want black bits in the mask because that is what defines the mask.)
-
-                                                             (* Copy the screen bits into the temp bitmap.)
-					   (BITBLT NIL NIL NIL tempBitMap NIL NIL NIL NIL
-						     (QUOTE TEXTURE)
-						     (QUOTE REPLACE)
-						     WHITESHADE)
-					   (BITBLT window (PLUS xoffset x)
-						     (PLUS yoffset y)
-						     tempBitMap NIL NIL NIL NIL (QUOTE INPUT)
-						     (QUOTE REPLACE))
-                                                             (* Or in the white bits of the mask at the appropriate
-							     location.)
-					   (BITBLT mask NIL NIL tempBitMap NIL NIL NIL NIL
-						     (QUOTE INVERT)
-						     (QUOTE ERASE))
-                                                             (* Clear out the image of the current position of the 
-							     mask.)
-					   (BITBLT NIL NIL NIL tempBitMap NIL NIL NIL NIL
-						     (QUOTE TEXTURE)
-						     (QUOTE INVERT)
-						     BLACKSHADE)
-					   (BITBLT mask (MAX 0 xoffset)
-						     (MAX 0 yoffset)
-						     tempBitMap
-						     (MAX 0 (MINUS xoffset))
-						     (MAX 0 (MINUS yoffset))
-						     NIL NIL (QUOTE INPUT)
-						     (QUOTE PAINT))
-					   (BITBLT NIL NIL NIL tempBitMap NIL NIL NIL NIL
-						     (QUOTE TEXTURE)
-						     (QUOTE INVERT)
-						     BLACKSHADE)
-                                                             (* Compute the amount of food)
-					   (SETQ amountOfFood (Pac-Man-Amount-Of-Food tempBitMap))
-                                                             (* Remember the directions with the most food)
-					   (if (LESSP amountOfFood mostFood)
-					       then        (* This direction loses)
-						      NIL
-					     elseif (EQP amountOfFood mostFood)
-					       then        (* This is a possible direction)
-						      (push mostFoodDirections offsetPair)
-					     else          (* This direction dominates)
-						    (SETQ mostFood amountOfFood)
-						    (SETQ mostFoodDirections (LIST offsetPair)))
-				      finally (RETURN (if (ZEROP mostFood)
-							      then NIL
-							    else (CAR (NTH mostFoodDirections
-										 (RAND
-										   1
-										   (LENGTH 
-									       mostFoodDirections]
-       finally (RETURN direction])
+         (* * Build a bitmap of the food available at the location.
+         -
+         This requires computing the number of bits that are black both in the window and 
+         in the mask. -
+         We want black bits in the window because things have been inverted by idle and we 
+         are trying to eat white bits, and we want black bits in the mask because that is 
+         what defines the mask.)
+                                                             (* Copy the screen bits into the temp 
+                                                             bitmap.)
+                                     (BITBLT NIL NIL NIL tempBitMap NIL NIL NIL NIL 'TEXTURE
+                                            'REPLACE WHITESHADE)
+                                     (BITBLT window (PLUS xoffset x)
+                                            (PLUS yoffset y)
+                                            tempBitMap NIL NIL NIL NIL 'INPUT 'REPLACE) 
+                                                             (* Or in the white bits of the mask at 
+                                                             the appropriate location.)
+                                     (BITBLT mask NIL NIL tempBitMap NIL NIL NIL NIL 'INVERT
+                                            'ERASE)          (* Clear out the image of the current 
+                                                             position of the mask.)
+                                     (BITBLT NIL NIL NIL tempBitMap NIL NIL NIL NIL 'TEXTURE
+                                            'INVERT BLACKSHADE)
+                                     (BITBLT mask (MAX 0 xoffset)
+                                            (MAX 0 yoffset)
+                                            tempBitMap
+                                            (MAX 0 (MINUS xoffset))
+                                            (MAX 0 (MINUS yoffset))
+                                            NIL NIL 'INPUT 'PAINT)
+                                     (BITBLT NIL NIL NIL tempBitMap NIL NIL NIL NIL 'TEXTURE
+                                            'INVERT BLACKSHADE) 
+                                                             (* Compute the amount of food)
+                                     (SETQ amountOfFood (Pac-Man-Amount-Of-Food tempBitMap)) 
+                                                             (* Remember the directions with the 
+                                                             most food)
+                                     (if (LESSP amountOfFood mostFood)
+                                         then                (* This direction loses)
+                                              NIL
+                                       elseif (EQP amountOfFood mostFood)
+                                         then                (* This is a possible direction)
+                                              (push mostFoodDirections offsetPair)
+                                       else                  (* This direction dominates)
+                                            (SETQ mostFood amountOfFood)
+                                            (SETQ mostFoodDirections (LIST offsetPair)))
+                                  finally (RETURN (if (ZEROP mostFood)
+                                                      then NIL
+                                                    else (CAR (NTH mostFoodDirections
+                                                                   (RAND 1 (LENGTH mostFoodDirections
+                                                                                  ]
+       finally (RETURN direction])
 )
 (* * Stuff for counting the bits on in a bitmap)
 
 (DEFINEQ
 
 (Pac-Man-Amount-Of-Food
-  [LAMBDA (bitMap)                                           (* smL "29-Apr-86 13:23")
+  [LAMBDA (bitMap)                                           (* smL "29-Apr-86 13:23")
 
-          (* * How much food is there in the bitmap?)
+         (* * How much food is there in the bitmap?)
 
-
-    (for j from 0 to (QUOTIENT (TIMES (BITMAPHEIGHT bitMap)
-						(BITMAPWIDTH bitMap))
-				       16)
-       bind (bitmapBase _(fetch (BITMAP BITMAPBASE) of bitMap)) sum (Pac-Man-Convert-Word
-									      (\GETBASE bitmapBase 
-											  j])
+    (for j from 0 to (QUOTIENT (TIMES (BITMAPHEIGHT bitMap)
+                                      (BITMAPWIDTH bitMap))
+                            16) bind (bitmapBase _ (fetch (BITMAP BITMAPBASE) of bitMap))
+       sum (Pac-Man-Convert-Word (\GETBASE bitmapBase j])
 )
-(DECLARE: EVAL@COMPILE 
-[DEFMACRO Pac-Man-Convert-Word (word)
-	  (* * Count up the number of bits on in the word)
-	  (BQUOTE (PLUS (\GETBASE Pac-Man-Convert-Byte-Array (LRSH , word 8))
-			(\GETBASE Pac-Man-Convert-Byte-Array (LOGAND , word 255]
+(DECLARE%: EVAL@COMPILE 
+
+(PROGN (DEFMACRO Pac-Man-Convert-Word (word)
+          
+
+         (* * Count up the number of bits on in the word)
+
+          `(PLUS (\GETBASE Pac-Man-Convert-Byte-Array (LRSH %, word 8))
+                 (\GETBASE Pac-Man-Convert-Byte-Array (LOGAND %, word 255))))
+       NIL)
 )
 
 (RPAQ Pac-Man-Convert-Byte-Array (\ALLOCBLOCK 256 T))
-(DECLARE: DOEVAL@COMPILE DONTCOPY
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS Pac-Man-Convert-Byte-Array)
 )
-[for i from 0 to 255 do (\PUTBASE Pac-Man-Convert-Byte-Array i (bind (j _ i)
-								     while
-								     (NOT (ZEROP j))
-								     count
-								     (SETQ j (LOGAND j (SUB1 j]
+
+[for i from 0 to 255 do (\PUTBASE Pac-Man-Convert-Byte-Array i (bind (j _ i)
+                                                                  while (NOT (ZEROP j))
+                                                                  count (SETQ j (LOGAND j
+                                                                                       (SUB1 j]
 (* * Another idle function)
 
 (DEFINEQ
 
 (Slow-Fade
-  [LAMBDA (window)                                           (* smL "30-Jun-86 17:16")
+  [LAMBDA (window)                                           (* smL "30-Jun-86 17:16")
 
-          (* * Slowly fade the idle window to black)
+         (* * Slowly fade the idle window to black)
 
-
-    (BITBLT (WINDOWPROP window (QUOTE IMAGECOVERED))
-	      NIL NIL window NIL NIL NIL NIL (QUOTE INVERT)
-	      (QUOTE REPLACE))
-    [LET [(fadeTextures (for i from 0 to 15 collect (LLSH 1 i]
+    (BITBLT (WINDOWPROP window 'IMAGECOVERED)
+           NIL NIL window NIL NIL NIL NIL 'INVERT 'REPLACE)
+    [LET [(fadeTextures (for i from 0 to 15 collect (LLSH 1 i]
          (while fadeTextures bind selectedTexture
-	    do (BLOCK Slow-Fade-Delay)
-		 (SETQ selectedTexture (LLSH 1 (RAND 0 15)))
-		 (BITBLT NIL NIL NIL window NIL NIL NIL NIL (QUOTE TEXTURE)
-			   (QUOTE ERASE)
-			   selectedTexture)
-		 (SETQ fadeTextures (DREMOVE selectedTexture fadeTextures]
-    (BLOCK Slow-Fade-Delay)
-    (APPLY* (OR Default-Slow-Fade-Idle-Function (FUNCTION IDLE.BOUNCING.BOX))
-	      window])
+            do (BLOCK Slow-Fade-Delay)
+               (SETQ selectedTexture (LLSH 1 (RAND 0 15)))
+               (BITBLT NIL NIL NIL window NIL NIL NIL NIL 'TEXTURE 'ERASE selectedTexture)
+               (SETQ fadeTextures (DREMOVE selectedTexture fadeTextures]
+    (BLOCK Slow-Fade-Delay)
+    (APPLY* (OR Default-Slow-Fade-Idle-Function (FUNCTION IDLE.BOUNCING.BOX))
+           window])
 )
 
 (RPAQ? Slow-Fade-Delay 1000)
 
-(RPAQ? Default-Slow-Fade-Idle-Function (LISTGET IDLE.PROFILE (QUOTE DISPLAYFN)))
-(DECLARE: DOEVAL@COMPILE DONTCOPY
+(RPAQ? Default-Slow-Fade-Idle-Function (LISTGET IDLE.PROFILE 'DISPLAYFN))
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS Slow-Fade-Delay Default-Slow-Fade-Idle-Function)
 )
 (* * Add them as idle functions)
 
 
-(ADDTOVAR IDLE.FUNCTIONS ("Pac-man" (QUOTE Pac-Man-Idle))
-			   ("Slow fade" (QUOTE Slow-Fade)))
+(ADDTOVAR IDLE.FUNCTIONS ("Pac-man" 'Pac-Man-Idle)
+                         ("Slow fade" 'Slow-Fade))
 (PUTPROPS PAC-MAN-IDLE COPYRIGHT ("Xerox Corporation" 1986))
-(DECLARE: DONTCOPY
-  (FILEMAP (NIL (1826 7263 (Pac-Man-Eat-Window 1836 . 6918) (Pac-Man-Idle 6920 . 7261)) (8683 12226 (
-Pac-Man-Scout-Food 8693 . 12224)) (12282 12768 (Pac-Man-Amount-Of-Food 12292 . 12766)) (13370 14261 (
-Slow-Fade 13380 . 14259)))))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL (2093 8924 (Pac-Man-Eat-Window 2103 . 8625) (Pac-Man-Idle 8627 . 8922)) (10090 14734 (
+Pac-Man-Scout-Food 10100 . 14732)) (14790 15275 (Pac-Man-Amount-Of-Food 14800 . 15273)) (16137 16947 (
+Slow-Fade 16147 . 16945)))))
 STOP
diff --git a/lispusers/PAC-MAN-IDLE.LCOM b/lispusers/PAC-MAN-IDLE.LCOM
index b0d22539..4dda4e77 100644
Binary files a/lispusers/PAC-MAN-IDLE.LCOM and b/lispusers/PAC-MAN-IDLE.LCOM differ
diff --git a/lispusers/QIX b/lispusers/QIX
index ba5b24a5..cdc179f8 100644
--- a/lispusers/QIX
+++ b/lispusers/QIX
@@ -1,18 +1,20 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "INTERLISP")
-(FILECREATED "12-Aug-87 03:05:50" {PHYLUM}<SHRAGER>LISP>QIX.\;3 11097  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-      |changes| |to:|  (VARS QIXCOMS)
+(FILECREATED "24-Aug-2022 07:58:48" |{DSK}<home>larry>medley>lispusers>QIX.;2| 11276  
 
-      |previous| |date:| " 1-Aug-87 17:04:27" {PHYLUM}<SHRAGER>LISP>QIX.\;2)
+      :CHANGES-TO (FNS QIX.IDLE)
+
+      :PREVIOUS-DATE "12-Aug-87 03:05:50" |{DSK}<home>larry>medley>lispusers>QIX.;1|)
 
 
-; Copyright (c) 1987 by Xerox Corporation.  All rights reserved.
+; Copyright (c) 1987 by Xerox Corporation.
 
 (PRETTYCOMPRINT QIXCOMS)
 
 (RPAQQ QIXCOMS ((FNS QIX.GROW QIX.IDLE QIX.MOVE.POINT QIX.PLAY)
                 (RECORDS QIX.POINT)
-                (P (SETQ IDLE.FUNCTIONS (CONS '("5 Qix's" 'QIX.IDLE) IDLE.FUNCTIONS)))))
+                (P (SETQ IDLE.FUNCTIONS (CONS '("5 Qix's" 'QIX.IDLE)
+                                              IDLE.FUNCTIONS)))))
 (DEFINEQ
 
 (QIX.GROW
@@ -109,16 +111,18 @@
           (GO LOOP))))
 
 (QIX.IDLE
-  (LAMBDA (W)                                        (* \; "Edited  1-Aug-87 16:58 by JEFF.SHRAGER")
-          
-          (* * CLOBBER ANY OLD QIXS THAT WERE LEFT AROUND
-          (WASTING SPACE) FROM BEFORE.)
+  (LAMBDA (W)                                             (* \; "Edited 24-Aug-2022 07:53 by larry")
+                                                             (* \; 
+                                                             "Edited  1-Aug-87 16:58 by JEFF.SHRAGER")
+
+         (* * CLOBBER ANY OLD QIXS THAT WERE LEFT AROUND
+         (WASTING SPACE) FROM BEFORE.)
 
     (AND (BOUNDP '*OLD-QIXS*)
          (FOR Q IN *OLD-QIXS* DO (RPLACD Q NIL)))
     (PROG (P P2 L QIXS)
-          
-          (* * P |and| P2 |define| \a QIX.)
+
+         (* * P |and| P2 |define| \a QIX.)
 
           (SETQ QIXS (|for| I |from| 1 |to| 5
                         |collect| (PROGN (SETQ P (|create| QIX.POINT
@@ -131,10 +135,10 @@
                                                          Y _ (RAND 1 100)
                                                          VH _ (RAND 1 20)
                                                          VV _ (RAND 1 20)))
-          
-          (* * L |is| |the| |tail| |list.| I\t |starts| |out| |full| |of| NIL\s |and| 
-          |gets| |filled| |as| |the| QIX |moves.| I\t |is| |also| |inserted| |in| |it's| 
-          |own| |mouth| |so| |that| |the| |whole| |thing| |wraps| |around.|)
+
+         (* * L |is| |the| |tail| |list.| I\t |starts| |out| |full| |of| NIL\s |and| 
+         |gets| |filled| |as| |the| QIX |moves.| I\t |is| |also| |inserted| |in| |it's| 
+         |own| |mouth| |so| |that| |the| |whole| |thing| |wraps| |around.|)
 
                                          (SETQ L
                                           (APPEND (|for| X |from| 1 |to| (RAND 5 25)
@@ -148,12 +152,12 @@
                                          (LIST P P2 L))))
           (SETQ *OLD-QIXS* QIXS)
       LOOP
-          (DISMISS)
+          (BLOCK 25)
           (|for| Q |in| QIXS |do| (SETQ P (CAR Q))
                                   (SETQ P2 (CADR Q))
                                   (SETQ L (CADDR Q)) 
-          
-          (* * |Draw| |the| |QIX's| |head| |line.|)
+
+         (* * |Draw| |the| |QIX's| |head| |line.|)
 
                                   (MOVETO (|fetch| X P)
                                          (|fetch| Y P)
@@ -162,13 +166,13 @@
                                          (|fetch| Y P2)
                                          1
                                          'REPLACE W) 
-          
-          (* * |Move| |the| |points| |according| |to| |their| X |and| Y |velocities.|)
+
+         (* * |Move| |the| |points| |according| |to| |their| X |and| Y |velocities.|)
 
                                   (QIX.MOVE.POINT P W)
                                   (QIX.MOVE.POINT P2 W) 
-          
-          (* * |Delete| |the| |first| |object| |on| |the| |tail| |list.|)
+
+         (* * |Delete| |the| |first| |object| |on| |the| |tail| |list.|)
 
                                   (COND
                                      ((EQ (CAAR L)
@@ -181,10 +185,10 @@
                                                      (CADDDR OLD)
                                                      1
                                                      'ERASE W)))) 
-          
-          (* * |Replace| |the| |current| |point| |with| |the| |new| |head,| |which| 
-          |effectively| |adds| |it| |to| |the| |end| |of| |the| |list,| |since| |we| THEN 
-          |immediately| |move| |to| |the| |next| |elt| |in| |this| |circular| |list.|)
+
+         (* * |Replace| |the| |current| |point| |with| |the| |new| |head,| |which| 
+         |effectively| |adds| |it| |to| |the| |end| |of| |the| |list,| |since| |we| THEN 
+         |immediately| |move| |to| |the| |next| |elt| |in| |this| |circular| |list.|)
 
                                   (RPLACA (CAR L)
                                          (|fetch| X P))
@@ -247,9 +251,11 @@
 
 (RECORD QIX.POINT (X Y VH VV))
 )
-(SETQ IDLE.FUNCTIONS (CONS '("5 Qix's" 'QIX.IDLE) IDLE.FUNCTIONS))
+
+(SETQ IDLE.FUNCTIONS (CONS '("5 Qix's" 'QIX.IDLE)
+                           IDLE.FUNCTIONS))
 (PUTPROPS QIX COPYRIGHT ("Xerox Corporation" 1987))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (539 10893 (QIX.GROW 549 . 4105) (QIX.IDLE 4107 . 8821) (QIX.MOVE.POINT 8823 . 10205) (
-QIX.PLAY 10207 . 10891)))))
+  (FILEMAP (NIL (592 11044 (QIX.GROW 602 . 4158) (QIX.IDLE 4160 . 8972) (QIX.MOVE.POINT 8974 . 10356) (
+QIX.PLAY 10358 . 11042)))))
 STOP
diff --git a/lispusers/QIX.LCOM b/lispusers/QIX.LCOM
index a9c3baf4..f2d28cc1 100644
Binary files a/lispusers/QIX.LCOM and b/lispusers/QIX.LCOM differ
diff --git a/lispusers/READBRUSH b/lispusers/READBRUSH
index 50959032..c298a0ca 100644
--- a/lispusers/READBRUSH
+++ b/lispusers/READBRUSH
@@ -1,11 +1,14 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED " 6-Nov-92 09:25:48" {DSK}<project>medley2.0>lispusers>READBRUSH.;1 9607   
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      previous date%: "23-Jun-88 02:13:42" {DSK}<import>lisp>medley>lispusers>readbrush.;1)
+(FILECREATED "24-Aug-2022 07:58:48" {DSK}<home>larry>medley>lispusers>READBRUSH.;2 9288   
+
+      :CHANGES-TO (FNS IDLE.GLIDING.BOX)
+
+      :PREVIOUS-DATE " 6-Nov-92 09:25:48" {DSK}<home>larry>medley>lispusers>READBRUSH.;1)
 
 
 (* ; "
-Copyright (c) 1984, 1985, 1986, 1988, 1992 by Xerox Corporation.  All rights reserved.
+Copyright (c) 1984-1986, 1988, 1992 by Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT READBRUSHCOMS)
@@ -93,17 +96,18 @@ Copyright (c) 1984, 1985, 1986, 1988, 1992 by Xerox Corporation.  All rights res
                                         'PRESS])
 
 (IDLE.GLIDING.BOX
-  [LAMBDA (WIN BITMAPS WAIT WAITSEQ MAXD)             (* ; "Edited 23-Jun-88 01:53 by masinter")
+  [LAMBDA (WIN BITMAPS WAIT WAITSEQ MAXD)                  (* ; "Edited 24-Aug-2022 07:57 by larry")
+                                                          (* ; "Edited 23-Jun-88 01:53 by masinter")
     (OR BITMAPS (SETQ BITMAPS IDLE.BOUNCING.BOX))
     [OR WIN (SETQ WIN (OR POLYGONSWINDOW (SETQ POLYGONSWINDOW (CREATEW]
     (OR MAXD (SETQ MAXD 4))
+    (OR WAIT (SETQ WAIT 50))
     [SETQ BITMAPS (for X inside BITMAPS
                      collect (if (LITATOM X)
-                                     then [OR (GETPROP X 'BITMAP)
-                                                  (PUTPROP X 'BITMAP (OR (CAR (READBRUSHFILE
-                                                                               X))
-                                                                         (BITMAPCREATE 10 10]
-                                   else (IDLE.BITMAP NIL X]
+                                 then [OR (GETPROP X 'BITMAP)
+                                          (PUTPROP X 'BITMAP (OR (CAR (READBRUSHFILE X))
+                                                                 (BITMAPCREATE 10 10]
+                               else (IDLE.BITMAP NIL X]
     (LET ((W (for X in BITMAPS largest (BITMAPWIDTH X) finally (RETURN $$EXTREME)))
           (H (for X in BITMAPS largest (BITMAPHEIGHT X) finally (RETURN $$EXTREME)))
           (REG (DSPCLIPPINGREGION NIL WIN)))
@@ -123,51 +127,49 @@ Copyright (c) 1984, 1985, 1986, 1988, 1992 by Xerox Corporation.  All rights res
               (BITBLT (SETQ THISBITMAP (CAR BITMAPS))
                      NIL NIL WIN X Y NIL NIL NIL 'INVERT)
               (while T do [COND
-                                     ((ILEQ CNT 0)
-                                      (SETQ ORIGX X)
-                                      (SETQ ORIGY Y)
-                                      (SETQ TOX (RAND 1 (SUB1 MAXX)))
-                                      (SETQ TOY (RAND 1 (SUB1 MAXY)))
-                                      (SETQ CNT (SETQ STEPS
-                                                 (QUOTIENT (PLUS (MAX (ABS (DIFFERENCE TOX X))
-                                                                      (ABS (DIFFERENCE TOY Y)))
-                                                                 MAXD -1)
-                                                        MAXD)))
-                                      (QUOTIENT (PLUS (ABS (DIFFERENCE TOX X))
-                                                      STEPS -1)
-                                             STEPS))
-                                     (T (SETQ CNT (SUB1 CNT]
-                                 (SETQ NEWX (PLUS (QUOTIENT (TIMES CNT (DIFFERENCE ORIGX TOX))
-                                                         STEPS)
-                                                  TOX))
-                                 (if (GREATERP (ABS (SETQ DX (DIFFERENCE NEWX X)))
-                                                MAXD)
-                                     then (SHOULDNT))
-                                 (SETQ NEWY (PLUS (QUOTIENT (TIMES CNT (DIFFERENCE ORIGY TOY))
-                                                         STEPS)
-                                                  TOY))
-                                 (if (GREATERP (ABS (SETQ DY (DIFFERENCE NEWY Y)))
-                                                MAXD)
-                                     then (SHOULDNT))
-                                 (BITBLT NIL NIL NIL XBM NIL NIL NIL NIL 'TEXTURE 'ERASE BLACKSHADE)
-                                 (BITBLT THISBITMAP NIL NIL XBM MAXD MAXD NIL NIL NIL 'INVERT)
-                                 (BITBLT THISBITMAP NIL NIL XBM (PLUS MAXD DX)
-                                        (PLUS MAXD DY)
-                                        NIL NIL NIL 'INVERT)
-                                 (BITBLT XBM NIL NIL WIN (DIFFERENCE X MAXD)
-                                        (DIFFERENCE Y MAXD)
-                                        NIL NIL NIL 'INVERT)
-                                 (add X DX)
-                                 (add Y DY)
-                                 (DISMISS WAIT])
+                             ((ILEQ CNT 0)
+                              (SETQ ORIGX X)
+                              (SETQ ORIGY Y)
+                              (SETQ TOX (RAND 1 (SUB1 MAXX)))
+                              (SETQ TOY (RAND 1 (SUB1 MAXY)))
+                              (SETQ CNT (SETQ STEPS (QUOTIENT (PLUS (MAX (ABS (DIFFERENCE TOX X))
+                                                                         (ABS (DIFFERENCE TOY Y)))
+                                                                    MAXD -1)
+                                                           MAXD)))
+                              (QUOTIENT (PLUS (ABS (DIFFERENCE TOX X))
+                                              STEPS -1)
+                                     STEPS))
+                             (T (SETQ CNT (SUB1 CNT]
+                          (SETQ NEWX (PLUS (QUOTIENT (TIMES CNT (DIFFERENCE ORIGX TOX))
+                                                  STEPS)
+                                           TOX))
+                          (if (GREATERP (ABS (SETQ DX (DIFFERENCE NEWX X)))
+                                     MAXD)
+                              then (SHOULDNT))
+                          (SETQ NEWY (PLUS (QUOTIENT (TIMES CNT (DIFFERENCE ORIGY TOY))
+                                                  STEPS)
+                                           TOY))
+                          (if (GREATERP (ABS (SETQ DY (DIFFERENCE NEWY Y)))
+                                     MAXD)
+                              then (SHOULDNT))
+                          (BITBLT NIL NIL NIL XBM NIL NIL NIL NIL 'TEXTURE 'ERASE BLACKSHADE)
+                          (BITBLT THISBITMAP NIL NIL XBM MAXD MAXD NIL NIL NIL 'INVERT)
+                          (BITBLT THISBITMAP NIL NIL XBM (PLUS MAXD DX)
+                                 (PLUS MAXD DY)
+                                 NIL NIL NIL 'INVERT)
+                          (BITBLT XBM NIL NIL WIN (DIFFERENCE X MAXD)
+                                 (DIFFERENCE Y MAXD)
+                                 NIL NIL NIL 'INVERT)
+                          (add X DX)
+                          (add Y DY)
+                          (DISMISS WAIT])
 )
 
 (FILESLOAD BITMAPFNS)
 
 (ADDTOVAR IDLE.FUNCTIONS ["Gliding box" 'IDLE.GLIDING.BOX "moves images around on the screen"
-                                    (SUBITEMS ("Pick image from MesaHacks" (PROGN (CHOOSE.IDLE.BITMAP
-                                                                                   )
-                                                                                  'IDLE.GLIDING.BOX])
+                                (SUBITEMS ("Pick image from MesaHacks" (PROGN (CHOOSE.IDLE.BITMAP)
+                                                                              'IDLE.GLIDING.BOX])
 
 (RPAQ? IDLE.BITMAP )
 
@@ -178,6 +180,6 @@ Copyright (c) 1984, 1985, 1986, 1988, 1992 by Xerox Corporation.  All rights res
 (RPAQ? BRUSHDIRECTORY "{goofy:osbu north:xerox}<hacks>data>brushes>")
 (PUTPROPS READBRUSH COPYRIGHT ("Xerox Corporation" 1984 1985 1986 1988 1992))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1444 8940 (CHOOSE.IDLE.BITMAP 1454 . 2452) (READBRUSHFILE 2454 . 3500) (READBRUSH 3502
- . 4314) (READROOTPICTURE 4316 . 4655) (IDLE.GLIDING.BOX 4657 . 8938)))))
+  (FILEMAP (NIL (1467 8713 (CHOOSE.IDLE.BITMAP 1477 . 2475) (READBRUSHFILE 2477 . 3523) (READBRUSH 3525
+ . 4337) (READROOTPICTURE 4339 . 4678) (IDLE.GLIDING.BOX 4680 . 8711)))))
 STOP
diff --git a/lispusers/READBRUSH.LCOM b/lispusers/READBRUSH.LCOM
index f4099058..49b09215 100644
Binary files a/lispusers/READBRUSH.LCOM and b/lispusers/READBRUSH.LCOM differ
diff --git a/lispusers/SCREENPAPER b/lispusers/SCREENPAPER
index b2cf62fd..63e87ba5 100644
--- a/lispusers/SCREENPAPER
+++ b/lispusers/SCREENPAPER
@@ -1,23 +1,96 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED " 5-Aug-88 15:17:16" |{POGO:AISNORTH:XEROX}<ROOMS>MEDLEY>USERS>SCREENPAPER.;1| 10019  
 
-      changes to%:  (FNS SCREENPAPER KALSHOW SCREENPAPERNEWREGIONFN) (VARS SCREENPAPERCOMS)
+(FILECREATED "24-Aug-2022 07:49:42" {DSK}<home>larry>medley>lispusers>SCREENPAPER.;2 12374  
 
-      previous date%: " 4-Aug-88 13:46:25" {ERINYES}<LISPUSERS>MEDLEY>SCREENPAPER.;4)
+      :CHANGES-TO (FNS SCREENPAPER)
+
+      :PREVIOUS-DATE " 5-Aug-88 15:17:16" {DSK}<home>larry>medley>lispusers>SCREENPAPER.;1)
 
 
-(* "
-Copyright (c) 1901, 1986, 1988 by Xerox Corporation.  All rights reserved.
+(* ; "
+Copyright (c) 1901, 1986, 1988 by Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT SCREENPAPERCOMS)
 
-(RPAQQ SCREENPAPERCOMS ((FNS SCREENPAPER SCREENPAPERNEWREGIONFN KALSHOW DOPOINT MAPN) (ADDVARS (IDLE.FUNCTIONS ("Screen wallpaper" (QUOTE SCREENPAPER)))) (* ;;; "faster versions of editbitmap functions") (FNS INVERT.BITMAP.HORIZONTALLY INVERT.BITMAP.VERTICALLY ROTATE.BITMAP) (VARS SCREENPAPERSIZE SCREENPERIOD SCREENREPEAT)))
+(RPAQQ SCREENPAPERCOMS
+       ((FNS SCREENPAPER SCREENPAPERNEWREGIONFN KALSHOW DOPOINT MAPN)
+        [ADDVARS (IDLE.FUNCTIONS ("Screen wallpaper" 'SCREENPAPER]
+        
+
+(* ;;; "faster versions of editbitmap functions")
+
+        (FNS INVERT.BITMAP.HORIZONTALLY INVERT.BITMAP.VERTICALLY ROTATE.BITMAP)
+        (VARS SCREENPAPERSIZE SCREENPERIOD SCREENREPEAT)))
 (DEFINEQ
 
 (SCREENPAPER
-(LAMBDA (WINDOW REGION.OR.SIZE OPTION) (* ; "Edited  5-Aug-88 15:07 by drc:") (OR WINDOW (SETQ WINDOW (CREATEW))) (OR REGION.OR.SIZE (SETQ REGION.OR.SIZE (if (EQ OPTION (QUOTE PICK)) then (GETREGION 0 0 NIL (FUNCTION SCREENPAPERNEWREGIONFN)) else SCREENPAPERSIZE))) (LET ((SIZE (if (REGIONP REGION.OR.SIZE) then (fetch (REGION WIDTH) REGION.OR.SIZE) else REGION.OR.SIZE)) TRIANGLE STREAM BUF1 2SIZE BIGBUF PBT BUF1A BUF2 BUF3 BUF4 CX CY (CNT SCREENPERIOD)) (DECLARE (SPECVARS TRIANGLE STREAM BUF1 2SIZE BIGBUF PBT BUF1A BUF2 BUF3 BUF4 CX CY CNT)) (SETQ TRIANGLE (BITMAPCREATE SIZE SIZE)) (SETQ BUF1 (BITMAPCREATE SIZE SIZE)) (SETQ STREAM (DSPCREATE TRIANGLE)) (FILLPOLYGON (LIST (QUOTE (-1 . -1)) (CONS SIZE SIZE) (CONS -1 SIZE)) BLACKSHADE STREAM) (SETQ BUF2 (BITMAPCREATE SIZE SIZE)) (SETQ BUF3 (BITMAPCREATE SIZE SIZE)) (SETQ 2SIZE (PLUS SIZE SIZE)) (SETQ BIGBUF (BITMAPCREATE 2SIZE 2SIZE)) (SETQ PBT (create PILOTBBT)) (DSPDESTINATION BUF1 STREAM) (if (EQ OPTION (QUOTE PICK)) then (bind POS do (RESETFORM (CURSOR CROSSHAIRS) (until (MOUSESTATE (OR LEFT MIDDLE RIGHT)))) (if (LASTMOUSESTATE (ONLY MIDDLE)) then (RETURN BIGBUF) elseif (LASTMOUSESTATE (ONLY RIGHT)) then (RETURN NIL) elseif (REGIONP REGION.OR.SIZE) then (SETQ POS (CONS (fetch (REGION LEFT) REGION.OR.SIZE) (fetch (REGION BOTTOM) REGION.OR.SIZE))) (SETQ REGION.OR.SIZE) else (SETQ POS (GETBOXPOSITION SIZE SIZE))) (BITBLT (SCREENBITMAP) (CAR POS) (CDR POS) BUF1 0 0 SIZE SIZE) (KALSHOW BUF1 WINDOW SIZE (if (SHIFTDOWNP (QUOTE SHIFT)) then (QUOTE INVERT) else NIL))) else (MAPN WINDOW (FUNCTION (LAMBDA (X Y) (BITBLT (WINDOWPROP WINDOW (QUOTE IMAGECOVERED)) X Y BUF1 0 0 SIZE SIZE) (DRAWLINE (SUB1 SIZE) 0 (RAND 0 (SUB1 SIZE)) (RAND 0 (SUB1 SIZE)) 1 (QUOTE INVERT) STREAM) (KALSHOW BUF1 WINDOW SIZE (if (VIDEOCOLOR) then NIL else (QUOTE INVERT))) (if (LEQ (add CNT -1) 0) then (SETQ CNT SCREENPERIOD) (to SCREENREPEAT do (BITBLT WINDOW 0 0 BUF1) (KALSHOW BUF1 WINDOW SIZE)))))))))
-)
+  [LAMBDA (WINDOW REGION.OR.SIZE OPTION)                   (* ; "Edited 24-Aug-2022 07:46 by larry")
+                                                             (* ; "Edited  5-Aug-88 15:07 by drc:")
+    (OR WINDOW (SETQ WINDOW (CREATEW)))
+    (OR REGION.OR.SIZE (SETQ REGION.OR.SIZE (if (EQ OPTION 'PICK)
+                                                then (GETREGION 0 0 NIL (FUNCTION 
+                                                                         SCREENPAPERNEWREGIONFN))
+                                              else SCREENPAPERSIZE)))
+    (LET ((SIZE (if (REGIONP REGION.OR.SIZE)
+                    then (fetch (REGION WIDTH)
+                                REGION.OR.SIZE)
+                  else REGION.OR.SIZE))
+          TRIANGLE STREAM BUF1 2SIZE BIGBUF PBT BUF1A BUF2 BUF3 BUF4 CX CY (CNT SCREENPERIOD))
+         (DECLARE (SPECVARS TRIANGLE STREAM BUF1 2SIZE BIGBUF PBT BUF1A BUF2 BUF3 BUF4 CX CY CNT))
+         (SETQ TRIANGLE (BITMAPCREATE SIZE SIZE))
+         (SETQ BUF1 (BITMAPCREATE SIZE SIZE))
+         (SETQ STREAM (DSPCREATE TRIANGLE))
+         (FILLPOLYGON (LIST '(-1 . -1)
+                            (CONS SIZE SIZE)
+                            (CONS -1 SIZE))
+                BLACKSHADE STREAM)
+         (SETQ BUF2 (BITMAPCREATE SIZE SIZE))
+         (SETQ BUF3 (BITMAPCREATE SIZE SIZE))
+         (SETQ 2SIZE (PLUS SIZE SIZE))
+         (SETQ BIGBUF (BITMAPCREATE 2SIZE 2SIZE))
+         (SETQ PBT (create PILOTBBT))
+         (DSPDESTINATION BUF1 STREAM)
+         (if (EQ OPTION 'PICK)
+             then (bind POS do [RESETFORM (CURSOR CROSSHAIRS)
+                                      (until (MOUSESTATE (OR LEFT MIDDLE RIGHT]
+                               (if (LASTMOUSESTATE (ONLY MIDDLE))
+                                   then (RETURN BIGBUF)
+                                 elseif (LASTMOUSESTATE (ONLY RIGHT))
+                                   then (RETURN NIL)
+                                 elseif (REGIONP REGION.OR.SIZE)
+                                   then (SETQ POS (CONS (fetch (REGION LEFT)
+                                                               REGION.OR.SIZE)
+                                                        (fetch (REGION BOTTOM)
+                                                               REGION.OR.SIZE)))
+                                        (SETQ REGION.OR.SIZE)
+                                 else (SETQ POS (GETBOXPOSITION SIZE SIZE)))
+                               (BITBLT (SCREENBITMAP)
+                                      (CAR POS)
+                                      (CDR POS)
+                                      BUF1 0 0 SIZE SIZE)
+                               (KALSHOW BUF1 WINDOW SIZE (if (SHIFTDOWNP 'SHIFT)
+                                                             then 'INVERT
+                                                           else NIL)))
+           else (MAPN WINDOW (FUNCTION (LAMBDA (X Y)
+                                         (BITBLT (WINDOWPROP WINDOW 'IMAGECOVERED)
+                                                X Y BUF1 0 0 SIZE SIZE)
+                                         (DRAWLINE (SUB1 SIZE)
+                                                0
+                                                (RAND 0 (SUB1 SIZE))
+                                                (RAND 0 (SUB1 SIZE))
+                                                1
+                                                'INVERT STREAM)
+                                         (KALSHOW BUF1 WINDOW SIZE (if (VIDEOCOLOR)
+                                                                       then NIL
+                                                                     else 'INVERT))
+                                         (BLOCK 100)
+                                         (if (LEQ (add CNT -1)
+                                                  0)
+                                             then (SETQ CNT SCREENPERIOD)
+                                                  (to SCREENREPEAT
+                                                     do (BITBLT WINDOW 0 0 BUF1)
+                                                        (KALSHOW BUF1 WINDOW SIZE])
 
 (SCREENPAPERNEWREGIONFN
 (LAMBDA (FP MP) (* BN "17-Sep-84 10:40") (COND (MP (with POSITION MP (PROG ((DX (IDIFFERENCE XCOORD (fetch (POSITION XCOORD) of FP))) (DY (IDIFFERENCE YCOORD (fetch (POSITION YCOORD) of FP)))) (COND ((IGREATERP (IABS DX) (IABS DY)) (SETQ YCOORD (IPLUS (fetch (POSITION YCOORD) of FP) (ITIMES DX (COND ((MINUSP (ITIMES DX DY)) -1) (T 1)))))) (T (SETQ XCOORD (IPLUS (fetch (POSITION XCOORD) of FP) (ITIMES DY (COND ((MINUSP (ITIMES DX DY)) -1) (T 1))))))) (RETURN MP)))) (T FP)))
@@ -66,7 +139,7 @@ Copyright (c) 1901, 1986, 1988 by Xerox Corporation.  All rights reserved.
                               (SETQ Y NY])
 )
 
-(ADDTOVAR IDLE.FUNCTIONS ("Screen wallpaper" (QUOTE SCREENPAPER)))
+(ADDTOVAR IDLE.FUNCTIONS ("Screen wallpaper" 'SCREENPAPER))
 
 
 
@@ -142,14 +215,14 @@ Copyright (c) 1901, 1986, 1988 by Xerox Corporation.  All rights reserved.
     BM2])
 )
 
-(RPAQQ SCREENPAPERSIZE 64)
+(RPAQQ SCREENPAPERSIZE 64)
 
-(RPAQQ SCREENPERIOD 100)
+(RPAQQ SCREENPERIOD 100)
 
-(RPAQQ SCREENREPEAT 0)
+(RPAQQ SCREENREPEAT 0)
 (PUTPROPS SCREENPAPER COPYRIGHT ("Xerox Corporation" 1901 1986 1988))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (805 5979 (SCREENPAPER 815 . 2782) (SCREENPAPERNEWREGIONFN 2784 . 3291) (KALSHOW 3293 . 
-4283) (DOPOINT 4285 . 4657) (MAPN 4659 . 5977)) (6106 9848 (INVERT.BITMAP.HORIZONTALLY 6116 . 7233) (
-INVERT.BITMAP.VERTICALLY 7235 . 8611) (ROTATE.BITMAP 8613 . 9846)))))
+  (FILEMAP (NIL (770 8325 (SCREENPAPER 780 . 5128) (SCREENPAPERNEWREGIONFN 5130 . 5637) (KALSHOW 5639 . 
+6629) (DOPOINT 6631 . 7003) (MAPN 7005 . 8323)) (8449 12191 (INVERT.BITMAP.HORIZONTALLY 8459 . 9576) (
+INVERT.BITMAP.VERTICALLY 9578 . 10954) (ROTATE.BITMAP 10956 . 12189)))))
 STOP
diff --git a/lispusers/SCREENPAPER.LCOM b/lispusers/SCREENPAPER.LCOM
index 88f3b4c9..257b5ac7 100644
Binary files a/lispusers/SCREENPAPER.LCOM and b/lispusers/SCREENPAPER.LCOM differ
diff --git a/lispusers/SOLITAIRE b/lispusers/SOLITAIRE
index 4c2e7974..6c5c8f8d 100644
--- a/lispusers/SOLITAIRE
+++ b/lispusers/SOLITAIRE
@@ -1,577 +1,553 @@
-(FILECREATED "15-Jan-86 23:32:05" {ERIS}<LISPUSERS>KOTO>SOLITAIRE.;5 23494  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to:  (VARS SOLITAIRECOMS)
-		   (FNS SOLO DEALDECK NXTCARD CARDIMAGE COUNTCARDS GOODMOVE? MOVESSS CARDNAME 
-			CREATEHAND CREATESTACK STACKLOC POSTVALUE)
-		   (MACROS KINGP)
+(FILECREATED "24-Aug-2022 08:54:17" {DSK}<home>larry>medley>lispusers>SOLITAIRE.;2 26883  
 
-      previous date: "15-Dec-85 22:01:18" {ERIS}<LISPUSERS>KOTO>SOLITAIRE.;3)
+      :CHANGES-TO (FNS SOLO DEALDECK GETCARD)
+                  (VARS SOLITAIRECOMS)
+
+      :PREVIOUS-DATE "15-Jan-86 23:32:05" {DSK}<home>larry>medley>lispusers>SOLITAIRE.;1)
 
 
-(* Copyright (c) 1982, 1985, 1986 by Xerox Corporation. All rights reserved.)
+(* ; "
+Copyright (c) 1982, 1985-1986 by Xerox Corporation.
+")
 
 (PRETTYCOMPRINT SOLITAIRECOMS)
 
-(RPAQQ SOLITAIRECOMS [(FNS SOLO SOLITAIRE)
-	(FNS CARDIMAGE COUNTCARDS CREATEHAND CREATESTACK DEALDECK FLIPSTACK GETCARD GOODMOVE? HTOS? 
-	     MOVECARD DOMOVE MOVEHS MOVES MOVES1 UPCARD MOVESSS NXTCARD PUSHCARD POSTVALUE 
-	     SEARCHSTACKS SHOWCARDSTACK SHUFFLEDECK STACKLOC STOS? TOPSUITSTACK)
-	(FNS HIST ARRAYMAX)
-	(DECLARE: DONTCOPY (FNS SHOWCONFIG PRINTCARDSTACK CARDNAME))
-	(DECLARE: EVAL@COMPILE DONTCOPY (MACROS BOTTOM KINGP STACK TOP)
-		  (RECORDS CARD CARDSTACK)
-		  (CONSTANTS (Spades 0)
-			     (Clubs 1)
-			     (Diamonds 2)
-			     (Hearts 3)
-			     (CostOfDeck 50)
-			     (PayForCard 5)
-			     (NStacks 7)
-			     (NSuits 4)
-			     (CardsPerSuit 13)
-			     (TotalCards 52))
-		  (CONSTANTS (BACKSHADE 52275)
-			     (BetweenStacks 2)
-			     (Overlap .667)
-			     (CardWidth 30)
-			     (CardHeight 45))
-		  (GLOBALVARS HAND STACKS SUITSTACKS DECK SOLORESULTS)
-		  (GLOBALVARS MaxCardMove WaitBetweenMoves))
-	(INITRECORDS CARD CARDSTACK)
-	(BITMAPS SpadesBits ClubsBits DiamondsBits HeartsBits 10Bits)
-	(INITVARS (MaxCardMove 8)
-		  (WaitBetweenMoves 10)
-		  (DECK)
-		  (SOLORESULTS))
-	(ADDVARS (IDLE.FUNCTIONS ("Solitaire" (QUOTE SOLO])
+(RPAQQ SOLITAIRECOMS
+       [(FNS SOLO SOLITAIRE)
+        (FNS CARDIMAGE COUNTCARDS CREATEHAND CREATESTACK DEALDECK FLIPSTACK GETCARD GOODMOVE? HTOS? 
+             MOVECARD DOMOVE MOVEHS MOVES MOVES1 UPCARD MOVESSS NXTCARD PUSHCARD POSTVALUE 
+             SEARCHSTACKS SHOWCARDSTACK SHUFFLEDECK STACKLOC STOS? TOPSUITSTACK)
+        (FNS HIST ARRAYMAX)
+        (DECLARE%: DONTCOPY (FNS SHOWCONFIG PRINTCARDSTACK CARDNAME))
+        (DECLARE%: EVAL@COMPILE DONTCOPY (MACROS BOTTOM KINGP STACK TOP)
+               (RECORDS CARD CARDSTACK)
+               (CONSTANTS (Spades 0)
+                      (Clubs 1)
+                      (Diamonds 2)
+                      (Hearts 3)
+                      (CostOfDeck 50)
+                      (PayForCard 5)
+                      (NStacks 7)
+                      (NSuits 4)
+                      (CardsPerSuit 13)
+                      (TotalCards 52))
+               (CONSTANTS (BACKSHADE 52275)
+                      (BetweenStacks 2)
+                      (Overlap 0.667)
+                      (CardWidth 30)
+                      (CardHeight 45))
+               (GLOBALVARS HAND STACKS SUITSTACKS DECK SOLORESULTS)
+               (GLOBALVARS MaxCardMove WaitBetweenMoves))
+        (INITRECORDS CARD CARDSTACK)
+        (BITMAPS SpadesBits ClubsBits DiamondsBits HeartsBits 10Bits)
+        (INITVARS (MaxCardMove 8)
+               (WaitBetweenMoves 100)
+               (DECK)
+               (SOLORESULTS))
+        (ADDVARS (IDLE.FUNCTIONS ("Solitaire" 'SOLO])
 (DEFINEQ
 
 (SOLO
-  [LAMBDA (W)                                                (* bas: "15-Jan-86 23:31")
-    (if (AND (BOUNDP (QUOTE SOLORESULTS))
-		 (ARRAYP SOLORESULTS))
-      else (SETQ SOLORESULTS (ARRAY (ADD1 TotalCards)
-					  (QUOTE FIXP)
-					  0 0)))
-    (if (WINDOWP W)
-      else (SETQ W (CREATEW [GETREGION (CONSTANT (ITIMES (IPLUS BetweenStacks
-									      (ITIMES NStacks
-											(ADD1
-											  
-										    BetweenStacks)))
-								     CardWidth))
-					       (CONSTANT (ITIMES CardHeight
-								     (IPLUS 5 (FTIMES 
-										     CardsPerSuit 
-											  Overlap]
-				  "Just waiting Patiently..."))
-	     (DSPTEXTURE 1088 W)
-	     (DSPFONT (FONTCREATE (QUOTE HELVETICA)
-				      18)
-			W))
-    (bind X
-       do (SETQ X (SOLITAIRE W))
-	    (DISMISS 1500)
-	    (SETA SOLORESULTS X (ADD1 (ELT SOLORESULTS X)))
-	    (HIST SOLORESULTS W "Number of cards up")
-	    (DISMISS 1500])
+  [LAMBDA (W)                                                (* bas%: "15-Jan-86 23:31")
+    (if (AND (BOUNDP 'SOLORESULTS)
+             (ARRAYP SOLORESULTS))
+      else (SETQ SOLORESULTS (ARRAY (ADD1 TotalCards)
+                                    'FIXP 0 0)))
+    (if (WINDOWP W)
+      else (SETQ W (CREATEW [GETREGION (CONSTANT (ITIMES (IPLUS BetweenStacks (ITIMES NStacks
+                                                                                     (ADD1 
+                                                                                        BetweenStacks
+                                                                                           )))
+                                                        CardWidth))
+                                   (CONSTANT (ITIMES CardHeight (IPLUS 5 (FTIMES CardsPerSuit Overlap
+                                                                                ]
+                          "Just waiting Patiently..."))
+           (DSPTEXTURE 1088 W)
+           (DSPFONT (FONTCREATE 'HELVETICA 18)
+                  W))
+    (bind X do (SETQ X (SOLITAIRE W))
+               (DISMISS 1500)
+               (SETA SOLORESULTS X (ADD1 (ELT SOLORESULTS X)))
+               (HIST SOLORESULTS W "Number of cards up")
+               (DISMISS 1500])
 
 (SOLITAIRE
-  [LAMBDA (SOLOW REPLAY)                                     (* bas: "15-Dec-85 21:33")
-    (DECLARE (SPECVARS SOLOW))
-    (CLEARW SOLOW)
+  [LAMBDA (SOLOW REPLAY)                                     (* bas%: "15-Dec-85 21:33")
+    (DECLARE (SPECVARS SOLOW))
+    (CLEARW SOLOW)
     (DEALDECK REPLAY)
-    (PROG ((GAMEVALUE (IMINUS CostOfDeck)))
-	    (DECLARE (SPECVARS GAMEVALUE))
-	    (POSTVALUE GAMEVALUE)
-	    (while (OR [for I from NStacks to 1 by -1 thereis
-								   (MOVES (STACK I)
-									    (STOS? (STACK I]
-			   (MOVESSS HAND)
-			   (MOVEHS HAND (HTOS? HAND))
-			   (for I to NStacks thereis (MOVESSS (STACK I)))
-			   (FLIPSTACK HAND))
-	       do (DISMISS WaitBetweenMoves)))
+    (PROG ((GAMEVALUE (IMINUS CostOfDeck)))
+          (DECLARE (SPECVARS GAMEVALUE))
+          (POSTVALUE GAMEVALUE)
+          (while (OR [for I from NStacks to 1 by -1 thereis (MOVES (STACK I)
+                                                                   (STOS? (STACK I]
+                     (MOVESSS HAND)
+                     (MOVEHS HAND (HTOS? HAND))
+                     (for I to NStacks thereis (MOVESSS (STACK I)))
+                     (FLIPSTACK HAND)) do (DISMISS WaitBetweenMoves)))
     (COUNTCARDS])
 )
 (DEFINEQ
 
 (CARDIMAGE
-  [LAMBDA (C)                                                (* bas: "15-Jan-86 21:37")
-    (PROG [(BM (BITMAPCREATE CardWidth CardHeight))
-	     (SUITBM (SELECTQ (fetch SUIT of C)
-				(0 SpadesBits)
-				(1 ClubsBits)
-				(2 DiamondsBits)
-				(3 HeartsBits)
-				(SHOULDNT)))
-	     (RANKBM (if (EQ 10 (fetch (CARD RANK) of C))
-			 then 10Bits
-		       else (GETCHARBITMAP (SELECTQ (fetch (CARD RANK) of C)
-							  (13 (CHARCODE K))
-							  (12 (CHARCODE Q))
-							  (11 (CHARCODE J))
-							  (IPLUS (fetch (CARD RANK) of C)
-								   (CHARCODE 0)))
-					       (FONTCREATE (QUOTE HELVETICA)
-							     18]
-	    (BLTSHADE BLACKSHADE BM 0 0 CardWidth CardHeight (QUOTE REPLACE))
-	    (BLTSHADE WHITESHADE BM 1 1 (IDIFFERENCE CardWidth 2)
-			(IDIFFERENCE CardHeight 2)
-			(QUOTE REPLACE))
-	    (BITBLT SUITBM 0 0 BM 2 32 NIL NIL (QUOTE INPUT)
-		      (QUOTE REPLACE))
-	    (BITBLT RANKBM 0 0 BM (IQUOTIENT (IDIFFERENCE CardWidth (fetch BITMAPWIDTH
-									     of RANKBM))
-						 2)
-		      (IQUOTIENT (IDIFFERENCE CardHeight (fetch BITMAPHEIGHT of RANKBM))
-				   2)
-		      NIL NIL (QUOTE INPUT)
-		      (QUOTE REPLACE))
-	    (BITBLT SUITBM 0 0 BM 17 3 NIL NIL (QUOTE INPUT)
-		      (QUOTE REPLACE))
-	    (RETURN BM])
+  [LAMBDA (C)                                                (* bas%: "15-Jan-86 21:37")
+    (PROG [(BM (BITMAPCREATE CardWidth CardHeight))
+           (SUITBM (SELECTQ (fetch SUIT of C)
+                       (0 SpadesBits)
+                       (1 ClubsBits)
+                       (2 DiamondsBits)
+                       (3 HeartsBits)
+                       (SHOULDNT)))
+           (RANKBM (if (EQ 10 (fetch (CARD RANK) of C))
+                       then 10Bits
+                     else (GETCHARBITMAP (SELECTQ (fetch (CARD RANK) of C)
+                                             (13 (CHARCODE K))
+                                             (12 (CHARCODE Q))
+                                             (11 (CHARCODE J))
+                                             (IPLUS (fetch (CARD RANK) of C)
+                                                    (CHARCODE 0)))
+                                 (FONTCREATE 'HELVETICA 18]
+          (BLTSHADE BLACKSHADE BM 0 0 CardWidth CardHeight 'REPLACE)
+          (BLTSHADE WHITESHADE BM 1 1 (IDIFFERENCE CardWidth 2)
+                 (IDIFFERENCE CardHeight 2)
+                 'REPLACE)
+          (BITBLT SUITBM 0 0 BM 2 32 NIL NIL 'INPUT 'REPLACE)
+          (BITBLT RANKBM 0 0 BM (IQUOTIENT (IDIFFERENCE CardWidth (fetch BITMAPWIDTH of RANKBM))
+                                       2)
+                 (IQUOTIENT (IDIFFERENCE CardHeight (fetch BITMAPHEIGHT of RANKBM))
+                        2)
+                 NIL NIL 'INPUT 'REPLACE)
+          (BITBLT SUITBM 0 0 BM 17 3 NIL NIL 'INPUT 'REPLACE)
+          (RETURN BM])
 
 (COUNTCARDS
-  [LAMBDA NIL                                                (* bas: "15-Jan-86 21:37")
+  [LAMBDA NIL                                                (* bas%: "15-Jan-86 21:37")
     (for S from Spades to Hearts sum (fetch (CARD RANK) of (TOPSUITSTACK S])
 
 (CREATEHAND
-  [LAMBDA (F)                                                (* bas: "15-Jan-86 23:25")
+  [LAMBDA (F)                                                (* bas%: "15-Jan-86 23:25")
     (FLIPSTACK (SHOWCARDSTACK (create CARDSTACK
-					    FACEUP _ NIL
-					    FACEDOWN _(for I from F to TotalCards
-							 collect (GETCARD I))
-					    CSX _(fetch CSX of (STACK 1))
-					    CSY _(FIX (FTIMES CardHeight .6))
-					    XO _(FIX (FTIMES CardWidth Overlap))
-					    YO _ 0])
+                                     FACEUP _ NIL
+                                     FACEDOWN _ (for I from F to TotalCards collect (GETCARD I))
+                                     CSX _ (fetch CSX of (STACK 1))
+                                     CSY _ (FIX (FTIMES CardHeight 0.6))
+                                     XO _ (FIX (FTIMES CardWidth Overlap))
+                                     YO _ 0])
 
 (CREATESTACK
-  [LAMBDA (N)                                                (* bas: "15-Jan-86 23:00")
+  [LAMBDA (N)                                                (* bas%: "15-Jan-86 23:00")
     (FLIPSTACK (SHOWCARDSTACK (create CARDSTACK
-					    FACEUP _ NIL
-					    FACEDOWN _(for I
-							 from (ADD1 (IQUOTIENT
-									  (ITIMES N (SUB1 N))
-									  2))
-							 as J to N collect (GETCARD I))
-					    CSX _(STACKLOC N NStacks)
-					    CSY _(ITIMES CardHeight (IPLUS 2 (FTIMES 
-										     CardsPerSuit 
-											  Overlap)))
-					    XO _ 0
-					    YO _(FIX (FTIMES CardHeight (FMINUS Overlap])
+                                     FACEUP _ NIL
+                                     FACEDOWN _ (for I from (ADD1 (IQUOTIENT (ITIMES N (SUB1 N))
+                                                                         2)) as J to N
+                                                   collect (GETCARD I))
+                                     CSX _ (STACKLOC N NStacks)
+                                     CSY _ (ITIMES CardHeight (IPLUS 2 (FTIMES CardsPerSuit Overlap))
+                                                  )
+                                     XO _ 0
+                                     YO _ (FIX (FTIMES CardHeight (FMINUS Overlap])
 
 (DEALDECK
-  [LAMBDA (REDEAL)                                           (* bas: "11-Jan-86 20:14")
-    (OR (AND REDEAL (ARRAYP DECK))
-	  (SHUFFLEDECK))
-    (SETQ SUITSTACKS (ARRAY NSuits (QUOTE POINTER)
-				(create CARD
-					  RANK _ 0)
-				0))
-    (SETQ STACKS (ARRAY NStacks (QUOTE POINTER)))
-    (for I to NStacks do (SETA STACKS I (CREATESTACK I)))
-    (SETQ HAND (CREATEHAND (CONSTANT (ADD1 (IQUOTIENT (ITIMES NStacks (ADD1 NStacks))
-								2])
+  [LAMBDA (REDEAL)                                           (* bas%: "11-Jan-86 20:14")
+    (OR (AND REDEAL (ARRAYP DECK))
+        (SHUFFLEDECK))
+    (SETQ SUITSTACKS (ARRAY NSuits 'POINTER (create CARD
+                                                   RANK _ 0)
+                            0))
+    (SETQ STACKS (ARRAY NStacks 'POINTER))
+    (for I to NStacks do (SETA STACKS I (CREATESTACK I)))
+    (SETQ HAND (CREATEHAND (CONSTANT (ADD1 (IQUOTIENT (ITIMES NStacks (ADD1 NStacks))
+                                                  2])
 
 (FLIPSTACK
-  [LAMBDA (H)                                                (* bas: "29-JUL-82 15:07")
+  [LAMBDA (H)                                                (* bas%: "29-JUL-82 15:07")
     (if (fetch FACEDOWN of H)
-	then (PUSHCARD H (NXTCARD H))
-	     H
+        then (PUSHCARD H (NXTCARD H))
+             H
       else NIL])
 
 (GETCARD
-  [LAMBDA (I)                                                (* bas: "30-JUL-82 19:04")
+  [LAMBDA (I)                                                (* bas%: "30-JUL-82 19:04")
     (PROG ((C (ELT DECK I)))
           (if (fetch FACE of C)
-	    else (replace FACE of C with (CARDIMAGE C))
-		 (replace SAV of C with (BITMAPCREATE CardWidth CardHeight)))
+            else (replace FACE of C with (CARDIMAGE C))
+                 (replace SAV of C with (BITMAPCREATE CardWidth CardHeight)))
           (replace CX of C with (replace CY of C with NIL))
           (RETURN C])
 
 (GOODMOVE?
-  [LAMBDA (TOP BOT)                                          (* bas: "15-Jan-86 21:38")
+  [LAMBDA (TOP BOT)                                          (* bas%: "15-Jan-86 21:38")
     (if TOP
-	then (AND (EQ (fetch (CARD RANK) of TOP)
-			    (ADD1 (fetch (CARD RANK) of BOT)))
-		      (NEQ (fetch (CARD COLOR) of TOP)
-			     (fetch (CARD COLOR) of BOT)))
+        then (AND (EQ (fetch (CARD RANK) of TOP)
+                      (ADD1 (fetch (CARD RANK) of BOT)))
+                  (NEQ (fetch (CARD COLOR) of TOP)
+                       (fetch (CARD COLOR) of BOT)))
       else (KINGP BOT])
 
 (HTOS?
-  [LAMBDA (H)                                                (* bas: "30-JUL-82 19:30")
+  [LAMBDA (H)                                                (* bas%: "30-JUL-82 19:30")
     (if (TOP H)
-	then (SEARCHSTACKS (TOP H])
+        then (SEARCHSTACKS (TOP H])
 
 (MOVECARD
-  [LAMBDA (C X Y)                                            (* lmm " 6-Aug-85 00:04")
+  [LAMBDA (C X Y)                                            (* lmm " 6-Aug-85 00:04")
     (if (fetch CX of C)
-	then (DOMOVE (fetch FACE of C)
-		     (fetch CX of C)
-		     (fetch CY of C)
-		     X Y (fetch SAV of C))
-      else (BITBLT SOLOW X Y (fetch SAV of C)
-		   NIL NIL NIL NIL (QUOTE INPUT)
-		   (QUOTE REPLACE))
-	   (BITBLT (fetch FACE of C)
-		   NIL NIL SOLOW X Y NIL NIL (QUOTE INPUT)
-		   (QUOTE REPLACE)))
+        then (DOMOVE (fetch FACE of C)
+                    (fetch CX of C)
+                    (fetch CY of C)
+                    X Y (fetch SAV of C))
+      else (BITBLT SOLOW X Y (fetch SAV of C)
+                  NIL NIL NIL NIL 'INPUT 'REPLACE)
+           (BITBLT (fetch FACE of C)
+                  NIL NIL SOLOW X Y NIL NIL 'INPUT 'REPLACE))
     (replace CX of C with X)
     (replace CY of C with Y)
     C])
 
 (DOMOVE
-  [LAMBDA (IMAGE LEFT BOTTOM NX NY SAVE)                     (* lmm " 6-Aug-85 00:04")
-    (PROG (N YWP YFP XWP XFP)
-          (SETQ N (IQUOTIENT (IPLUS (IMAX (ABS (IDIFFERENCE NX LEFT))
-					  (ABS (IDIFFERENCE NY BOTTOM)))
-				    (SUB1 MaxCardMove))
-			     MaxCardMove))                   (* Number of steps)
-          (SETQ XWP (IQUOTIENT (IDIFFERENCE NX LEFT)
-			       N))
-          (SETQ XFP (IREMAINDER (IDIFFERENCE NX LEFT)
-				N))
-          (SETQ YWP (IQUOTIENT (IDIFFERENCE NY BOTTOM)
-			       N))
-          (SETQ YFP (IREMAINDER (IDIFFERENCE NY BOTTOM)
-				N))
+  [LAMBDA (IMAGE LEFT BOTTOM NX NY SAVE)                     (* lmm " 6-Aug-85 00:04")
+    (PROG (N YWP YFP XWP XFP)
+          (SETQ N (IQUOTIENT (IPLUS (IMAX (ABS (IDIFFERENCE NX LEFT))
+                                          (ABS (IDIFFERENCE NY BOTTOM)))
+                                    (SUB1 MaxCardMove))
+                         MaxCardMove))                       (* Number of steps)
+          (SETQ XWP (IQUOTIENT (IDIFFERENCE NX LEFT)
+                           N))
+          (SETQ XFP (IREMAINDER (IDIFFERENCE NX LEFT)
+                           N))
+          (SETQ YWP (IQUOTIENT (IDIFFERENCE NY BOTTOM)
+                           N))
+          (SETQ YFP (IREMAINDER (IDIFFERENCE NY BOTTOM)
+                           N))
           (bind OLDLEFT OLDLOW (XFC _ 0)
-		(YFC _ 0) until (AND (EQ LEFT NX)
-				     (EQ BOTTOM NY))
-	     do (SETQ OLDLEFT LEFT)
-		(SETQ OLDLOW BOTTOM)
-		[add LEFT XWP (PROG1 (IQUOTIENT (add XFC XFP)
-						N)
-				     (SETQ XFC (IREMAINDER XFC N]
-		[add BOTTOM YWP (PROG1 (IQUOTIENT (add YFC YFP)
-						  N)
-				       (SETQ YFC (IREMAINDER YFC N]
-		(BITBLT SAVE 0 0 SOLOW OLDLEFT OLDLOW CardWidth CardHeight (QUOTE INPUT)
-			(QUOTE REPLACE))
-		(BITBLT SOLOW LEFT BOTTOM SAVE 0 0 CardWidth CardHeight (QUOTE INPUT)
-			(QUOTE REPLACE))
-		(BITBLT IMAGE 0 0 SOLOW LEFT BOTTOM CardWidth CardHeight (QUOTE INPUT)
-			(QUOTE REPLACE])
+                (YFC _ 0) until (AND (EQ LEFT NX)
+                                     (EQ BOTTOM NY))
+             do (SETQ OLDLEFT LEFT)
+                (SETQ OLDLOW BOTTOM)
+                [add LEFT XWP (PROG1 (IQUOTIENT (add XFC XFP)
+                                            N)
+                                  (SETQ XFC (IREMAINDER XFC N)))]
+                [add BOTTOM YWP (PROG1 (IQUOTIENT (add YFC YFP)
+                                              N)
+                                    (SETQ YFC (IREMAINDER YFC N)))]
+                (BITBLT SAVE 0 0 SOLOW OLDLEFT OLDLOW CardWidth CardHeight 'INPUT 'REPLACE)
+                (BITBLT SOLOW LEFT BOTTOM SAVE 0 0 CardWidth CardHeight 'INPUT 'REPLACE)
+                (BITBLT IMAGE 0 0 SOLOW LEFT BOTTOM CardWidth CardHeight 'INPUT 'REPLACE])
 
 (MOVEHS
-  [LAMBDA (H SN)                                             (* bas: "30-JUL-82 19:30")
+  [LAMBDA (H SN)                                             (* bas%: "30-JUL-82 19:30")
     (if SN
-	then (PUSHCARD SN (pop (fetch FACEUP of H)))
-	     (OR (TOP H)
-		 (FLIPSTACK H))
-	     SN])
+        then (PUSHCARD SN (pop (fetch FACEUP of H)))
+             (OR (TOP H)
+                 (FLIPSTACK H))
+             SN])
 
 (MOVES
-  [LAMBDA (S1 S2)                                            (* bas: "30-JUL-82 12:47")
+  [LAMBDA (S1 S2)                                            (* bas%: "30-JUL-82 12:47")
     (if S2
-	then (MOVES1 (fetch FACEUP of S1)
-		     NIL S2)
-	     (replace FACEUP of S1 with NIL)
-	     (FLIPSTACK S1)
-	     S2])
+        then (MOVES1 (fetch FACEUP of S1)
+                    NIL S2)
+             (replace FACEUP of S1 with NIL)
+             (FLIPSTACK S1)
+             S2])
 
 (MOVES1
-  [LAMBDA (L P S2)                                           (* bas: "30-JUL-82 19:12")
+  [LAMBDA (L P S2)                                           (* bas%: "30-JUL-82 19:12")
     (if L
-	then (MOVES1 (CDR L)
-		     (CAR L)
-		     S2)
-	     (UPCARD (CAR L)
-		     P)
-	     (PUSHCARD S2 (CAR L])
+        then (MOVES1 (CDR L)
+                    (CAR L)
+                    S2)
+             (UPCARD (CAR L)
+                    P)
+             (PUSHCARD S2 (CAR L])
 
 (UPCARD
-  [LAMBDA (X Y)                                              (* lmm " 6-Aug-85 00:04")
-                                                             (* Brings up X image which is assumed to be overlapped 
-							     by Y image. Assumes YOFFSET only)
+  [LAMBDA (X Y)                                              (* lmm " 6-Aug-85 00:04")
+
+         (* Brings up X image which is assumed to be overlapped by Y image.
+         Assumes YOFFSET only)
+
     (if Y
-	then (PROG [(DY (IDIFFERENCE (fetch CY of X)
-				     (fetch CY of Y]
-	           (BITBLT (fetch SAV of X)
-			   0 0 (fetch SAV of Y)
-			   0 DY CardWidth (IDIFFERENCE CardHeight DY)
-			   (QUOTE INPUT)
-			   (QUOTE REPLACE))
-	           (BITBLT SOLOW (fetch CX of X)
-			   (fetch CY of X)
-			   (fetch SAV of X)
-			   0 0 CardWidth (IDIFFERENCE CardHeight DY)
-			   (QUOTE INPUT)
-			   (QUOTE REPLACE))
-	           (BITBLT (fetch FACE of X)
-			   0 0 SOLOW (fetch CX of X)
-			   (fetch CY of X)
-			   CardWidth
-			   (IDIFFERENCE CardHeight DY)
-			   (QUOTE INPUT)
-			   (QUOTE REPLACE])
+        then (PROG [(DY (IDIFFERENCE (fetch CY of X)
+                               (fetch CY of Y]
+                   (BITBLT (fetch SAV of X)
+                          0 0 (fetch SAV of Y)
+                          0 DY CardWidth (IDIFFERENCE CardHeight DY)
+                          'INPUT
+                          'REPLACE)
+                   (BITBLT SOLOW (fetch CX of X)
+                          (fetch CY of X)
+                          (fetch SAV of X)
+                          0 0 CardWidth (IDIFFERENCE CardHeight DY)
+                          'INPUT
+                          'REPLACE)
+                   (BITBLT (fetch FACE of X)
+                          0 0 SOLOW (fetch CX of X)
+                          (fetch CY of X)
+                          CardWidth
+                          (IDIFFERENCE CardHeight DY)
+                          'INPUT
+                          'REPLACE])
 
 (MOVESSS
-  [LAMBDA (S)                                                (* bas: "15-Jan-86 23:23")
-    (PROG (STS (TS (TOP S)))
-	    (DECLARE (USEDFREE GAMEVALUE))
-	    (AND TS [EQ (fetch (CARD RANK) of TS)
-			    (ADD1 (fetch (CARD RANK) of (TOPSUITSTACK (SETQ STS
-										(fetch SUIT
-										   of TS]
-		   (PROGN [SETA SUITSTACKS STS (MOVECARD (pop (fetch FACEUP of S))
-							       (STACKLOC (ADD1 STS)
-									   NSuits)
-							       (IPLUS (fetch CSY
-									   of (STACK NStacks))
-									(FTIMES CardHeight 1.5]
-			    (OR (TOP S)
-				  (FLIPSTACK S))
-			    (POSTVALUE (add GAMEVALUE PayForCard))
-			    (RETURN T])
+  [LAMBDA (S)                                                (* bas%: "15-Jan-86 23:23")
+    (PROG (STS (TS (TOP S)))
+          (DECLARE (USEDFREE GAMEVALUE))
+          (AND TS [EQ (fetch (CARD RANK) of TS)
+                      (ADD1 (fetch (CARD RANK) of (TOPSUITSTACK (SETQ STS (fetch SUIT of TS]
+               (PROGN [SETA SUITSTACKS STS (MOVECARD (pop (fetch FACEUP of S))
+                                                  (STACKLOC (ADD1 STS)
+                                                         NSuits)
+                                                  (IPLUS (fetch CSY of (STACK NStacks))
+                                                         (FTIMES CardHeight 1.5]
+                      (OR (TOP S)
+                          (FLIPSTACK S))
+                      (POSTVALUE (add GAMEVALUE PayForCard))
+                      (RETURN T])
 
 (NXTCARD
-  [LAMBDA (S)                                                (* bas: "15-Jan-86 21:44")
-    (PROG1 (pop (fetch FACEDOWN of S))
-	     (if (fetch FACEDOWN of S)
-	       else                                        (* Last card up, replace surface of card table and 
-							     adjust saved image for possibly overlapping exposed 
-							     card in the pile)
-		      (BLTSHADE (DSPTEXTURE NIL SOLOW)
-				  SOLOW
-				  (fetch CSX of S)
-				  [IPLUS (fetch CSY of S)
-					   (if (OR (NULL (fetch FACEUP of S))
-						       (ZEROP (fetch YO of S)))
-					       then 0
-					     else (IPLUS CardHeight (fetch YO of S]
-				  (if (OR (NULL (fetch FACEUP of S))
-					      (ZEROP (fetch XO of S)))
-				      then CardWidth
-				    else (fetch XO of S))
-				  (if (OR (NULL (fetch FACEUP of S))
-					      (ZEROP (fetch YO of S)))
-				      then CardHeight
-				    else (IMINUS (fetch YO of S)))
-				  (QUOTE REPLACE))
-		      (if (fetch FACEUP of S)
-			  then (BLTSHADE (DSPTEXTURE NIL SOLOW)
-					     (fetch SAV of (BOTTOM S))
-					     0
-					     (IMINUS (fetch YO of S))
-					     (IDIFFERENCE CardWidth (fetch XO of S))
-					     CardHeight
-					     (QUOTE REPLACE])
+  [LAMBDA (S)                                                (* bas%: "15-Jan-86 21:44")
+    (PROG1 (pop (fetch FACEDOWN of S))
+        [if (fetch FACEDOWN of S)
+          else 
+
+         (* Last card up, replace surface of card table and adjust saved image for 
+         possibly overlapping exposed card in the pile)
+
+               (BLTSHADE (DSPTEXTURE NIL SOLOW)
+                      SOLOW
+                      (fetch CSX of S)
+                      [IPLUS (fetch CSY of S)
+                             (if (OR (NULL (fetch FACEUP of S))
+                                     (ZEROP (fetch YO of S)))
+                                 then 0
+                               else (IPLUS CardHeight (fetch YO of S]
+                      (if (OR (NULL (fetch FACEUP of S))
+                              (ZEROP (fetch XO of S)))
+                          then CardWidth
+                        else (fetch XO of S))
+                      (if (OR (NULL (fetch FACEUP of S))
+                              (ZEROP (fetch YO of S)))
+                          then CardHeight
+                        else (IMINUS (fetch YO of S)))
+                      'REPLACE)
+               (if (fetch FACEUP of S)
+                   then (BLTSHADE (DSPTEXTURE NIL SOLOW)
+                               (fetch SAV of (BOTTOM S))
+                               0
+                               (IMINUS (fetch YO of S))
+                               (IDIFFERENCE CardWidth (fetch XO of S))
+                               CardHeight
+                               'REPLACE])])
 
 (PUSHCARD
-  [LAMBDA (S C)                                              (* bas: "30-JUL-82 14:37")
+  [LAMBDA (S C)                                              (* bas%: "30-JUL-82 14:37")
     [MOVECARD C (IPLUS (fetch XO of S)
-		       (if (fetch FACEUP of S)
-			   then (fetch CX of (CAR (fetch FACEUP of S)))
-			 else (fetch CSX of S)))
-	      (IPLUS (fetch YO of S)
-		     (if (fetch FACEUP of S)
-			 then (fetch CY of (CAR (fetch FACEUP of S)))
-		       else (fetch CSY of S]
+                       (if (fetch FACEUP of S)
+                           then (fetch CX of (CAR (fetch FACEUP of S)))
+                         else (fetch CSX of S)))
+           (IPLUS (fetch YO of S)
+                  (if (fetch FACEUP of S)
+                      then (fetch CY of (CAR (fetch FACEUP of S)))
+                    else (fetch CSY of S]
     (push (fetch FACEUP of S)
-	  C])
+          C])
 
 (POSTVALUE
-  [LAMBDA (V)                                                (* bas: "15-Jan-86 23:25")
-    (MOVETO (CONSTANT (FIX (FTIMES 25 Overlap CardWidth)))
-	      CardHeight SOLOW)
-    (DSPFONT (FONTCREATE (QUOTE HELVETICA)
-			     18)
-	       SOLOW)
-    (BLTSHADE (DSPTEXTURE NIL SOLOW)
-		SOLOW
-		(DSPXPOSITION NIL SOLOW)
-		(IDIFFERENCE (DSPYPOSITION NIL SOLOW)
-			       (FONTPROP (DSPFONT NIL SOLOW)
-					   (QUOTE DESCENT)))
-		1000
-		(FONTPROP (DSPFONT NIL SOLOW)
-			    (QUOTE HEIGHT))
-		(QUOTE REPLACE))
-    (DSPOPERATION (PROG1 (DSPOPERATION (QUOTE PAINT)
-					     SOLOW)
-			     (if (ILESSP V 0)
-				 then (printout SOLOW "Down by $" (IMINUS V)
-						  "   ")
-			       elseif (ZEROP V)
-				 then (printout SOLOW "Dead even!   ")
-			       else (printout SOLOW "Ahead by $" V "   ")))
-		    SOLOW])
+  [LAMBDA (V)                                                (* bas%: "15-Jan-86 23:25")
+    (MOVETO (CONSTANT (FIX (FTIMES 25 Overlap CardWidth)))
+           CardHeight SOLOW)
+    (DSPFONT (FONTCREATE 'HELVETICA 18)
+           SOLOW)
+    (BLTSHADE (DSPTEXTURE NIL SOLOW)
+           SOLOW
+           (DSPXPOSITION NIL SOLOW)
+           (IDIFFERENCE (DSPYPOSITION NIL SOLOW)
+                  (FONTPROP (DSPFONT NIL SOLOW)
+                         'DESCENT))
+           1000
+           (FONTPROP (DSPFONT NIL SOLOW)
+                  'HEIGHT)
+           'REPLACE)
+    (DSPOPERATION (PROG1 (DSPOPERATION 'PAINT SOLOW)
+                      (if (ILESSP V 0)
+                          then (printout SOLOW "Down by $" (IMINUS V)
+                                      "   ")
+                        elseif (ZEROP V)
+                          then (printout SOLOW "Dead even!   ")
+                        else (printout SOLOW "Ahead by $" V "   ")))
+           SOLOW])
 
 (SEARCHSTACKS
-  [LAMBDA (K)                                                (* bas: "30-JUL-82 19:19")
+  [LAMBDA (K)                                                (* bas%: "30-JUL-82 19:19")
     (for I to NStacks when (GOODMOVE? (TOP (STACK I))
-				      K)
-       do (RETURN (STACK I])
+                                  K) do (RETURN (STACK I])
 
 (SHOWCARDSTACK
-  [LAMBDA (S)                                                (* lmm " 6-Aug-85 00:04")
+  [LAMBDA (S)                                                (* lmm " 6-Aug-85 00:04")
     (if (fetch FACEDOWN of S)
-	then (BITBLT NIL NIL NIL SOLOW (fetch CSX of S)
-		     (fetch CSY of S)
-		     CardWidth CardHeight (QUOTE TEXTURE)
-		     (QUOTE REPLACE)
-		     BLACKSHADE)
-	     (BITBLT NIL NIL NIL SOLOW (ADD1 (fetch CSX of S))
-		     (ADD1 (fetch CSY of S))
-		     (IDIFFERENCE CardWidth 2)
-		     (IDIFFERENCE CardHeight 2)
-		     (QUOTE TEXTURE)
-		     (QUOTE REPLACE)
-		     BACKSHADE))
+        then (BITBLT NIL NIL NIL SOLOW (fetch CSX of S)
+                    (fetch CSY of S)
+                    CardWidth CardHeight 'TEXTURE 'REPLACE BLACKSHADE)
+             (BITBLT NIL NIL NIL SOLOW (ADD1 (fetch CSX of S))
+                    (ADD1 (fetch CSY of S))
+                    (IDIFFERENCE CardWidth 2)
+                    (IDIFFERENCE CardHeight 2)
+                    'TEXTURE
+                    'REPLACE BACKSHADE))
     S])
 
 (SHUFFLEDECK
-  [LAMBDA NIL                                                (* bas: "30-JUL-82 14:08")
-    [if (AND (BOUNDP (QUOTE DECK))
-	     (ARRAYP DECK))
-      else (SETQ DECK (ARRAY TotalCards (QUOTE POINTER)))
-	   (bind (I _ 0) for S from Spades to Hearts
-	      do (for R to CardsPerSuit do (SETA DECK (add I 1)
-						 (create CARD
-							 SUIT _ S
-							 RANK _ R]
+  [LAMBDA NIL                                                (* bas%: "30-JUL-82 14:08")
+    [if (AND (BOUNDP 'DECK)
+             (ARRAYP DECK))
+      else (SETQ DECK (ARRAY TotalCards 'POINTER))
+           (bind (I _ 0) for S from Spades to Hearts
+              do (for R to CardsPerSuit do (SETA DECK (add I 1)
+                                                 (create CARD
+                                                        SUIT _ S
+                                                        RANK _ R]
     (bind Y for I to TotalCards do (SETQ Y (RAND 1 TotalCards))
-				   (SETA DECK I (PROG1 (ELT DECK Y)
-						       (SETA DECK Y (ELT DECK I])
+                                   (SETA DECK I (PROG1 (ELT DECK Y)
+                                                    (SETA DECK Y (ELT DECK I)))])
 
 (STACKLOC
-  [LAMBDA (I N)                                              (* bas: "15-Jan-86 22:21")
-    (IPLUS [ITIMES I (FIXR (FQUOTIENT (IDIFFERENCE (WINDOWPROP SOLOW (QUOTE WIDTH))
-							     (ITIMES N CardWidth))
-					      (ADD1 N]
-	     (ITIMES CardWidth (SUB1 I])
+  [LAMBDA (I N)                                              (* bas%: "15-Jan-86 22:21")
+    (IPLUS [ITIMES I (FIXR (FQUOTIENT (IDIFFERENCE (WINDOWPROP SOLOW 'WIDTH)
+                                             (ITIMES N CardWidth))
+                                  (ADD1 N]
+           (ITIMES CardWidth (SUB1 I])
 
-(STOS?
-  [LAMBDA (SN)                                              (* bas: " 7-JAN-81 22:01")
+(STOS?
+  [LAMBDA (SN)                                               (* bas%: " 7-JAN-81 22:01")
     (AND (fetch FACEUP of SN)
-	 [OR (fetch FACEDOWN of SN)
-	     (NOT (KINGP (BOTTOM SN]
-	 (SEARCHSTACKS (BOTTOM SN])
+         [OR (fetch FACEDOWN of SN)
+             (NOT (KINGP (BOTTOM SN]
+         (SEARCHSTACKS (BOTTOM SN])
 
-(TOPSUITSTACK
-  [LAMBDA (I)                                               (* bas: " 4-JAN-81 01:39")
+(TOPSUITSTACK
+  [LAMBDA (I)                                                (* bas%: " 4-JAN-81 01:39")
     (ELT SUITSTACKS I])
 )
 (DEFINEQ
 
 (HIST
-  [LAMBDA (A W L)                                            (* bas: "15-Dec-85 20:22")
-    (PROG ((WH (WINDOWPROP W (QUOTE HEIGHT)))
-	     (WW (WINDOWPROP W (QUOTE WIDTH)))
-	     (HM NIL)
-	     (VM (IPLUS (FONTPROP (DSPFONT NIL W)
-				      (QUOTE HEIGHT))
-			  4)))
-	    (SETQ HM VM)                                   (* Margins could be different eg if Y labels were 
-							     used)
-	    (BLTSHADE WHITESHADE W 0 0 WW WH (QUOTE REPLACE))
-	    [PROG [(HS (IQUOTIENT (IDIFFERENCE WW (ITIMES HM 2))
-				      (ARRAYSIZE A)))
-		     (VS (FQUOTIENT (IDIFFERENCE WH (ITIMES VM 2))
-				      (ARRAYMAX A]
-		    (for I from (ARRAYORIG A) to (IPLUS (ARRAYSIZE A)
-								  (ARRAYORIG A)
-								  -1)
-		       do (BLTSHADE GRAYSHADE W (IPLUS HM (ITIMES I HS))
-					VM HS (FIX (FTIMES VS (ELT A I)))
-					(QUOTE REPLACE]
-	    (DRAWLINE HM VM (IDIFFERENCE WW HM)
-			VM 2 (QUOTE REPLACE)
-			W)
-	    (DRAWLINE HM VM HM (IDIFFERENCE WH VM)
-			2
-			(QUOTE REPLACE)
-			W)
-	    (MOVETO (IDIFFERENCE (IDIFFERENCE WW HM)
-				     (STRINGWIDTH L (DSPFONT NIL W)))
-		      (IPLUS (FONTPROP (DSPFONT NIL W)
-					   (QUOTE DESCENT))
-			       2)
-		      W)
-	    (PRIN1 L W])
+  [LAMBDA (A W L)                                            (* bas%: "15-Dec-85 20:22")
+    (PROG ((WH (WINDOWPROP W 'HEIGHT))
+           (WW (WINDOWPROP W 'WIDTH))
+           (HM NIL)
+           (VM (IPLUS (FONTPROP (DSPFONT NIL W)
+                             'HEIGHT)
+                      4)))
+          (SETQ HM VM)                                       (* Margins could be different eg if Y 
+                                                             labels were used)
+          (BLTSHADE WHITESHADE W 0 0 WW WH 'REPLACE)
+          [PROG [(HS (IQUOTIENT (IDIFFERENCE WW (ITIMES HM 2))
+                            (ARRAYSIZE A)))
+                 (VS (FQUOTIENT (IDIFFERENCE WH (ITIMES VM 2))
+                            (ARRAYMAX A]
+                (for I from (ARRAYORIG A) to (IPLUS (ARRAYSIZE A)
+                                                    (ARRAYORIG A)
+                                                    -1)
+                   do (BLTSHADE GRAYSHADE W (IPLUS HM (ITIMES I HS))
+                             VM HS (FIX (FTIMES VS (ELT A I)))
+                             'REPLACE]
+          (DRAWLINE HM VM (IDIFFERENCE WW HM)
+                 VM 2 'REPLACE W)
+          (DRAWLINE HM VM HM (IDIFFERENCE WH VM)
+                 2
+                 'REPLACE W)
+          (MOVETO (IDIFFERENCE (IDIFFERENCE WW HM)
+                         (STRINGWIDTH L (DSPFONT NIL W)))
+                 (IPLUS (FONTPROP (DSPFONT NIL W)
+                               'DESCENT)
+                        2)
+                 W)
+          (PRIN1 L W])
 
 (ARRAYMAX
-  [LAMBDA (A)                                                (* bas: " 5-AUG-82 14:59")
+  [LAMBDA (A)                                                (* bas%: " 5-AUG-82 14:59")
     (bind (M _ 0) for I from (ARRAYORIG A) to (IPLUS (ARRAYSIZE A)
-						     (ARRAYORIG A)
-						     -1)
-       when (LESSP M (ELT A I)) do (SETQ M (ELT A I)) finally (RETURN M])
+                                                     (ARRAYORIG A)
+                                                     -1) when (LESSP M (ELT A I))
+       do (SETQ M (ELT A I)) finally (RETURN M])
 )
-(DECLARE: DONTCOPY 
+(DECLARE%: DONTCOPY 
 (DEFINEQ
 
 (SHOWCONFIG
-  [LAMBDA NIL                                                (* bas: "30-JUL-82 19:20")
-    (printout NIL "Suits: " 10)
-    (for I from Spades to Hearts do (printout NIL (CARDNAME (TOPSUITSTACK I))
-					      ,))
+  [LAMBDA NIL                                                (* bas%: "30-JUL-82 19:20")
+    (printout NIL "Suits: " 10)
+    (for I from Spades to Hearts do (printout NIL (CARDNAME (TOPSUITSTACK I))
+                                           %,))
     (TERPRI)
     (for I to NStacks do (PRINTCARDSTACK (STACK I)
-					 (CONCAT "Stack " I)))
+                                (CONCAT "Stack " I)))
     (PRINTCARDSTACK HAND "Hand"])
 
 (PRINTCARDSTACK
-  [LAMBDA (X S)                                              (* bas: " 6-JAN-81 16:47")
-    (printout NIL S ":" 10 .I2 (LENGTH (fetch FACEDOWN X))
-	      " down. Up: ")
-    (for J in (fetch FACEUP of X) do (printout NIL (CARDNAME J)
-					       ,))
+  [LAMBDA (X S)                                              (* bas%: " 6-JAN-81 16:47")
+    (printout NIL S ":" 10 .I2 (LENGTH (fetch FACEDOWN X))
+           " down. Up: ")
+    (for J in (fetch FACEUP of X) do (printout NIL (CARDNAME J)
+                                            %,))
     (TERPRI])
 
 (CARDNAME
-  [LAMBDA (C)                                                (* bas: "15-Jan-86 21:40")
-    (if (ZEROP (fetch (CARD RANK) of C))
-	then "None"
-      else (PACK (LIST (SELECTQ (fetch (CARD SUIT) of C)
-					(0 (QUOTE S))
-					(1 (QUOTE C))
-					(2 (QUOTE D))
-					(3 (QUOTE H))
-					(SHOULDNT))
-			     (SELECTQ (fetch (CARD RANK) of C)
-					(1 (QUOTE A))
-					(11 (QUOTE J))
-					(12 (QUOTE Q))
-					(13 (QUOTE K))
-					(fetch (CARD RANK) of C])
+  [LAMBDA (C)                                                (* bas%: "15-Jan-86 21:40")
+    (if (ZEROP (fetch (CARD RANK) of C))
+        then "None"
+      else (PACK (LIST (SELECTQ (fetch (CARD SUIT) of C)
+                           (0 'S)
+                           (1 'C)
+                           (2 'D)
+                           (3 'H)
+                           (SHOULDNT))
+                       (SELECTQ (fetch (CARD RANK) of C)
+                           (1 'A)
+                           (11 'J)
+                           (12 'Q)
+                           (13 'K)
+                           (fetch (CARD RANK) of C])
 )
 )
-(DECLARE: EVAL@COMPILE DONTCOPY 
-(DECLARE: EVAL@COMPILE 
-[PUTPROPS BOTTOM MACRO ((S)
-	   (CAR (LAST (fetch FACEUP of S]
-[PUTPROPS KINGP MACRO ((C)
-	   (EQ CardsPerSuit (fetch (CARD RANK)
-				   of C]
-(PUTPROPS STACK MACRO ((N)
-	   (ELT STACKS N)))
-[PUTPROPS TOP MACRO ((S)
-	   (CAR (fetch FACEUP of S]
+(DECLARE%: EVAL@COMPILE DONTCOPY 
+(DECLARE%: EVAL@COMPILE 
+
+(PUTPROPS BOTTOM MACRO [(S)
+                        (CAR (LAST (fetch FACEUP of S])
+
+(PUTPROPS KINGP MACRO ((C)
+                       (EQ CardsPerSuit (fetch (CARD RANK) of C))))
+
+(PUTPROPS STACK MACRO ((N)
+                       (ELT STACKS N)))
+
+(PUTPROPS TOP MACRO ((S)
+                     (CAR (fetch FACEUP of S))))
 )
 
-[DECLARE: EVAL@COMPILE 
+(DECLARE%: EVAL@COMPILE
 
 (DATATYPE CARD (SUIT RANK FACE SAV CX CY)
-		 (ACCESSFNS CARD (COLOR (ILESSP (fetch SUIT of DATUM)
-						    Diamonds))))
+               (ACCESSFNS CARD (COLOR (ILESSP (fetch SUIT of DATUM)
+                                             Diamonds))))
 
 (RECORD CARDSTACK (FACEUP FACEDOWN CSX CSY XO YO))
-]
-(/DECLAREDATATYPE (QUOTE CARD)
-		  (QUOTE (POINTER POINTER POINTER POINTER POINTER POINTER))
-		  (QUOTE ((CARD 0 POINTER)
-			  (CARD 2 POINTER)
-			  (CARD 4 POINTER)
-			  (CARD 6 POINTER)
-			  (CARD 8 POINTER)
-			  (CARD 10 POINTER)))
-		  (QUOTE 12))
+)
 
-(DECLARE: EVAL@COMPILE 
+(/DECLAREDATATYPE 'CARD '(POINTER POINTER POINTER POINTER POINTER POINTER)
+       '((CARD 0 POINTER)
+         (CARD 2 POINTER)
+         (CARD 4 POINTER)
+         (CARD 6 POINTER)
+         (CARD 8 POINTER)
+         (CARD 10 POINTER))
+       '12)
+
+(DECLARE%: EVAL@COMPILE 
 
 (RPAQQ Spades 0)
 
@@ -593,152 +569,88 @@
 
 (RPAQQ TotalCards 52)
 
+
 (CONSTANTS (Spades 0)
-	   (Clubs 1)
-	   (Diamonds 2)
-	   (Hearts 3)
-	   (CostOfDeck 50)
-	   (PayForCard 5)
-	   (NStacks 7)
-	   (NSuits 4)
-	   (CardsPerSuit 13)
-	   (TotalCards 52))
+       (Clubs 1)
+       (Diamonds 2)
+       (Hearts 3)
+       (CostOfDeck 50)
+       (PayForCard 5)
+       (NStacks 7)
+       (NSuits 4)
+       (CardsPerSuit 13)
+       (TotalCards 52))
 )
 
-(DECLARE: EVAL@COMPILE 
+(DECLARE%: EVAL@COMPILE 
 
 (RPAQQ BACKSHADE 52275)
 
 (RPAQQ BetweenStacks 2)
 
-(RPAQQ Overlap .667)
+(RPAQQ Overlap 0.667)
 
 (RPAQQ CardWidth 30)
 
 (RPAQQ CardHeight 45)
 
+
 (CONSTANTS (BACKSHADE 52275)
-	   (BetweenStacks 2)
-	   (Overlap .667)
-	   (CardWidth 30)
-	   (CardHeight 45))
+       (BetweenStacks 2)
+       (Overlap 0.667)
+       (CardWidth 30)
+       (CardHeight 45))
 )
 
-(DECLARE: DOEVAL@COMPILE DONTCOPY
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS HAND STACKS SUITSTACKS DECK SOLORESULTS)
 )
 
-(DECLARE: DOEVAL@COMPILE DONTCOPY
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS MaxCardMove WaitBetweenMoves)
 )
 )
-(/DECLAREDATATYPE (QUOTE CARD)
-		  (QUOTE (POINTER POINTER POINTER POINTER POINTER POINTER))
-		  (QUOTE ((CARD 0 POINTER)
-			  (CARD 2 POINTER)
-			  (CARD 4 POINTER)
-			  (CARD 6 POINTER)
-			  (CARD 8 POINTER)
-			  (CARD 10 POINTER)))
-		  (QUOTE 12))
 
-(RPAQ SpadesBits (READBITMAP))
-(11 11
-"@D@@"
-"@N@@"
-"AO@@"
-"COH@"
-"GOL@"
-"GOL@"
-"GOL@"
-"COH@"
-"@D@@"
-"AO@@"
-"COH@")
+(/DECLAREDATATYPE 'CARD '(POINTER POINTER POINTER POINTER POINTER POINTER)
+       '((CARD 0 POINTER)
+         (CARD 2 POINTER)
+         (CARD 4 POINTER)
+         (CARD 6 POINTER)
+         (CARD 8 POINTER)
+         (CARD 10 POINTER))
+       '12)
 
-(RPAQ ClubsBits (READBITMAP))
-(11 11
-"@D@@"
-"@N@@"
-"AO@@"
-"@N@@"
-"BDH@"
-"GEL@"
-"OON@"
-"GEL@"
-"BDH@"
-"@N@@"
-"COH@")
+(RPAQQ SpadesBits #*(11 11)@D@@@N@@AO@@COH@GOL@GOL@GOL@COH@@D@@AO@@COH@)
 
-(RPAQ DiamondsBits (READBITMAP))
-(11 11
-"@D@@"
-"@N@@"
-"AK@@"
-"CAH@"
-"F@L@"
-"L@F@"
-"F@L@"
-"CAH@"
-"AK@@"
-"@N@@"
-"@D@@")
+(RPAQQ ClubsBits #*(11 11)@D@@@N@@AO@@@N@@BDH@GEL@OON@GEL@BDH@@N@@COH@)
 
-(RPAQ HeartsBits (READBITMAP))
-(11 11
-"@@@@"
-"CAH@"
-"GKL@"
-"DND@"
-"D@D@"
-"F@L@"
-"CAH@"
-"AK@@"
-"@N@@"
-"@D@@"
-"@@@@")
+(RPAQQ DiamondsBits #*(11 11)@D@@@N@@AK@@CAH@F@L@L@F@F@L@CAH@AK@@@N@@@D@@)
 
-(RPAQ 10Bits (READBITMAP))
-(20 18
-"@@@@@@@@"
-"@F@GL@@@"
-"@N@ON@@@"
-"GNALG@@@"
-"GNAHC@@@"
-"@FAHC@@@"
-"@FAHC@@@"
-"@FAHC@@@"
-"@FAHC@@@"
-"@FAHC@@@"
-"@FAHC@@@"
-"@FALG@@@"
-"@F@ON@@@"
-"@F@GL@@@"
-"@@@@@@@@"
-"@@@@@@@@"
-"@@@@@@@@"
-"@@@@@@@@")
+(RPAQQ HeartsBits #*(11 11)@@@@CAH@GKL@DND@D@D@F@L@CAH@AK@@@N@@@D@@@@@@)
+
+(RPAQQ 10Bits #*(20 18)@@@@@@@@@F@GL@@@@N@ON@@@GNALG@@@GNAHC@@@@FAHC@@@@FAHC@@@@FAHC@@@@FAHC@@@@FAHC@@@@FAHC@@@@FALG@@@@F@ON@@@@F@GL@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+)
 
 (RPAQ? MaxCardMove 8)
 
-(RPAQ? WaitBetweenMoves 10)
+(RPAQ? WaitBetweenMoves 100)
 
 (RPAQ? DECK )
 
 (RPAQ? SOLORESULTS )
 
-(ADDTOVAR IDLE.FUNCTIONS ("Solitaire" (QUOTE SOLO)))
+(ADDTOVAR IDLE.FUNCTIONS ("Solitaire" 'SOLO))
 (PUTPROPS SOLITAIRE COPYRIGHT ("Xerox Corporation" 1982 1985 1986))
-(DECLARE: DONTCOPY
-  (FILEMAP (NIL (1624 3406 (SOLO 1634 . 2699) (SOLITAIRE 2701 . 3404)) (3407 17559 (CARDIMAGE 3417 . 
-4854) (COUNTCARDS 4856 . 5068) (CREATEHAND 5070 . 5525) (CREATESTACK 5527 . 6136) (DEALDECK 6138 . 
-6687) (FLIPSTACK 6689 . 6909) (GETCARD 6911 . 7339) (GOODMOVE? 7341 . 7706) (HTOS? 7708 . 7867) (
-MOVECARD 7869 . 8491) (DOMOVE 8493 . 9921) (MOVEHS 9923 . 10158) (MOVES 10160 . 10429) (MOVES1 10431
- . 10672) (UPCARD 10674 . 11691) (MOVESSS 11693 . 12456) (NXTCARD 12458 . 13928) (PUSHCARD 13930 . 
-14484) (POSTVALUE 14486 . 15427) (SEARCHSTACKS 15429 . 15654) (SHOWCARDSTACK 15656 . 16269) (
-SHUFFLEDECK 16271 . 16859) (STACKLOC 16861 . 17182) (STOS? 17184 . 17423) (TOPSUITSTACK 17425 . 17557)
-) (17560 19275 (HIST 17570 . 18957) (ARRAYMAX 18959 . 19273)) (19296 20605 (SHOWCONFIG 19306 . 19716) 
-(PRINTCARDSTACK 19718 . 20040) (CARDNAME 20042 . 20603)))))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL (1950 4087 (SOLO 1960 . 3297) (SOLITAIRE 3299 . 4085)) (4088 20454 (CARDIMAGE 4098 . 
+5754) (COUNTCARDS 5756 . 5969) (CREATEHAND 5971 . 6576) (CREATESTACK 6578 . 7427) (DEALDECK 7429 . 
+8012) (FLIPSTACK 8014 . 8249) (GETCARD 8251 . 8701) (GOODMOVE? 8703 . 9100) (HTOS? 9102 . 9269) (
+MOVECARD 9271 . 9910) (DOMOVE 9912 . 11543) (MOVEHS 11545 . 11816) (MOVES 11818 . 12129) (MOVES1 12131
+ . 12433) (UPCARD 12435 . 13651) (MOVESSS 13653 . 14595) (NXTCARD 14597 . 16369) (PUSHCARD 16371 . 
+17033) (POSTVALUE 17035 . 18036) (SEARCHSTACKS 18038 . 18281) (SHOWCARDSTACK 18283 . 18912) (
+SHUFFLEDECK 18914 . 19718) (STACKLOC 19720 . 20052) (STOS? 20054 . 20316) (TOPSUITSTACK 20318 . 20452)
+) (20455 22457 (HIST 20465 . 22054) (ARRAYMAX 22056 . 22455)) (22479 24001 (SHOWCONFIG 22489 . 22951) 
+(PRINTCARDSTACK 22953 . 23305) (CARDNAME 23307 . 23999)))))
 STOP
diff --git a/lispusers/SOLITAIRE.LCOM b/lispusers/SOLITAIRE.LCOM
index fc9baf2d..55216b3e 100644
Binary files a/lispusers/SOLITAIRE.LCOM and b/lispusers/SOLITAIRE.LCOM differ
diff --git a/lispusers/STARBG b/lispusers/STARBG
index 95401a20..3ae661c5 100644
--- a/lispusers/STARBG
+++ b/lispusers/STARBG
@@ -1,13 +1,14 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED "17-Aug-88 03:26:58" {ERINYES}<LISPUSERS>MEDLEY>STARBG.;2 16928  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS Cosmos)
+(FILECREATED "24-Aug-2022 08:54:17" {DSK}<home>larry>medley>lispusers>STARBG.;2 16815  
 
-      previous date%: "12-Oct-87 17:02:01" {ERINYES}<LISP>LYRIC>LISPUSERS>STARBG.;2)
+      :CHANGES-TO (FNS Cosmos)
+
+      :PREVIOUS-DATE "17-Aug-88 03:26:58" {DSK}<home>larry>medley>lispusers>STARBG.;1)
 
 
-(* "
-Copyright (c) 1984, 1985, 1986, 1987, 1988 by Xerox Corporation.  All rights reserved.
+(* ; "
+Copyright (c) 1984-1988 by Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT STARBGCOMS)
@@ -109,10 +110,10 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988 by Xerox Corporation.  All rights res
 
 (RPAQQ supernova #*(13 13)OMOHOMOHOHOHN@CHN@CHL@AH@@@@L@AHN@CHN@CHOHOHOMOHOMOH)
 
-(RPAQQ STARBGParameters (SBM BM1 BM2 BM3 BM4 BM5 nova supernova stars1 stars2 stars3 stars4 
-                                 stars5 changeStars eventPause clusters clusterRadius constellations
-                                 starsInCluster superClusters superClusterRadius interiorClusters 
-                                 starsInterior))
+(RPAQQ STARBGParameters (SBM BM1 BM2 BM3 BM4 BM5 nova supernova stars1 stars2 stars3 stars4 stars5 
+                             changeStars eventPause clusters clusterRadius constellations 
+                             starsInCluster superClusters superClusterRadius interiorClusters 
+                             starsInterior))
 
 (RPAQQ trekNotes (<A+ D/ G+ F# E/ D/ D@/ C))
 (DEFINEQ
@@ -140,39 +141,39 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988 by Xerox Corporation.  All rights res
 )
 
 (Cosmos
-  [LAMBDA (starWindow)                                 (* ; "Edited 17-Aug-88 03:25 by EWEAVER")
+  [LAMBDA (starWindow)                                     (* ; "Edited 24-Aug-2022 08:05 by larry")
+                                                           (* ; "Edited 17-Aug-88 03:25 by EWEAVER")
     (OR starWindow (SETQ starWindow (CREATEW WHOLESCREEN NIL 0)))
     (if (VIDEOCOLOR)
         then (RESETLST
-                     (RESETSAVE voidShade WHITESHADE)
-                     (RESETSAVE starShade BLACKSHADE)
-                     (DSPFILL NIL voidShade 'REPLACE starWindow)
-                     (RESETSAVE BM1 (InvertBM BM1))
-                     (RESETSAVE BM2 (InvertBM BM2))
-                     (RESETSAVE BM3 (InvertBM BM3))
-                     (RESETSAVE BM4 (InvertBM BM4))
-                     (RESETSAVE BM5 (InvertBM BM5))
-                     (RESETSAVE cursorFollower (ICONW darkSaucer saucerMask (CREATEPOSITION 0 0)
-                                                      T))
-                     (RESETSAVE nova (InvertBM nova))
-                     (RESETSAVE supernova (InvertBM supernova))
-                     (RESETSAVE NIL (LIST [FUNCTION (LAMBDA (starWindow)
-                                                      (if changeStars
-                                                          then (BITBLT (InvertBM starWindow
-                                                                                  'inPlace)
-                                                                          0 0 SBM)
-                                                                (CLOSEW starWindow)
-                                                                (CHANGEBACKGROUND SBM)
-                                                                (CLOSEW cursorFollower]
-                                          starWindow))
-                     (DSPOPERATION 'REPLACE starWindow)
-                     (while T do (SomethingCosmic starWindow)
-                                        (BLOCK eventPause)))
+                 (RESETSAVE voidShade WHITESHADE)
+                 (RESETSAVE starShade BLACKSHADE)
+                 (DSPFILL NIL voidShade 'REPLACE starWindow)
+                 (RESETSAVE BM1 (InvertBM BM1))
+                 (RESETSAVE BM2 (InvertBM BM2))
+                 (RESETSAVE BM3 (InvertBM BM3))
+                 (RESETSAVE BM4 (InvertBM BM4))
+                 (RESETSAVE BM5 (InvertBM BM5))
+                 (RESETSAVE cursorFollower (ICONW darkSaucer saucerMask (CREATEPOSITION 0 0)
+                                                  T))
+                 (RESETSAVE nova (InvertBM nova))
+                 (RESETSAVE supernova (InvertBM supernova))
+                 (RESETSAVE NIL (LIST [FUNCTION (LAMBDA (starWindow)
+                                                  (if changeStars
+                                                      then (BITBLT (InvertBM starWindow 'inPlace)
+                                                                  0 0 SBM)
+                                                           (CLOSEW starWindow)
+                                                           (CHANGEBACKGROUND SBM)
+                                                           (CLOSEW cursorFollower]
+                                      starWindow))
+                 (DSPOPERATION 'REPLACE starWindow)
+                 (while T do (SomethingCosmic starWindow)
+                             (BLOCK eventPause)))
       else (DSPFILL NIL voidShade 'REPLACE starWindow)
-            (DSPOPERATION 'REPLACE starWindow)
-            (while T do (SomethingCosmic starWindow)
-                               (BLOCK))
-            (CLOSEW starWindow])
+           (DSPOPERATION 'REPLACE starWindow)
+           (while T do (SomethingCosmic starWindow)
+                       (BLOCK 100))
+           (CLOSEW starWindow])
 
 (InvertBM
 (LAMBDA (bm inPlace?) (* gsf " 2-Jan-86 14:32") (LET ((bitmap (if inPlace? then bm else (BITMAPCOPY bm)))) (BITBLT bm NIL NIL bitmap NIL NIL NIL NIL (QUOTE INVERT) (QUOTE REPLACE)) bitmap))
@@ -267,12 +268,12 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988 by Xerox Corporation.  All rights res
     then (PUSH IDLE.FUNCTIONS '("Cosmos" 'Cosmos "Go where no one has gone before... "]
 (PUTPROPS STARBG COPYRIGHT ("Xerox Corporation" 1984 1985 1986 1987 1988))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4118 16416 (Between 4128 . 4281) (BlackHole 4283 . 4570) (Catastrophe 4572 . 4838) (
-ChanceIn 4840 . 4926) (CloseFollower 4928 . 5008) (Constellation 5010 . 5560) (Cosmos 5562 . 7701) (
-InvertBM 7703 . 7904) (FillWithStars 7906 . 9356) (Marble 9358 . 9953) (OneChanceIn 9955 . 10022) (
-LowerBound 10024 . 10108) (OpenFollower 10110 . 10207) (PlusOrMinus 10209 . 10311) (RandGrey 10313 . 
-10792) (SaucerOn 10794 . 11029) (SaucerOff 11031 . 11211) (STARBG 11213 . 11497) (StarCluster 11499 . 
-12245) (SuperCluster 12247 . 12588) (SomethingCosmic 12590 . 14445) (StarFollowCursor 14447 . 14744) (
-StarryWindow 14746 . 15217) (Stomp 15219 . 15666) (TimePasses 15668 . 15775) (UFO 15777 . 16328) (
-UpperBound 16330 . 16414)))))
+  (FILEMAP (NIL (4087 16303 (Between 4097 . 4250) (BlackHole 4252 . 4539) (Catastrophe 4541 . 4807) (
+ChanceIn 4809 . 4895) (CloseFollower 4897 . 4977) (Constellation 4979 . 5529) (Cosmos 5531 . 7588) (
+InvertBM 7590 . 7791) (FillWithStars 7793 . 9243) (Marble 9245 . 9840) (OneChanceIn 9842 . 9909) (
+LowerBound 9911 . 9995) (OpenFollower 9997 . 10094) (PlusOrMinus 10096 . 10198) (RandGrey 10200 . 
+10679) (SaucerOn 10681 . 10916) (SaucerOff 10918 . 11098) (STARBG 11100 . 11384) (StarCluster 11386 . 
+12132) (SuperCluster 12134 . 12475) (SomethingCosmic 12477 . 14332) (StarFollowCursor 14334 . 14631) (
+StarryWindow 14633 . 15104) (Stomp 15106 . 15553) (TimePasses 15555 . 15662) (UFO 15664 . 16215) (
+UpperBound 16217 . 16301)))))
 STOP
diff --git a/lispusers/STARBG.LCOM b/lispusers/STARBG.LCOM
index 8aa0f62b..86e0c5bf 100644
Binary files a/lispusers/STARBG.LCOM and b/lispusers/STARBG.LCOM differ
diff --git a/sources/IDLER b/sources/IDLER
index 7ff312e7..2101da77 100644
--- a/sources/IDLER
+++ b/sources/IDLER
@@ -1,14 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "23-Mar-92 13:38:29" |{PELE:MV:ENVOS}<LISPCORE>SOURCES>IDLER.;3| 39952  
 
-      changes to%:  (VARS IDLERCOMS)
-                    (FNS \IDLERKEYACTION)
+(FILECREATED "28-Sep-2022 19:54:40" {DSK}<home>larry>medley>sources>IDLER.;10 47564  
 
-      previous date%: "16-May-90 18:17:31" |{PELE:MV:ENVOS}<LISPCORE>SOURCES>IDLER.;2|)
+      :CHANGES-TO (FNS IDLE.RANDOM)
+
+      :PREVIOUS-DATE "22-Sep-2022 16:50:17" {DSK}<home>larry>medley>sources>IDLER.;1)
 
 
 (* ; "
-Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1985-1990, 1992, 2022 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT IDLERCOMS)
@@ -24,15 +24,13 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
               \IDLERKEYACTION)
          (INITVARS (IDLE.PROFILE '(TIMEOUT 0))
                                                              (* ; 
-                                                "so that it doesn't start idling during the loadup")
+                                                  "so that it doesn't start idling during the loadup")
                 (\IDLING)
                 (CH.DEFAULT.DOMAIN)
                 (DEFAULTREGISTRY)
                 (IDLE.KEYACTIONTABLE))
          (ADDVARS (SYSTEMINITVARS (IDLE.PROFILE ALLOWED.LOGINS NIL FORGET NIL TIMEOUT 0 DISPLAYFN 
-                                         IDLE.BOUNCING.BOX SAVEVM 10 AUTHENTICATE T LOGIN.TIMEOUT 30)
-                         )
-                                                             (* ; "the real default")
+                                         IDLE.RANDOM SAVEVM 5 LOGOUT 5))
                 (IDLE.SUSPEND.PROCESS.NAMES MOUSE)
                 (IDLE.RESETVARS (PUPTRACEFLG NIL)
                        (XIPTRACEFLG NIL)))
@@ -109,12 +107,12 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
         (COMS 
               (* ;; "Default idle display")
 
-              (FNS IDLE.BOUNCING.BOX IDLE.BITMAP)
+              (FNS IDLE.BOUNCING.BOX IDLE.BITMAP IDLE.RANDOM)
               [INITVARS (IDLE.BOUNCING.BOX (BITMAPCOPY LOGOBITMAP))
-                     (IDLE.FUNCTIONS '(("Bouncing Box" 'IDLE.BOUNCING.BOX)
-                                       ("Bouncing Username" '(LAMBDA (W)
-                                                                    (IDLE.BOUNCING.BOX W
-                                                                           (USERNAME NIL NIL T]
+                     (IDLE.FUNCTIONS '(["Bouncing Box" #'(LAMBDA (W)
+                                                                (IDLE.BOUNCING.BOX W
+                                                                       (USERNAME NIL NIL T]
+                                       (Random 'IDLE.RANDOM]
               (GLOBALVARS IDLE.FUNCTIONS IDLE.BOUNCING.BOX))))
 
 
@@ -124,8 +122,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
 (DEFINEQ
 
 (IDLE
-  [LAMBDA (FROMTIMEOUT)                                  (* ; "Edited 20-Nov-87 11:22 by Snow")
-
+  [LAMBDA (FROMTIMEOUT)                                      (* ; "Edited 20-Nov-87 11:22 by Snow")
     (COND
        ((NOT \IDLING)
         (OR (FNTYP (LISTGET IDLE.PROFILE 'DISPLAYFN))
@@ -136,7 +133,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                'RESTARTABLE T 'NAME 'IDLE 'KEYACTION (\IDLERKEYACTION])
 
 (IDLE.SET.OPTION
-  [LAMBDA (OPTION X)                                         (* drc%: " 3-Jan-86 11:47")
+  [LAMBDA (OPTION X)                                         (* drc%: " 3-Jan-86 11:47")
     (CLEARW PROMPTWINDOW)
     (IDLE.SHOW.OPTION OPTION "Old")
     (LET
@@ -162,7 +159,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                    (UNLOCKED NIL)
                    (T (UNION (LIST T)
                              OLD.OPTION))
-                   (ADD (LET [(GROUP (PROMPTFORWORD "Add to allowed login list:" NIL NIL PROMPTWINDOW 
+                   (ADD (LET [(GROUP (PROMPTFORWORD "Add to allowed login list:" NIL NIL PROMPTWINDOW
                                             NIL 'TTY]
                              (TERPRI PROMPTWINDOW)
                              (COND
@@ -196,7 +193,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
     (IDLE.SHOW.OPTION OPTION "New"])
 
 (IDLE.SHOW.OPTIONS
-  [LAMBDA NIL                                                (* bvm%: "16-Oct-85 00:23")
+  [LAMBDA NIL                                                (* bvm%: "16-Oct-85 00:23")
     (FRESHLINE PROMPTWINDOW)
     (for TAIL on IDLE.PROFILE by (CDDR TAIL) do (IDLE.SHOW.OPTION (CAR TAIL)
                                                        NIL
@@ -206,7 +203,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                                                           (T "."])
 
 (IDLE.SHOW.OPTION
-  [LAMBDA (OPTION STRING SEPR)                               (* bvm%: "16-Oct-85 00:23")
+  [LAMBDA (OPTION STRING SEPR)                               (* bvm%: "16-Oct-85 00:23")
     (LET ((VALUE (LISTGET IDLE.PROFILE OPTION)))
          (OR SEPR (FRESHLINE PROMPTWINDOW))
          (COND
@@ -230,7 +227,9 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                     (ALLOWED.LOGINS 
                          (COND
                             ((LISTP VALUE)
-                             (SUBPAIR '(T *) '("<Previous User>" "<Anyone>") VALUE))
+                             (SUBPAIR '(T *)
+                                    '("<Previous User>" "<Anyone>")
+                                    VALUE))
                             (T "Unlocked")))
                     (MKSTRING VALUE)))
          (COND
@@ -238,8 +237,174 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
             (T (TERPRI PROMPTWINDOW])
 
 (\IDLER
-(LAMBDA (FROMTIMEOUT) (* ; "Edited 29-Jun-88 14:36 by drc:") (* ;; "This is the main idling loop. ") (RESETLST (RESETSAVE NIL (QUOTE (SETTOPVAL \IDLING NIL))) (PROG ((START.TIME (ALTO.TO.LISP.DATE \LASTUSERACTION)) W SAVEVM.TIMER IDLE.PROCESS NO.ERROR EXIT? INTERRUPTED.STRING IDLING.KEYACTIONS) (COND ((NOT (\OK.TO.IDLE?)) (* ; "Somebody in password prompt, better not idle") (RETURN))) (SETQ \IDLE.PASSWORD.SET) (COND ((EQ (LISTGET IDLE.PROFILE (QUOTE FORGET)) (QUOTE FIRST)) (* ;; "do things like dump cache listings and flush files to servers *before* passwords get smashed") (\USEREVENT (QUOTE BEFORESAVEVM)) (\DEVICEEVENT (QUOTE BEFORESAVEVM)) (\USEREVENT (QUOTE AFTERDOSAVEVM)) (\DEVICEEVENT (QUOTE AFTERDOSAVEVM)))) (RESETSAVE NIL (LIST (FUNCTION (LAMBDA NIL (NOTIFY.EVENT \IDLING.OVER))))) (for X in IDLE.SUSPEND.PROCESS.NAMES bind PROC do (* ; "Turn off things like CROCK, LAFITEMAILWATCH, SPACEWINDOW, REMINDERS") (COND ((SETQ PROC (FIND.PROCESS X)) (PROCESS.EVAL PROC (QUOTE (\IDLE.WAIT)))))) (RESETSAVE (GCGAG NIL)) (RESETSAVE \AFTERLOGINFNS NIL) (* ; "So that SETPASSWORD doesn't trigger any activity") (for X in IDLE.RESETVARS do (* ; "turn off things like pup-trace, xiptrace and the like") (RESETSAVE (SETTOPVAL (CAR X) (EVAL (CADR X))) (LIST (FUNCTION SETTOPVAL) (CAR X) (GETTOPVAL (CAR X))))) (* ; "so that mouse buttons will trigger READP") (COND ((EQ (LISTGET IDLE.PROFILE (QUOTE FORGET)) (QUOTE FIRST)) (SETQ \IDLE.PASSWORD.SET (QUOTE CLEAR)) (SETPASSWORD NIL (USERNAME NIL NIL T) ""))) (RESETSAVE (TTY.PROCESS (THIS.PROCESS))) (* ;; "Note that IDLE has set up our KEYACTION table (in the add.process) to ignore interrupts and make mouse clicks trigger readp.") (RESETSAVE (CHANGENAME (QUOTE \LOGIN.READ) (QUOTE PROVIDE.PROMPTING.WINDOW) (QUOTE \IDLE.PROMPTING.WINDOW)) (QUOTE (CHANGENAME \LOGIN.READ \IDLE.PROMPTING.WINDOW PROVIDE.PROMPTING.WINDOW))) (COND ((OR (AND FROMTIMEOUT (NOT (LET ((TIMEOUT (LISTGET IDLE.PROFILE (QUOTE TIMEOUT)))) (AND (SMALLP TIMEOUT) (\SECONDSCLOCKGREATERP \LASTUSERACTION (TIMES TIMEOUT 60)))))) (NOT (\OK.TO.IDLE?))) (* ;; "Check again if it's ok, since somebody could have fallen into a password prompter between then and now.  Anybody who does after this is ok, because the CHANGENAME above is now in effect.  Also check timeout again, in case there was a user interaction during the BEFORESAVEVM stuff") (RETURN))) (CLEARW PROMPTWINDOW) (SETQ W (CREATEW WHOLESCREEN NIL 0 T)) (RESETSAVE NIL (LIST (FUNCTION CLOSEW) W)) (RESETSAVE (CURSOR (CURSORCREATE (BITMAPCREATE 0 0)))) (CASE (MACHINETYPE) (DORADO (* ;; "this is the only way we can get the background border to be black on a dorado") (RESETSAVE (VIDEOCOLOR T)))) (IF (VIDEOCOLOR) THEN (* ;; "make sure border is black") (RESETSAVE (CHANGEBACKGROUNDBORDER WHITESHADE)) (OPENW W) ELSE (DSPOPERATION (QUOTE ERASE) W) (DSPTEXTURE BLACKSHADE W) (RESETSAVE (CHANGEBACKGROUNDBORDER BLACKSHADE)) (CLEARW W)) (COND ((AND (SMALLP (LISTGET IDLE.PROFILE (QUOTE SAVEVM))) (\FLUSHVMOK? (QUOTE SAVEVM) T)) (* ; "Set up timer to go off when a SAVEVM should be done.  Don't do it if it's not safe") (SETQ SAVEVM.TIMER (SETUPTIMER (TIMES (LISTGET IDLE.PROFILE (QUOTE SAVEVM)) 60000))))) (SETQ IDLE.PROCESS (ADD.PROCESS (CONS (LISTGET IDLE.PROFILE (QUOTE DISPLAYFN)) (CONS W (LISTGET IDLE.PROFILE (QUOTE DISPLAY.DATA)))) (QUOTE NAME) (QUOTE IDLE.DISPLAY))) (RESETSAVE NIL (LIST (FUNCTION DEL.PROCESS) IDLE.PROCESS)) (BLOCK) (* ; "Let the demo get started first") WAIT.FOR.CHAR (COND ((NOT (READP T T)) (BLOCK 250) (\DIRTYBACKGROUND) (COND ((\SAVEVMBACKGROUND) (SETQ SAVEVM.TIMER))) (COND ((OR (KEYDOWNP (QUOTE LSHIFT)) (KEYDOWNP (QUOTE RSHIFT))) (AND (PROCESSP IDLE.PROCESS) (SUSPEND.PROCESS IDLE.PROCESS)) (CLEARW PROMPTWINDOW) (PRINTOUT PROMPTWINDOW (USERNAME NIL NIL T) " Idle " (\IDLE.TIME START.TIME) T) (until (NOT (OR (KEYDOWNP (QUOTE LSHIFT)) (KEYDOWNP (QUOTE RSHIFT)))) do (BLOCK 250)) (AND IDLE.PROCESS (WAKE.PROCESS IDLE.PROCESS)))) (COND ((AND SAVEVM.TIMER (NOT \VMEM.INHIBIT.WRITE) (TIMEREXPIRED? SAVEVM.TIMER)) (COND ((\FLUSHVMOK? (QUOTE SAVEVM) T) (* ; "if SAVEVM not allowed forget it forever") (RESETFORM (CURSOR SAVINGCURSOR) (NLSETQ (SAVEVM))))) (SETQ SAVEVM.TIMER))) (TTY.PROCESS (THIS.PROCESS)) (* ; "Keep us the tty process, even if someone else tries for it") (GO WAIT.FOR.CHAR))) (COND ((PROCESSP IDLE.PROCESS) (SUSPEND.PROCESS IDLE.PROCESS))) (SETQ NO.ERROR (NLSETQ (SETQ EXIT? (\IDLE.EXIT?)))) (COND ((NOT NO.ERROR) (SETQ INTERRUPTED.STRING "ERROR while checking Allowed Logins") (SETPASSWORD NIL (USERNAME NIL NIL T) "") (SETQ \IDLE.PASSWORD.SET (QUOTE CLEAR))) ((NOT EXIT?) (SETQ INTERRUPTED.STRING (CONCAT "Someone tried to use the machine at " (DATE (DATEFORMAT NO.DATE)))) (AND IDLE.PROCESS (WAKE.PROCESS IDLE.PROCESS)) (CLEARBUF T) (GO WAIT.FOR.CHAR))) EXIT (CLOSEW W) (FRESHLINE PROMPTWINDOW) (AND INTERRUPTED.STRING (PRINTOUT PROMPTWINDOW INTERRUPTED.STRING T)) (PRINTOUT PROMPTWINDOW "Idle time " (\IDLE.TIME START.TIME)))) (COND (\IDLE.PASSWORD.SET (* ; "Notify anyone who cares about login change, since we suppressed it earlier") (MAPC \AFTERLOGINFNS (FUNCTION APPLY*)))))
-)
+  [LAMBDA (FROMTIMEOUT)                                      (* ; "Edited 28-Sep-2022 09:05 by lmm")
+                                                             (* ; "Edited 22-Sep-2022 15:04 by lmm")
+                                                             (* ; "Edited 29-Jun-88 14:36 by drc:")
+
+    (* ;; "This is the main idling loop. ")
+
+    (RESETLST
+        (RESETSAVE NIL '(SETTOPVAL \IDLING NIL))
+        (PROG [(START.TIME (ALTO.TO.LISP.DATE \LASTUSERACTION))
+               VMEM.SAVED W SAVEVM.TIMER IDLE.PROCESS NO.ERROR EXIT? INTERRUPTED.STRING 
+               IDLING.KEYACTIONS (IDLE.TIMEOUT (LISTGET IDLE.PROFILE 'TIMEOUT))
+               (SAVEVM (LISTGET IDLE.PROFILE 'SAVEVM))
+               (LOGOUT (LISTGET IDLE.PROFILE 'LOGOUT]
+              (COND
+                 ((NOT (\OK.TO.IDLE?))                       (* ; 
+                                                      "'Somebody in password prompt, better not idle")
+                  (RETURN)))
+              (SETQ \IDLE.PASSWORD.SET NIL)
+              [COND
+                 ((EQ (LISTGET IDLE.PROFILE 'FORGET)
+                      'FIRST)
+
+                  (* ;; 
+       "do things like dump cache listings and flush files to servers *before* passwords get smashed")
+
+                  (\USEREVENT 'BEFORESAVEVM)
+                  (\DEVICEEVENT 'BEFORESAVEVM)
+                  (\DEVICEEVENT 'AFTERDOSAVEVM)
+                  (\USEREVENT 'AFTERDOSAVEVM]
+              (RESETSAVE NIL (LIST (FUNCTION NOTIFY.EVENT)
+                                   \IDLING.OVER))
+              [for X in IDLE.SUSPEND.PROCESS.NAMES bind PROC do 
+                                                             (* ; 
+                                "Turn off things like CROCK, LAFITEMAILWATCH, SPACEWINDOW, REMINDERS")
+                                                                (COND
+                                                                   ((SETQ PROC (FIND.PROCESS X))
+                                                                    (PROCESS.EVAL PROC '(\IDLE.WAIT]
+              (RESETSAVE \AFTERLOGINFNS NIL)                 (* ; 
+                                                   "So that SETPASSWORD doesn't trigger any activity")
+              [for X in IDLE.RESETVARS do                    (* ; 
+                                              "turn off things like pup-trace, xiptrace and the like")
+                                          (RESETSAVE (SETTOPVAL (CAR X)
+                                                            (EVAL (CADR X)))
+                                                 (LIST (FUNCTION SETTOPVAL)
+                                                       (CAR X)
+                                                       (GETTOPVAL (CAR X]
+                                                             (* ; 
+                                                           "so that mouse buttons will trigger READP")
+              (COND
+                 ((EQ (LISTGET IDLE.PROFILE 'FORGET)
+                      'FIRST)
+                  (SETQ \IDLE.PASSWORD.SET 'CLEAR)
+                  (SETPASSWORD NIL (USERNAME NIL NIL T)
+                         "")))
+              (RESETSAVE (TTY.PROCESS (THIS.PROCESS)))
+
+         (* ;; "Note that IDLE has set up our KEYACTION table (in the add.process) to ignore interrupts and make mouse clicks trigger readp.")
+
+              (RESETSAVE (CHANGENAME '\LOGIN.READ 'PROVIDE.PROMPTING.WINDOW '\IDLE.PROMPTING.WINDOW)
+                     '(CHANGENAME \LOGIN.READ \IDLE.PROMPTING.WINDOW PROVIDE.PROMPTING.WINDOW))
+              (COND
+                 ((OR [AND FROMTIMEOUT (NOT (AND (SMALLP IDLE.TIMEOUT)
+                                                 (\SECONDSCLOCKGREATERP \LASTUSERACTION
+                                                        (TIMES IDLE.TIMEOUT 60]
+                      (NOT (\OK.TO.IDLE?)))
+
+                  (* ;; "Check again if it's ok, since somebody could have fallen into a password prompter between then and now.  Anybody who does after this is ok, because the CHANGENAME above is now in effect.  Also check timeout again, in case there was a user interaction during the BEFORESAVEVM stuff")
+
+                  (RETURN)))
+              (CLEARW PROMPTWINDOW)
+              (SETQ W (CREATEW WHOLESCREEN NIL 0 T))
+              (RESETSAVE NIL (LIST (FUNCTION CLOSEW)
+                                   W))
+              [RESETSAVE (CURSOR (CURSORCREATE (BITMAPCREATE 0 0]
+              (SETQ VMEM.SAVED "Vmem not saved")
+              (if (VIDEOCOLOR)
+                  then (OPENW W)
+                else (DSPOPERATION 'ERASE W)
+                     (DSPTEXTURE BLACKSHADE W)
+                     (CLEARW W))
+              (CL:UNLESS (AND (SMALLP SAVEVM)
+                              (> SAVEVM 0))
+                     (SETQ SAVEVM))
+              (CL:UNLESS (AND (SMALLP LOGOUT)
+                              (> LOGOUT 0))
+                     (SETQ LOGOUT))
+              (if (AND SAVEVM LOGOUT (IGEQ SAVEVM LOGOUT))
+                  then 
+                       (* ;; "if LOGOUT is sooner than SAVEVM")
+
+                       (SETQ SAVEVM NIL))
+              [if (OR SAVEVM LOGOUT)
+                  then (SETQ SAVEVM.TIMER (SETUPTIMER (ITIMES (OR SAVEVM LOGOUT)
+                                                             60000]
+              (SETQ IDLE.PROCESS (ADD.PROCESS [CONS (LISTGET IDLE.PROFILE 'DISPLAYFN)
+                                                    (CONS W (LISTGET IDLE.PROFILE 'DISPLAY.DATA]
+                                        'NAME
+                                        'IDLE.DISPLAY))
+              (RESETSAVE NIL (LIST (FUNCTION DEL.PROCESS)
+                                   IDLE.PROCESS))
+              (BLOCK)                                        (* ; "Let the idler get started first")
+          WAIT.FOR.CHAR
+              (COND
+                 ((NOT (READP T T))
+                  (BLOCK 250)                                (* ; "(\DIRTYBACKGROUND)")
+                  (CL:WHEN (AND SAVEVM.TIMER (TIMEREXPIRED? SAVEVM.TIMER))
+                      (if SAVEVM
+                          then (if (SAVEVM)
+                                   then 
+                                        (* ;; "restarting after SaVEVM, end idle")
+
+                                        (GO EXIT))
+                               (SETQ VM.SAVED (CONCAT "VM saved at " (DATE)))
+                               (if LOGOUT
+                                   then (SETQ SAVEVM.TIMER (SETUPTIMER (CL:* (- LOGOUT SAVEVM)
+                                                                             60000)))
+                                        (SETQ SAVEVM))
+                        elseif LOGOUT
+                          then (LOGOUT)                      (* ; " could do (LOGOUT T) if SAVEVM")
+
+                               (* ;; "must be returning later")
+
+                               (GO EXIT)))
+                  [COND
+                     ((OR (KEYDOWNP 'LSHIFT)
+                          (KEYDOWNP 'RSHIFT))
+                      (AND (PROCESSP IDLE.PROCESS)
+                           (SUSPEND.PROCESS IDLE.PROCESS))
+                      (CLEARW PROMPTWINDOW)
+                      (PRINTOUT PROMPTWINDOW (USERNAME NIL NIL T)
+                             " Idle "
+                             (\IDLE.TIME START.TIME)
+                             T VMEM.SAVED T)
+                      (until [NOT (OR (KEYDOWNP 'LSHIFT)
+                                      (KEYDOWNP 'RSHIFT] do (BLOCK 250))
+                      (AND IDLE.PROCESS (WAKE.PROCESS IDLE.PROCESS]
+                  (TTY.PROCESS (THIS.PROCESS))               (* ; 
+                                         "Keep us the tty process, even if someone else tries for it")
+                  (GO WAIT.FOR.CHAR)))
+              (COND
+                 ((PROCESSP IDLE.PROCESS)
+                  (SUSPEND.PROCESS IDLE.PROCESS)))
+              [SETQ NO.ERROR (NLSETQ (SETQ EXIT? (\IDLE.EXIT?]
+              (COND
+                 ((NOT NO.ERROR)
+                  (SETQ INTERRUPTED.STRING "ERROR while checking Allowed Logins")
+                  (SETPASSWORD NIL (USERNAME NIL NIL T)
+                         "")
+                  (SETQ \IDLE.PASSWORD.SET 'CLEAR))
+                 ((NOT EXIT?)
+                  [SETQ INTERRUPTED.STRING (CONCAT "Someone tried to use the machine at "
+                                                  (DATE (DATEFORMAT NO.DATE]
+                  (AND IDLE.PROCESS (WAKE.PROCESS IDLE.PROCESS))
+                  (CLEARBUF T)
+                  (GO WAIT.FOR.CHAR)))
+          EXIT
+              (CLOSEW W)
+              (FRESHLINE PROMPTWINDOW)
+              (AND INTERRUPTED.STRING (PRINTOUT PROMPTWINDOW INTERRUPTED.STRING T))
+              (PRINTOUT PROMPTWINDOW "Idle time " (\IDLE.TIME START.TIME))
+
+         (* ;; "should be unnecessary (see RESETSAVE above)")
+
+              (NOTIFY.EVENT \IDLING.OVER)))
+    (COND
+       (\IDLE.PASSWORD.SET                                   (* ; 
+                         "Notify anyone who cares about login change, since we suppressed it earlier")
+              (MAPC \AFTERLOGINFNS (FUNCTION APPLY*])
 
 (\IDLE.WAIT
   [LAMBDA NIL
@@ -247,17 +412,18 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
     (while \IDLING do (BLOCK 500])
 
 (\OK.TO.IDLE?
-  [LAMBDA NIL                                                (* bvm%: " 4-Dec-85 15:05")
-    (RESETLST (OBTAIN.MONITORLOCK \GETPASSWORD.LOCK T T])
+  [LAMBDA NIL                                                (* bvm%: " 4-Dec-85 15:05")
+    (RESETLST
+        (OBTAIN.MONITORLOCK \GETPASSWORD.LOCK T T))])
 
 (\IDLE.TIME
-  [LAMBDA (START.TIME)                                       (* bvm%: "15-Oct-85 23:35")
+  [LAMBDA (START.TIME)                                       (* bvm%: "15-Oct-85 23:35")
     (LET [(GONE (IDIFFERENCE (IDATE)
                        START.TIME))
           (ONEDAY (CONSTANT (IDIFFERENCE (IDATE "2-Jan-80 00:00:00")
                                    (IDATE "1-Jan-80 00:00:00"]
          (COND
-            ((ILESSP GONE ONEDAY)                            (* ; "Express in hours:min:sec")
+            ((ILESSP GONE ONEDAY)                            (* ; "Express in hours:min:sec")
              (GDATE (IPLUS (IDATE "1-Jan-80 00:00:00")
                            GONE)
                     (DATEFORMAT NO.DATE)))
@@ -269,7 +435,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                          (T "."])
 
 (\IDLE.OUT
-  [LAMBDA NIL                                                (* bvm%: "16-Sep-85 18:34")
+  [LAMBDA NIL                                                (* bvm%: "16-Sep-85 18:34")
     (AND (NOT \IDLING)
          (LET [(TIMEOUT (LISTGET IDLE.PROFILE 'TIMEOUT]
               (AND (SMALLP TIMEOUT)
@@ -278,35 +444,98 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                    (IDLE T])
 
 (\IDLE.EXIT?
-(LAMBDA NIL (* ; "Edited 22-Nov-88 15:25 by drc:") (RESETLST (RESETSAVE (TTYDISPLAYSTREAM PROMPTWINDOW)) (CLEARBUF T) (PROG ((GROUP (LISTGET IDLE.PROFILE (QUOTE ALLOWED.LOGINS))) (AUTHTYPE (LISTGET IDLE.PROFILE (QUOTE AUTHENTICATE))) (TIMEOUT (LISTGET IDLE.PROFILE (QUOTE LOGIN.TIMEOUT))) (NAME (USERNAME NIL NIL T)) PWD WATCHER) (COND ((NLISTP GROUP) (* ; "no login check at all") (COND ((LISTGET IDLE.PROFILE (QUOTE FORGET)) (SETPASSWORD NIL NAME ""))) (RETURN T))) (COND ((EQ 0 (NCHARS NAME)) (* ; "Not logged in, so don't complain about anything") (RETURN T))) (OBTAIN.MONITORLOCK \GETPASSWORD.LOCK NIL T) (* ; "Lock out anyone else trying to prompt for a password") (CLEARW PROMPTWINDOW) (* ; "prompt for password, maybe new username") (SETQ PWD (COND ((AND (EQUAL GROUP (QUOTE (T))) NAME) (* ; "Only previous user allowed to login") (PROMPTFORWORD (CONCAT NAME " password:") NIL NIL NIL (QUOTE *) TIMEOUT)) (T (if TIMEOUT then (* ; "spawn process to watch for login.  Done this way rather than timeout in \LOGIN.READ because we want to blow away timed-out password prompt, too.") (RESETSAVE NIL (LIST (QUOTE DEL.PROCESS) (SETQ WATCHER (ADD.PROCESS (BQUOTE (\IDLE.PROMPT.WATCHER (QUOTE (\, (THIS.PROCESS))) (\, TIMEOUT)))))))) (PROG1 (CDR (SETQ NAME (CAR (NLSETQ (\LOGIN.READ NIL NAME NIL NIL (QUOTE NS)))))) (SETQ NAME (MKSTRING (CAR NAME))) (if WATCHER then (DEL.PROCESS WATCHER)))))) (* ; "decide whether NAME and PWD are in GROUP") (RETURN (COND ((NULL PWD) NIL) ((AND (OR (MEMB T GROUP) (MEMB (QUOTE *) GROUP)) (\IDLE.IS.PREVIOUS NAME PWD (EQUAL GROUP (QUOTE (T))))) (* ;; "Previous user is allowed to login.  Also, if only allowed login is old user, but old password is unknown, allow it") T) ((\IDLE.ISMEMBER GROUP NAME PWD) (COND ((OR (NULL AUTHTYPE) (\IDLE.AUTHENTICATE NAME PWD AUTHTYPE (NOT (MEMB T GROUP)) PROMPTWINDOW)) (SETPASSWORD NIL NAME PWD) (SETQ \IDLE.PASSWORD.SET T) T) (T (DISMISS 5000) (* ; "Let the error message be visible") NIL))) (T (PRINTOUT PROMPTWINDOW "login incorrect" T) (DISMISS 5000) (* ; "Let the error message be visible") NIL))))))
-)
+  [LAMBDA NIL                                                (* ; "Edited 22-Nov-88 15:25 by drc:")
+    (RESETLST
+        (RESETSAVE (TTYDISPLAYSTREAM PROMPTWINDOW))
+        (CLEARBUF T)
+        [PROG ((GROUP (LISTGET IDLE.PROFILE 'ALLOWED.LOGINS))
+               (AUTHTYPE (LISTGET IDLE.PROFILE 'AUTHENTICATE))
+               (TIMEOUT (LISTGET IDLE.PROFILE 'LOGIN.TIMEOUT))
+               (NAME (USERNAME NIL NIL T))
+               PWD WATCHER)
+              (COND
+                 ((NLISTP GROUP)                             (* ; "no login check at all")
+                  (COND
+                     ((LISTGET IDLE.PROFILE 'FORGET)
+                      (SETPASSWORD NIL NAME "")))
+                  (RETURN T)))
+              (COND
+                 ((EQ 0 (NCHARS NAME))                       (* ; 
+                                                    "Not logged in, so don't complain about anything")
+                  (RETURN T)))
+              (OBTAIN.MONITORLOCK \GETPASSWORD.LOCK NIL T)   (* ; 
+                                               "Lock out anyone else trying to prompt for a password")
+              (CLEARW PROMPTWINDOW)                          (* ; 
+                                                            "prompt for password, maybe new username")
+              [SETQ PWD
+               (COND
+                  ((AND (EQUAL GROUP '(T))
+                        NAME)                                (* ; 
+                                                             "Only previous user allowed to login")
+                   (PROMPTFORWORD (CONCAT NAME " password:")
+                          NIL NIL NIL '* TIMEOUT))
+                  (T [if TIMEOUT
+                         then                                (* ; "spawn process to watch for login.  Done this way rather than timeout in \LOGIN.READ because we want to blow away timed-out password prompt, too.")
+                              (RESETSAVE NIL (LIST 'DEL.PROCESS
+                                                   (SETQ WATCHER
+                                                    (ADD.PROCESS `(\IDLE.PROMPT.WATCHER
+                                                                   ',(THIS.PROCESS)
+                                                                   ,TIMEOUT]
+                     (PROG1 [CDR (SETQ NAME (CAR (NLSETQ (\LOGIN.READ NIL NAME NIL NIL 'NS]
+                         (SETQ NAME (MKSTRING (CAR NAME)))
+                         (if WATCHER
+                             then (DEL.PROCESS WATCHER)))]   (* ; 
+                                                           "decide whether NAME and PWD are in GROUP")
+              (RETURN (COND
+                         ((NULL PWD)
+                          NIL)
+                         ([AND (OR (MEMB T GROUP)
+                                   (MEMB '* GROUP))
+                               (\IDLE.IS.PREVIOUS NAME PWD (EQUAL GROUP '(T]
+
+                          (* ;; "Previous user is allowed to login.  Also, if only allowed login is old user, but old password is unknown, allow it")
+
+                          T)
+                         ((\IDLE.ISMEMBER GROUP NAME PWD)
+                          (COND
+                             ((OR (NULL AUTHTYPE)
+                                  (\IDLE.AUTHENTICATE NAME PWD AUTHTYPE (NOT (MEMB T GROUP))
+                                         PROMPTWINDOW))
+                              (SETPASSWORD NIL NAME PWD)
+                              (SETQ \IDLE.PASSWORD.SET T)
+                              T)
+                             (T (DISMISS 5000)               (* ; "Let the error message be visible")
+                                NIL)))
+                         (T (PRINTOUT PROMPTWINDOW "login incorrect" T)
+                            (DISMISS 5000)                   (* ; "Let the error message be visible")
+                            NIL])])
 
 (\IDLE.PROMPT.WATCHER
-  [LAMBDA (PROC TIMEOUT)                                     (* ; "Edited  3-Apr-87 13:56 by bvm:")
-          
-          (* ;; "Aborts proc if it goes for longer than TIMEOUT (in seconds) with no user action")
+  [LAMBDA (PROC TIMEOUT)                                     (* ; "Edited  3-Apr-87 13:56 by bvm:")
+
+    (* ;; "Aborts proc if it goes for longer than TIMEOUT (in seconds) with no user action")
 
     (do [DISMISS (TIMES 1000 (IMAX 1 (- TIMEOUT (- (\DAYTIME0 (create FIXP))
                                                    \LASTUSERACTION] 
-                                                             (* ; "Dismiss until expected timeout")
+                                                             (* ; "Dismiss until expected timeout")
         (if (\SECONDSCLOCKGREATERP \LASTUSERACTION TIMEOUT)
             then (PROCESS.EVAL PROC '(\IDLE.EXIT.ABORT))
                  (RETURN])
 
 (\IDLE.EXIT.ABORT
-  [LAMBDA NIL                                                (* ; "Edited  3-Apr-87 13:37 by bvm:")
-          
-          (* ;; "Abort process if still sitting under login reader")
+  [LAMBDA NIL                                                (* ; "Edited  3-Apr-87 13:37 by bvm:")
+
+    (* ;; "Abort process if still sitting under login reader")
 
     (if (RELSTK (STKPOS '\LOGIN.READ))
         then (ERROR!])
 
 (\IDLE.PROMPTING.WINDOW
-  [LAMBDA (TITLE)                                            (* bvm%: " 5-Nov-85 23:10")
+  [LAMBDA (TITLE)                                            (* bvm%: " 5-Nov-85 23:10")
 
-(* ;;; "Replaces PROVIDE.PROMPTING.WINDOW in \LOGIN.READ while idle is on")
+(* ;;; "Replaces PROVIDE.PROMPTING.WINDOW in \LOGIN.READ while idle is on")
 
-    (RESETSAVE (INTERRUPTCHAR 5 'ERROR))                     (* ; "Allow ^E to abort prompt")
+    (RESETSAVE (INTERRUPTCHAR 5 'ERROR))                     (* ; "Allow ^E to abort prompt")
     (COND
        ((NEQ (PROCESSPROP (THIS.PROCESS)
                     'NAME)
@@ -320,7 +549,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                '(WAKE.PROCESS IDLE.DISPLAY])
 
 (\IDLE.IS.PREVIOUS
-  [LAMBDA (NAME PWD NULLOK)                           (* ; "Edited 26-Jan-89 22:38 by NSato.fx")
+  [LAMBDA (NAME PWD NULLOK)                               (* ; "Edited 26-Jan-89 22:38 by NSato.fx")
 
 (* ;;; "if the new name is the same as the old name, and the old global password wasn't forgotten, then allow the old password")
 
@@ -332,31 +561,30 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                (if (ZEROP (NCHARS OLDPWD))
                    then (SETQ OLDPWD))
                (if (AND (EQ (MACHINETYPE)
-                                'MAIKO)
-                            (NOT OLDPWD))
+                            'MAIKO)
+                        (NOT OLDPWD))
                    then 
+                        (* ;; "when Maiko is first booted the password is empty but we can check w/ UNIX to see if this is the same user s.t. ")
 
-                         (* ;; "when Maiko is first booted the password is empty but we can check w/ UNIX to see if this is the same user s.t. ")
+                        (* ;; 
+                     "UNIX only looks at first 8 chars of username, so ignore any extra chars typed.")
 
-                         (* ;; 
-                   "UNIX only looks at first 8 chars of username, so ignore any extra chars typed.")
-
-                         (if (> (NCHARS PREVIOUS.USERNAME)
-                                    8)
-                             then (SETQ PREVIOUS.USERNAME (SUBSTRING PREVIOUS.USERNAME 1 8)))
-                         (if (> (NCHARS NAME)
-                                    8)
-                             then (SETQ NAME (SUBSTRING NAME 1 8)))
-                         (AND (STRING-EQUAL PREVIOUS.USERNAME NAME)
-                              (SUBRCALL CHECKBCPLPASSWORD NAME PWD))
+                        (if (> (NCHARS PREVIOUS.USERNAME)
+                               8)
+                            then (SETQ PREVIOUS.USERNAME (SUBSTRING PREVIOUS.USERNAME 1 8)))
+                        (if (> (NCHARS NAME)
+                               8)
+                            then (SETQ NAME (SUBSTRING NAME 1 8)))
+                        (AND (STRING-EQUAL PREVIOUS.USERNAME NAME)
+                             (SUBRCALL CHECKBCPLPASSWORD NAME PWD))
                  else (AND (STRING-EQUAL PREVIOUS.USERNAME NAME)
-                               (COND
-                                  (OLDPWD (STRING-EQUAL OLDPWD PWD))
-                                  (T                         (* ; "there was no password")
-                                     NULLOK])
+                           (COND
+                              (OLDPWD (STRING-EQUAL OLDPWD PWD))
+                              (T                             (* ; "there was no password")
+                                 NULLOK])
 
 (\IDLE.ISMEMBER
-  [LAMBDA (GROUP NAME PWD)                                 (* ; "Edited 26-Dec-86 20:31 by cutting")
+  [LAMBDA (GROUP NAME PWD)                                 (* ; "Edited 26-Dec-86 20:31 by cutting")
     (OR [for X in GROUP thereis (COND
                                    ((EQ X T)
                                     (STRING-EQUAL NAME (USERNAME)))
@@ -399,11 +627,58 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                                         T])
 
 (\IDLE.AUTHENTICATE
-(LAMBDA (NAME PWD TYPE IFALLDOWN OUTPUT) (* ; "Edited 10-Jun-88 02:30 by drc:") (LET ((NS (AND (NEQ TYPE (QUOTE GV)) (NEQ TYPE (QUOTE UNIX)) CH.DEFAULT.DOMAIN)) (GV (AND (NEQ TYPE (QUOTE NS)) (NEQ TYPE (QUOTE UNIX)) DEFAULTREGISTRY)) (UNIX (AND (NEQ TYPE (QUOTE NS)) (NEQ TYPE (QUOTE GV)) (EQ (MACHINETYPE) (QUOTE MAIKO)))) CODE) (printout OUTPUT T "Authenticating " NAME " ... ") (COND ((EQ TYPE T) (* ;; "use heuristics to determine authentication type") (COND ((STRPOS ":" NAME) (* ; "probably wanted NS login") (SETQ GV) (SETQ UNIX) (SETQ NS T)) ((AND (STRPOS "." NAME) DEFAULTREGISTRY) (* ; "probably wanted GV login") (SETQ UNIX) (SETQ NS) (SETQ GV T))))) (OR (AND UNIX (EQ (MACHINETYPE) (QUOTE MAIKO)) (COND ((SUBRCALL CHECKBCPLPASSWORD NAME PWD) (SETQ CODE T)) (T (SETQ CODE (QUOTE Bad% login)) NIL))) (AND NS (EQ T (SETQ CODE (NS.AUTHENTICATE (NS.MAKE.SIMPLE.CREDENTIALS (CONS NAME (\ENCRYPT.PWD (CONCAT PWD)))))))) (AND GV (SETQ CODE (GV.AUTHENTICATE NAME (\ENCRYPT.PWD (CONCAT PWD)))))) (SELECTQ CODE (AllDown (printout OUTPUT "All authentication servers down" T) IFALLDOWN) ((T NIL) (printout OUTPUT "ok.") T) ((SimpleKeyDoesNotExist CredentialsInvalid BadRName BadPassword Bad% login) (printout OUTPUT CODE) NIL) (PROGN (printout OUTPUT T "Odd response from authenticator: " CODE) T))))
-)
+  [LAMBDA (NAME PWD TYPE IFALLDOWN OUTPUT)                   (* ; "Edited 10-Jun-88 02:30 by drc:")
+    (LET ((NS (AND (NEQ TYPE 'GV)
+                   (NEQ TYPE 'UNIX)
+                   CH.DEFAULT.DOMAIN))
+          (GV (AND (NEQ TYPE 'NS)
+                   (NEQ TYPE 'UNIX)
+                   DEFAULTREGISTRY))
+          [UNIX (AND (NEQ TYPE 'NS)
+                     (NEQ TYPE 'GV)
+                     (EQ (MACHINETYPE)
+                         'MAIKO]
+          CODE)
+         (printout OUTPUT T "Authenticating " NAME " ... ")
+         [COND
+            ((EQ TYPE T)
+
+             (* ;; "use heuristics to determine authentication type")
+
+             (COND
+                ((STRPOS ":" NAME)                           (* ; "probably wanted NS login")
+                 (SETQ GV)
+                 (SETQ UNIX)
+                 (SETQ NS T))
+                ((AND (STRPOS "." NAME)
+                      DEFAULTREGISTRY)                       (* ; "probably wanted GV login")
+                 (SETQ UNIX)
+                 (SETQ NS)
+                 (SETQ GV T]
+         [OR (AND UNIX (EQ (MACHINETYPE)
+                           'MAIKO)
+                  (COND
+                     ((SUBRCALL CHECKBCPLPASSWORD NAME PWD)
+                      (SETQ CODE T))
+                     (T (SETQ CODE 'Bad% login)
+                        NIL)))
+             [AND NS (EQ T (SETQ CODE (NS.AUTHENTICATE (NS.MAKE.SIMPLE.CREDENTIALS
+                                                        (CONS NAME (\ENCRYPT.PWD (CONCAT PWD]
+             (AND GV (SETQ CODE (GV.AUTHENTICATE NAME (\ENCRYPT.PWD (CONCAT PWD]
+         (SELECTQ CODE
+             (AllDown (printout OUTPUT "All authentication servers down" T)
+                      IFALLDOWN)
+             ((T NIL) 
+                  (printout OUTPUT "ok.")
+                  T)
+             ((SimpleKeyDoesNotExist CredentialsInvalid BadRName BadPassword Bad% login) 
+                  (printout OUTPUT CODE)
+                  NIL)
+             (PROGN (printout OUTPUT T "Odd response from authenticator: " CODE)
+                    T])
 
 (\IDLERKEYACTION
-  [LAMBDA NIL                                            (* ; "Edited 23-Mar-92 13:20 by jds")
+  [LAMBDA NIL                                                (* ; "Edited 23-Mar-92 13:20 by jds")
 
     (* ;; "Constructs a KEYACTION table for the IDLER process, by taking the (machine-dependent) original table and smashing the mouse buttons so that they transmit characters that cause the idler to wake up, and disabling the interrupts")
 
@@ -435,13 +710,13 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
 
 (RPAQ? IDLE.KEYACTIONTABLE )
 
-(ADDTOVAR SYSTEMINITVARS (IDLE.PROFILE ALLOWED.LOGINS NIL FORGET NIL TIMEOUT 0 DISPLAYFN 
-                                    IDLE.BOUNCING.BOX SAVEVM 10 AUTHENTICATE T LOGIN.TIMEOUT 30))
+(ADDTOVAR SYSTEMINITVARS (IDLE.PROFILE ALLOWED.LOGINS NIL FORGET NIL TIMEOUT 0 DISPLAYFN IDLE.RANDOM
+                                SAVEVM 5 LOGOUT 5))
 
 (ADDTOVAR IDLE.SUSPEND.PROCESS.NAMES MOUSE)
 
 (ADDTOVAR IDLE.RESETVARS (PUPTRACEFLG NIL)
-                             (XIPTRACEFLG NIL))
+                         (XIPTRACEFLG NIL))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS IDLE.PROFILE \IDLING \LASTUSERACTION IDLE.RESETVARS IDLE.SUSPEND.PROCESS.NAMES 
@@ -533,35 +808,34 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
 
 (IDLE.BOUNCING.BOX
   [LAMBDA (WINDOW BOX WAIT)                                  (* ; "Edited  3-Sep-87 18:55 by jds")
-          
-          (* ;; "Bounce a window around the screen.")
+
+    (* ;; "Bounce a window around the screen.")
 
     (OR WAIT (SETQ WAIT 1000))
     (OR BOX (SETQ BOX IDLE.BOUNCING.BOX))
-    (RESETLST (LET ((MAXX (WINDOWPROP WINDOW 'WIDTH))
-                    (MAXY (WINDOWPROP WINDOW 'HEIGHT))
-                    ORIGBOX X Y BITMAP)
-                   [for TAIL on [SETQ BOX (COND
-                                             ((LISTP BOX)    (* ; "don't want to trash user's box")
-
-                                              (COPY BOX))
-                                             (T (LIST BOX] unless (WINDOWP (CAR TAIL))
-                      do                                     (* ; "Precompute everything but windows")
-
-                         (RPLACA TAIL (IDLE.BITMAP NIL (CAR TAIL]
-                   (SETQ ORIGBOX BOX)
-                   (while T do (SETQ BITMAP (IDLE.BITMAP BITMAP (CAR BOX)))
-                               (SETQ BOX (OR (CDR BOX)
-                                             ORIGBOX))       (* ; "rotate it")
-
-                               [SETQ X (RAND (IDIFFERENCE MAXX (BITMAPWIDTH BITMAP]
-                               [SETQ Y (RAND (IDIFFERENCE MAXY (BITMAPHEIGHT BITMAP]
-                               (BITBLT BITMAP 0 0 WINDOW X Y NIL NIL NIL 'INVERT)
-                               (BLOCK WAIT)
-                               (BITBLT BITMAP 0 0 WINDOW X Y NIL NIL NIL 'INVERT])
+    (RESETLST
+        [LET ((MAXX (WINDOWPROP WINDOW 'WIDTH))
+              (MAXY (WINDOWPROP WINDOW 'HEIGHT))
+              ORIGBOX X Y BITMAP)
+             [for TAIL on [SETQ BOX (COND
+                                       ((LISTP BOX)          (* ; "don't want to trash user's box")
+                                        (COPY BOX))
+                                       (T (LIST BOX] unless (WINDOWP (CAR TAIL))
+                do                                           (* ; "Precompute everything but windows")
+                   (RPLACA TAIL (IDLE.BITMAP NIL (CAR TAIL]
+             (SETQ ORIGBOX BOX)
+             (while T do (SETQ BITMAP (IDLE.BITMAP BITMAP (CAR BOX)))
+                         (SETQ BOX (OR (CDR BOX)
+                                       ORIGBOX))             (* ; "rotate it")
+                         [SETQ X (RAND (IDIFFERENCE MAXX (BITMAPWIDTH BITMAP]
+                         [SETQ Y (RAND (IDIFFERENCE MAXY (BITMAPHEIGHT BITMAP]
+                         (BITBLT BITMAP 0 0 WINDOW X Y NIL NIL NIL 'INVERT)
+                         (BLOCK WAIT)
+                         (BITBLT BITMAP 0 0 WINDOW X Y NIL NIL NIL 'INVERT])])
 
 (IDLE.BITMAP
-  [LAMBDA (BITMAP BOX)                                       (* lmm "18-Jan-86 03:01")
+  [LAMBDA (BITMAP BOX)                                     (* ; "Edited 16-Sep-2022 22:33 by larry")
+                                                             (* lmm "18-Jan-86 03:01")
     (COND
        ((BITMAPP BOX)
         BOX)
@@ -585,8 +859,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
         (OR (BITMAPP (CAR BOX))
             (CAR (RPLACA BOX (IDLE.BITMAP NIL (CAR BOX]
        (T (LET ((FONT (OR (FONTCREATE 'TIMESROMAND 36 NIL NIL NIL T)
-                          (PROGN                             (* ; 
-                     "Shouldn't happen unless somebody flushed TIMESROMAND 36 -- don't want to break")
+                          (PROGN                             (* ; 
+                     "Shouldn't happen unless somebody flushed TIMESROMAND 36 -- don't want to break")
                                  (FONTCREATE 'HELVETICA 12 NIL NIL NIL T))
                           DEFAULTFONT))
                 DSP)
@@ -595,7 +869,7 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                                  (LITATOM BOX))
                              (NEQ (NCHARS BOX)
                                   0)))
-                   (SETQ BOX "Xerox Lisp")))
+                   (SETQ BOX "Interlisp.org")))
                (SETQ BITMAP (BITMAPCREATE (STRINGWIDTH BOX FONT)
                                    (FONTHEIGHT FONT)))
                (SETQ DSP (DSPCREATE BITMAP))
@@ -605,24 +879,42 @@ Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990, 1992 by Venue & Xerox Corporat
                       DSP)
                (PRIN3 BOX DSP)
                BITMAP])
+
+(IDLE.RANDOM
+  [LAMBDA (W)                                                (* ; "Edited 28-Sep-2022 19:46 by lmm")
+    (LET ([N (IF (BOUNDP 'LAST.IDLE.FUNCTION)
+                 THEN [IF (IGREATERP (SETQ LAST.IDLE.FUNCTION (SUB1 LAST.IDLE.FUNCTION))
+                                 0)
+                          THEN LAST.IDLE.FUNCTION
+                        ELSE (SETQ LAST.IDLE.FUNCTION (SUB1 (LENGTH IDLE.FUNCTIONS]
+                      (SETQ LAST.IDLE.FUNCTION)
+               ELSE (RAND 1 (SUB1 (LENGTH IDLE.FUNCTIONS]
+          CHOICE)
+         (for FN in IDLE.FUNCTIONS when (NEQ 'Random (CAR FN))
+            do (if (< (SETQ N (SUB1 N))
+                      1)
+                   then (PROMPTPRINT "Idle display " (CAR FN))
+                        (DISMISS 1000)
+                        (RETURN (APPLY* (EVAL (CADR FN))
+                                       W])
 )
 
 (RPAQ? IDLE.BOUNCING.BOX (BITMAPCOPY LOGOBITMAP))
 
-(RPAQ? IDLE.FUNCTIONS '[("Bouncing Box" 'IDLE.BOUNCING.BOX)
-                            ("Bouncing Username" '(LAMBDA (W)
-                                                         (IDLE.BOUNCING.BOX W (USERNAME NIL NIL T])
+(RPAQ? IDLE.FUNCTIONS '(["Bouncing Box" #'(LAMBDA (W)
+                                                 (IDLE.BOUNCING.BOX W (USERNAME NIL NIL T]
+                        (Random 'IDLE.RANDOM)))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS IDLE.FUNCTIONS IDLE.BOUNCING.BOX)
 )
-(PUTPROPS IDLER COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1989 1990 1992))
+(PUTPROPS IDLER COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1989 1990 1992 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (7561 30612 (IDLE 7571 . 8016) (IDLE.SET.OPTION 8018 . 11322) (IDLE.SHOW.OPTIONS 11324
- . 11892) (IDLE.SHOW.OPTION 11894 . 13350) (\IDLER 13352 . 18468) (\IDLE.WAIT 18470 . 18573) (
-\OK.TO.IDLE? 18575 . 18747) (\IDLE.TIME 18749 . 19535) (\IDLE.OUT 19537 . 19914) (\IDLE.EXIT? 19916 . 
-22009) (\IDLE.PROMPT.WATCHER 22011 . 22673) (\IDLE.EXIT.ABORT 22675 . 22959) (\IDLE.PROMPTING.WINDOW 
-22961 . 23700) (\IDLE.IS.PREVIOUS 23702 . 25594) (\IDLE.ISMEMBER 25596 . 28199) (\IDLE.AUTHENTICATE 
-28201 . 29526) (\IDLERKEYACTION 29528 . 30610)) (35906 39471 (IDLE.BOUNCING.BOX 35916 . 37472) (
-IDLE.BITMAP 37474 . 39469)))))
+  (FILEMAP (NIL (7318 37338 (IDLE 7328 . 7776) (IDLE.SET.OPTION 7778 . 11077) (IDLE.SHOW.OPTIONS 11079
+ . 11643) (IDLE.SHOW.OPTION 11645 . 13169) (\IDLER 13171 . 22573) (\IDLE.WAIT 22575 . 22678) (
+\OK.TO.IDLE? 22680 . 22858) (\IDLE.TIME 22860 . 23642) (\IDLE.OUT 23644 . 24017) (\IDLE.EXIT? 24019 . 
+28005) (\IDLE.PROMPT.WATCHER 28007 . 28653) (\IDLE.EXIT.ABORT 28655 . 28923) (\IDLE.PROMPTING.WINDOW 
+28925 . 29660) (\IDLE.IS.PREVIOUS 29662 . 31521) (\IDLE.ISMEMBER 31523 . 34126) (\IDLE.AUTHENTICATE 
+34128 . 36248) (\IDLERKEYACTION 36250 . 37336)) (42593 47107 (IDLE.BOUNCING.BOX 42603 . 44066) (
+IDLE.BITMAP 44068 . 46171) (IDLE.RANDOM 46173 . 47105)))))
 STOP
diff --git a/sources/IDLER.LCOM b/sources/IDLER.LCOM
index ec449ac1..276b58a3 100644
Binary files a/sources/IDLER.LCOM and b/sources/IDLER.LCOM differ
