diff --git a/kenzo.lisp b/kenzo.lisp
index edff033..541962c 100644
--- a/kenzo.lisp
+++ b/kenzo.lisp
@@ -7,7 +7,7 @@
   (values))
 
 ;;(PROCLAIM '(OPTIMIZE (speed 3) (safety 1) (space 0) (debug 0)))
-(DECLAIM '(OPTIMIZE (speed 0) (space 0) (debug 3)))
+(DECLAIM (OPTIMIZE (speed 0) (space 0) (debug 3)))
 
 ;; Don't mess with ANSI's definition of DEFCONSTANT!
 
diff --git a/package.lisp b/package.lisp
index a47169b..28f3bcd 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,6 +7,8 @@
 
 	   ;; chain-complexes.lisp
 
+	   ?2
+	   ?3
 	   +TOO-MUCH-TIME+
 	   BUILD-CHCM
 	   BUILD-MRPH
diff --git a/run-kenzo-test.lisp b/run-kenzo-test.lisp
new file mode 100644
index 0000000..4c78e48
--- /dev/null
+++ b/run-kenzo-test.lisp
@@ -0,0 +1,7 @@
+#+sbcl(require 'asdf)
+
+(asdf:operate 'asdf:load-op 'kenzo-test)
+(in-package :kenzo-test)
+(run!)
+
+#+sbcl(sb-ext:exit)
diff --git a/src/effective-homology.lisp b/src/effective-homology.lisp
index 6711092..3189b81 100644
--- a/src/effective-homology.lisp
+++ b/src/effective-homology.lisp
@@ -13,7 +13,7 @@
 
 #+clisp(eval-when (:compile-toplevel :load-toplevel :execute)
          (setf (ext:package-lock :clos) nil))
-(DEFMETHOD PRINT-OBJECT ((rdct reduction) (stream stream))
+(DEFMETHOD PRINT-OBJECT ((rdct reduction) stream)
  (the reduction
    (progn
       (format stream "[K~D Reduction K~D => K~D]"
@@ -129,7 +129,7 @@
                                                  rslt))
                                      (sign 1 (- sign))
                                      (nark 0 (1+ nark)))
-                                    ((> nark degr) rslt))))                                           
+                                    ((> nark degr) rslt))))
         :strt :gnrt
         :orgn `(locally effective version of C_* delta ,dmns)))
    (defun make-f (tdmns bdmns)
@@ -178,11 +178,11 @@
   (setf id-gf-dh-hd (i-sbtr (idnt-mrph tcc) gf dh hd))
   (setf c (cmbn 2 1 '(0 1 2) 10 '(1 2 3) 100 '(1 2 4) 1000 '(2 3 4)))
   (cmbn-? id-gf-dh-hd c)
-|#                                   
+|#
 
 #+clisp(eval-when (:compile-toplevel :load-toplevel :execute)
          (setf (ext:package-lock :clos) nil))
-(DEFMETHOD PRINT-OBJECT ((hmeq homotopy-equivalence) (stream stream))
+(DEFMETHOD PRINT-OBJECT ((hmeq homotopy-equivalence) stream)
  (the homotopy-equivalence
    (progn
       (format stream "[K~D Homotopy-Equivalence K~D <= K~D => K~D]"
@@ -277,7 +277,7 @@
   (setf *tc* (cmbn 2 1 '(0 1 2) 10 '(1 2 3) 100 '(1 2 4) 1000 '(2 3 4)))
   (setf *bc* (cmbn 3 4 '(0 1 2 3)))  
   (check-rdct))
-|#                                   
+|#
 
 (DEFMETHOD CMPS ((brdct reduction) (trdct reduction) &optional dummy)
   (declare (ignore dummy))
@@ -549,7 +549,7 @@
                :lrdct new-lrdct
                :rrdct (add rrdct top-perturbation)
                :orgn `(add ,hmeq ,lb-perturbation))))))
-                        
+
 #|
   (cat-init)
   (setf hmeq (trivial-hmeq (cdelta 4)))
diff --git a/src/macros.lisp b/src/macros.lisp
index 26d9e27..f5cf7ec 100644
--- a/src/macros.lisp
+++ b/src/macros.lisp
@@ -137,7 +137,7 @@
 
 
 (DEFMACRO CMBN-NON-ZERO-P (cmbn)
-   `(cmbn-list ,cmbn)) 
+   `(cmbn-list ,cmbn))
 
 (DEFMACRO CMBN-ZERO-P (cmbn)
   `(null (cmbn-list ,cmbn)))
@@ -179,7 +179,7 @@
       (3 `(basis3 ,@rest))))
 
 (DEFMACRO BASIS3 (smst dmns keyword)
-  (declare (ignore keyword))  
+  (declare (ignore keyword))
   `(a-basis2 (basis ,smst) ,dmns))
 
 (DEFMACRO DFFR (&rest rest)
@@ -226,7 +226,7 @@
 
 (DEFMACRO I-SBTR (mrph1 mrph2 &rest rest)
    `(sbtr ,mrph1 (i-add ,mrph2 ,@rest)))
-   
+
 #|
   (macroexpand '(i-sbtr m1 m2))
   (macroexpand '(i-sbtr m1 m2 m3))
@@ -617,7 +617,7 @@
 
 ;;; GMSM-FACES-INFO = (gmsm (simple-vector absm) . bndr)
 ;;;                         faces
-       
+
 (DEFMACRO MAKE-GMSM-FACES-INFO (&key gmsm faces bndr)
    `(cons ,gmsm (cons ,faces ,bndr)))
 
@@ -725,8 +725,8 @@
   `(let ((,absm1 (absm (dgop1 ,crpr) (gmsm1 ,crpr)))
          (,absm2 (absm (dgop2 ,crpr) (gmsm2 ,crpr))))
      (declare (type absm ,absm1 ,absm2))
-     ,@body)) 
-  
+     ,@body))
+
 #|
 ()
 (with-crpr (absm1 absm2) (crpr 3 'a 4 'b) (list absm1 absm2))
@@ -823,7 +823,7 @@
 
 (DEFMACRO APOWR (dgop gmsm expn)
    `(cons ,dgop (cons ,gmsm ,expn)))
-   
+
 (DEFMACRO APDGOP (apowr)
    `(car ,apowr))