diff --git a/Makefile b/Makefile
index 62d433c3e32d44184fe933b9bf3afed3770890dc..dfd15d3afeea8229ce5c415bb5bfecfce3ea4a5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $fiHeader: Makefile,v 1.52 92/10/04 14:16:44 cer Exp $
+# $fiHeader: Makefile,v 1.53 92/10/05 10:08:19 cer Exp $
 # 
 #  Makefile for CLIM 2.0
 #
@@ -111,12 +111,12 @@ OL_UNDEFS=misc/undefinedsymbols.olit
 CLIMFASLS= climg.fasl climol.fasl climxm.fasl clim-debug.fasl clim-debugol.fasl \
 	   clim-debugxm.fasl climps.fasl climgg.fasl # clim1compat.fasl
 
-PUBLIC_OBJS=  stub-xt.o stub-x.o \
+PUBLIC_OBJS=  stub-xt.o stub-x.o stub-olit.o stub-motif.o \
 	  xlibsupport.o MyDrawingA.o \
 	  olsupport.o xtsupport.o
 
-OL_LICENSED_OBJS=clim-olit.o clim-olit_d.o
-XM_LICENSED_OBJS=clim-motif_d.o  clim-motif.o 
+OL_LICENSED_OBJS = clim-olit.o clim-olit_d.o
+XM_LICENSED_OBJS = clim-motif_d.o clim-motif.o 
 
 CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
 
@@ -126,9 +126,9 @@ INSTALLED_CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
 # These are linked into the distribution
 # `pwd`/clim-olit_d.o \ `pwd`/clim-olit.o \
 
-FCLIMOBJS= `pwd`/clim-motif_d.o `pwd`/clim-motif.o \
-	    `pwd`/stub-xt.o `pwd`/stub-x.o \
-	   `pwd`/xlibsupport.o `pwd`/MyDrawingA.o `pwd`/olsupport.o `pwd`/xtsupport.o
+#FCLIMOBJS= `pwd`/clim-motif_d.o `pwd`/clim-motif.o \
+#	    `pwd`/stub-xt.o `pwd`/stub-x.o \
+#	   `pwd`/xlibsupport.o `pwd`/MyDrawingA.o `pwd`/olsupport.o `pwd`/xtsupport.o
 
 # These are built into xm-dcl and ol-dcl.
 COMPOSEROBJS= /scm/4.1/sparc/src/code/excldep.o /scm/4.1/sparc/src/code/socket.o \
@@ -726,14 +726,15 @@ makeclimolfasls	: compile-ol cat-ol
 
 
 install_clim	:
-	cp $(INSTALLED_CLIMOBJS) $(CLIMFASLS) $(DEST)
+	cp $(CLIMFASLS) $(DEST)
+	cp $(INSTALLED_CLIMOBJS) $(DEST)
 
 # Link in the libraries & distribution object files with standard names
 
 link-objects	:
 	ln -s $(XTLIB) $(DEST)/libXt.a
 	ln -s $(XLIB) $(DEST)/libX11.a
-	ln -s $(FCLIMOBJS) $(DEST)
+#	ln -s $(INSTALLED_CLIMOBJS) $(DEST)
 
 # Backwards compatibility...
 link-motif-libraries:	link-objects
diff --git a/demo/address-book.lisp b/demo/address-book.lisp
index 9a9981178b09aaed61e3edf8ee3caa7506d85fc8..3a73e984f6320580f481a7fcf34afd00dafbfa8d 100644
--- a/demo/address-book.lisp
+++ b/demo/address-book.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: address-book.lisp,v 1.14 92/09/30 18:04:06 cer Exp Locker: cer $
+;; $fiHeader: address-book.lisp,v 1.15 92/10/04 14:16:36 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/bitmap-editor.lisp b/demo/bitmap-editor.lisp
index 29387c2f79152a45784ef32cfdfa94e12240c21e..9f2de6504df395841c4cda4d984b05465be3377e 100644
--- a/demo/bitmap-editor.lisp
+++ b/demo/bitmap-editor.lisp
@@ -21,7 +21,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: bitmap-editor.lisp,v 1.4 92/09/30 11:45:17 cer Exp Locker: cer $
+;; $fiHeader: bitmap-editor.lisp,v 1.5 92/10/02 15:20:31 cer Exp $
 
 
 (in-package :clim-demo)
diff --git a/demo/browser.lisp b/demo/browser.lisp
index ee0f9dbfbbd21439b3202fe3ac6141c02ec96b4d..b57e72ca7dfb5e61ab465fcb9ae412ec602fa763 100644
--- a/demo/browser.lisp
+++ b/demo/browser.lisp
@@ -3,7 +3,7 @@
 ;;; Simple extensible browser
 ;;; Scott McKay
 
-;; $fiHeader: browser.lisp,v 1.12 92/10/02 09:13:24 cer Exp $
+;; $fiHeader: browser.lisp,v 1.13 92/10/02 09:22:05 cer Exp $
 
 (in-package :clim-browser)
 
diff --git a/demo/cad-demo.lisp b/demo/cad-demo.lisp
index 62c44fc494a89e6df2c57182a2ffe1b44439ef56..d082545e4d1cdf74db6aaccc66ae44c99e89210d 100644
--- a/demo/cad-demo.lisp
+++ b/demo/cad-demo.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: cad-demo.lisp,v 1.17 92/09/22 19:37:44 cer Exp $
+;; $fiHeader: cad-demo.lisp,v 1.18 92/10/02 15:20:33 cer Exp $
 
 (in-package :clim-demo)
 
@@ -297,7 +297,7 @@
     ;; Not (- X SIZE) because the component is a half-circle
     (values x (- y size) (+ x size) (+ y size))))
 
-(defmethod output-record-set-position ((thing basic-thing) new-x new-y)
+(defmethod output-record-set-position ((thing component) new-x new-y)
   (with-slots (x y size) thing
     (setf x (coordinate new-x)
 	  y (coordinate (+ new-y size)))))
diff --git a/demo/cload-demos.lisp b/demo/cload-demos.lisp
index 326e4e95b4d0d161c4e42d870acd54f438e1cf26..d8598aceb9f62714091b37dcc9772b034593fab9 100644
--- a/demo/cload-demos.lisp
+++ b/demo/cload-demos.lisp
@@ -20,11 +20,13 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: cload-demos.lisp,v 1.2 92/09/30 11:45:20 cer Exp Locker: cer $
+;; $fiHeader: cload-demos.lisp,v 1.3 92/09/30 18:04:08 cer Exp $
 
 (defvar *demo-files* 
-    '("packages"
-      "aaai-demo-driver"
+    '(
+      "test-suite"
+      "packages"
+      "demo-driver"
       "cad-demo"
       "thinkadot" 
       "graphics-demos" 
@@ -39,7 +41,9 @@
       "bitmap-editor"
       "ico"
       "process-browser"
-      "demo-activity"))
+      "peek-frame"
+      "demo-activity"
+      "custom-records"))
 
 (defun compile-and-load-demos (&key forcep 
 				    (directory
diff --git a/demo/color-editor.lisp b/demo/color-editor.lisp
index f9d356d35c0666d0f2b5896d4a96b9dd13c808d2..8b8c3d67e65e91591f03823640f61dc4f5da4822 100644
--- a/demo/color-editor.lisp
+++ b/demo/color-editor.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: color-editor.lisp,v 1.5 92/10/02 15:20:34 cer Exp Locker: cer $
+;; $fiHeader: color-editor.lisp,v 1.6 92/10/04 14:16:38 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/custom-records.lisp b/demo/custom-records.lisp
index 38f941a3e5b9d30f4f223f22fcaa2f0600bcb96e..c81f8db59266597be1bc893870602557882c1f25 100644
--- a/demo/custom-records.lisp
+++ b/demo/custom-records.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader$
+;; $fiHeader: custom-records.lisp,v 1.1 92/10/01 10:03:39 cer Exp $
 
 (in-package :clim-user)
 
diff --git a/demo/demo-activity.lisp b/demo/demo-activity.lisp
index 070ddee2cfa1a20f41aee6bd7f0b3f6c280835b7..8f491d038ec900a41e23d3f700e28b8e9688a320 100644
--- a/demo/demo-activity.lisp
+++ b/demo/demo-activity.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: demo-activity.lisp,v 1.2 92/10/02 15:20:36 cer Exp Locker: cer $
+;; $fiHeader: demo-activity.lisp,v 1.3 92/10/04 14:16:39 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/demo-driver.lisp b/demo/demo-driver.lisp
index 3def5fa652c63fb988baff086ee0a70fe1a7d2cc..08b71dfd8c3895a7f879a38e40539105842e558c 100644
--- a/demo/demo-driver.lisp
+++ b/demo/demo-driver.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: demo-driver.lisp,v 1.13 92/08/19 10:24:12 cer Exp Locker: cer $
+;; $fiHeader: demo-driver.lisp,v 1.14 92/09/30 11:45:21 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/demo-prefill.lisp b/demo/demo-prefill.lisp
index d1071c9f64b728ed64bdd54c2753684a665bddff..16f88eb5061497cdcc3d18fd55c8edaccda0906e 100644
--- a/demo/demo-prefill.lisp
+++ b/demo/demo-prefill.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-INTERNALS; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: demo-prefill.lisp,v 1.6 92/08/18 17:26:17 cer Exp $
+;; $fiHeader: demo-prefill.lisp,v 1.7 92/09/24 09:40:05 cer Exp $
 
 (in-package :clim-internals)
 
diff --git a/demo/graphics-demos.lisp b/demo/graphics-demos.lisp
index 6a69b6c23ee2aad98ea32f2667154e90ff06afe1..c9e0a2e8f3fb7249d6004a1466233742a1d90ed6 100644
--- a/demo/graphics-demos.lisp
+++ b/demo/graphics-demos.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: graphics-demos.lisp,v 1.9 92/07/06 18:52:05 cer Exp $
+;; $fiHeader: graphics-demos.lisp,v 1.10 92/07/20 16:01:20 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/graphics-editor.lisp b/demo/graphics-editor.lisp
index 5140f2a6a26b881c1973d402b708c51953a11383..ee825f31bca83989e1d55c337e063ee98a757d94 100644
--- a/demo/graphics-editor.lisp
+++ b/demo/graphics-editor.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-GRAPHICS-EDITOR; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: graphics-editor.lisp,v 1.9 92/09/24 09:40:07 cer Exp Locker: cer $
+;; $fiHeader: graphics-editor.lisp,v 1.10 92/09/30 18:04:12 cer Exp $
 
 (in-package :clim-graphics-editor)
 
diff --git a/demo/ico.lisp b/demo/ico.lisp
index ca3ec3c51753728ca1ada329f49e41ed3067c03e..57212a1d0353f379b70d67a89963ead401b11b13 100644
--- a/demo/ico.lisp
+++ b/demo/ico.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: ico.lisp,v 1.8 92/10/02 15:20:37 cer Exp Locker: cer $
+;; $fiHeader: ico.lisp,v 1.9 92/10/04 14:16:40 cer Exp $
 
 ;;;
 ;;; Copyright (c) 1989, 1990 by Xerox Corporation.  All rights reserved. 
diff --git a/demo/listener.lisp b/demo/listener.lisp
index 1e13ae38b994418c03fce2855459d31122e8882f..ab1bfdb0ed22a4a293e22dd7baeb8ea5e6373744 100644
--- a/demo/listener.lisp
+++ b/demo/listener.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: listener.lisp,v 1.19 92/09/08 15:19:04 cer Exp $
+;; $fiHeader: listener.lisp,v 1.20 92/09/24 09:40:08 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/navdata.lisp b/demo/navdata.lisp
index e1c93828146699381d7af684cbbe0b62f7c2fa14..2406f3a16ec1a5408875a9c2a1789e6d9d6524fc 100644
--- a/demo/navdata.lisp
+++ b/demo/navdata.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: navdata.lisp,v 1.3 92/06/16 15:02:07 cer Exp $
+;; $fiHeader: navdata.lisp,v 1.4 92/07/20 16:01:26 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/navfun.lisp b/demo/navfun.lisp
index be4574a52395222e7dc23c0311f40bf9575a11a3..846d76f1556d75847cca83f838db86a3d7e13ddf 100644
--- a/demo/navfun.lisp
+++ b/demo/navfun.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: navfun.lisp,v 1.16 92/09/30 11:45:22 cer Exp Locker: cer $
+;; $fiHeader: navfun.lisp,v 1.17 92/10/02 15:20:39 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/output-record.lisp b/demo/output-record.lisp
index 09038185c7d2990a99ef7c49fab49c4ceb02b934..ddbffee5e9b890fc31ce3dc5ca517d8bd80eaa9e 100644
--- a/demo/output-record.lisp
+++ b/demo/output-record.lisp
@@ -2,7 +2,7 @@
 
 ;;; Hacks for efficiently drawing really big scientific graphs.
 ;;; Needs to be clim2.0 ified.
-;;; $fiHeader$
+;;; $fiHeader: output-record.lisp,v 1.1 92/07/27 11:00:47 cer Exp $
 
 (in-package :clim)
 ;;; Vendors have started locking this package, so we shouldn't be using it.
diff --git a/demo/packages.lisp b/demo/packages.lisp
index 4221d226779e8dc2faf46175b5d04554b6b6c1a1..77383d176c561b39afd400e1135881e95600f6b6 100644
--- a/demo/packages.lisp
+++ b/demo/packages.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: packages.lisp,v 1.7 92/07/01 15:47:48 cer Exp $
+;; $fiHeader: packages.lisp,v 1.8 92/07/20 16:01:30 cer Exp $
 
 (in-package #-ansi-90 :user #+ansi-90 :common-lisp-user)
 
diff --git a/demo/palette.lisp b/demo/palette.lisp
index 018b707cc0735db907d6f49e67126ed729161812..c0207ef8081257dd2953cb2dcc15131e581e636b 100644
--- a/demo/palette.lisp
+++ b/demo/palette.lisp
@@ -21,7 +21,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: palette.lisp,v 1.1 92/07/06 19:59:16 cer Exp $
+;; $fiHeader: palette.lisp,v 1.2 92/07/20 16:01:33 cer Exp $
 
 
 (in-package :clim-demo)
diff --git a/demo/peek-frame.lisp b/demo/peek-frame.lisp
index a43fda4f64b84d63e9f9e5c0a188359b4371acfc..c0fcb70930845ecb5d31de3027e01e79dec18795 100644
--- a/demo/peek-frame.lisp
+++ b/demo/peek-frame.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: peek-frame.lisp,v 1.1 92/10/01 10:03:37 cer Exp Locker: cer $
+;; $fiHeader: peek-frame.lisp,v 1.2 92/10/02 15:20:41 cer Exp $
 
 (in-package :clim-user)
 
diff --git a/demo/plot.lisp b/demo/plot.lisp
index 075f5ebd3798e97caa48a323487a5f24f50ace61..4cde1d641d2bbd32fa2e3da7aaf7b981f0ce5081 100644
--- a/demo/plot.lisp
+++ b/demo/plot.lisp
@@ -21,7 +21,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: plot.lisp,v 1.10 92/09/30 11:45:25 cer Exp Locker: cer $
+;; $fiHeader: plot.lisp,v 1.11 92/10/02 15:20:43 cer Exp $
 
 (in-package :clim-demo)
 
@@ -640,9 +640,13 @@
 		(+ left (max 0 (- cwidth vwidth)))
 		(+ top (max 0 (- cheight vheight))))))))
 
+#+allegro
+(eval-when (compile load eval)
+  (require :climps))
+
 #+allegro
 (define-plot-demo-command (com-print-graph :name t :menu t)
-    ((printer '(member :lw :lw2 :lw3)
+    ((printer '(member :|lw| :|lw2| :|lw3|)
 	      :display-default t
 	      :default :lw2))
   (with-open-stream (pipe (excl:run-shell-command  (format nil "lpr -P~A" printer)
@@ -707,12 +711,6 @@
 					'data-window)
 			:force-p t))
 
-(define-plot-demo-command (com-change-background :name t) ()
-  (with-sheet-medium (medium (get-frame-pane *application-frame* 'graph-window))
-    (setf (medium-background medium) 
-      (nth (random 3) (list +pink+ +khaki+ +blue-violet+)))))
-      
-
 (define-plot-demo-command (com-add-new-column :name t) ()
   (with-slots (plot-data y-labels) *application-frame*
     (destructuring-bind (rows columns) (array-dimensions plot-data)
diff --git a/demo/process-browser.lisp b/demo/process-browser.lisp
index ec937a3b5641944ee161d51075e954217dbe7158..39090748a16fa36ebc849e7fe2a2c53df0a3dd01 100644
--- a/demo/process-browser.lisp
+++ b/demo/process-browser.lisp
@@ -21,7 +21,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: process-browser.lisp,v 1.2 92/09/30 11:45:26 cer Exp Locker: cer $
+;; $fiHeader: process-browser.lisp,v 1.3 92/10/02 15:20:46 cer Exp $
 
 
 (in-package :clim-demo)
diff --git a/demo/puzzle.lisp b/demo/puzzle.lisp
index 3f5721565f52297a0a2fd0afa1e686ab404da0c4..38b3f4acec4eb1e403767b3602c726e67c2e313e 100644
--- a/demo/puzzle.lisp
+++ b/demo/puzzle.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: puzzle.lisp,v 1.17 92/10/02 15:20:47 cer Exp Locker: cer $
+;; $fiHeader: puzzle.lisp,v 1.18 92/10/04 14:16:42 cer Exp $
 
 (in-package :clim-demo)
 
diff --git a/demo/sysdcl.lisp b/demo/sysdcl.lisp
index 10927dc715e4db9f6ca719a923d804c099251f73..73fac0263ac7ce639340041ff163c7a10a38b309 100644
--- a/demo/sysdcl.lisp
+++ b/demo/sysdcl.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: sysdcl.lisp,v 1.18 92/09/24 09:40:15 cer Exp $
+;; $fiHeader: sysdcl.lisp,v 1.19 92/10/02 15:20:49 cer Exp $
 
 (in-package #-ansi-90 :user #+ansi-90 :common-lisp-user)
 
diff --git a/demo/thinkadot.lisp b/demo/thinkadot.lisp
index 611984b6e7d25e27c4aa850c9abb142803d69860..7a8f4d9d11ecb4ac20b63f6d6e1e7112d00c3fe5 100644
--- a/demo/thinkadot.lisp
+++ b/demo/thinkadot.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CLIM-DEMO; Base: 10; Lowercase: Yes -*-
 
-;; $fiHeader: thinkadot.lisp,v 1.11 92/07/06 18:52:16 cer Exp $
+;; $fiHeader: thinkadot.lisp,v 1.12 92/07/20 16:01:42 cer Exp $
 
 (in-package :clim-demo)