diff --git a/src/ikarus.boot b/src/ikarus.boot
index 7c210df..18748f7 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/libpp.ss b/src/libpp.ss
index 4f0c0c6..68d46c0 100644
--- a/src/libpp.ss
+++ b/src/libpp.ss
@@ -2,7 +2,13 @@
 (library (ikarus pretty-print)
   (export)
   (import (scheme))
-
+  (define (map1ltr f ls)
+    ;;; ltr so that gensym counts get assigned properly
+    (cond
+      [(null? ls) '()]
+      [else
+       (let ([a (f (car ls))])
+         (cons a (map1ltr f (cdr ls))))]))
   (define (pretty-width) 80)
   (define (pretty-indent) 1)
   (define-record cbox (length boxes))
@@ -138,7 +144,7 @@
                   (conc (cdr fmt) (boxify (cadr ls)))]
                  [(fmt-dots? fmt) 
                   (return (fmt-tab fmt) 
-                          (map (lambda (x) (boxify/fmt (sub-fmt fmt) x))
+                          (map1ltr (lambda (x) (boxify/fmt (sub-fmt fmt) x))
                                ls))]
                  [else
                   (let-values ([(sep* ls)
@@ -148,7 +154,7 @@
                                      (values '() '())]
                                     [(fmt-dots? fmt) 
                                      (values (fmt-tab fmt) 
-                                             (map (lambda (x)
+                                             (map1ltr (lambda (x)
                                                     (boxify/fmt (sub-fmt fmt) x))
                                                   ls))]
                                     [else
@@ -161,7 +167,7 @@
                                                      l^)))]))])
                     (return sep* (cons (boxify/fmt (sub-fmt fmt) a) ls)))])))]
             [else 
-             (return (gensep*-default ls) (map boxify ls))])))
+             (return (gensep*-default ls) (map1ltr boxify ls))])))
     (define (boxify-string x)
       (define (count s i j n)
         (cond
@@ -202,7 +208,7 @@
                        (fx+ (fxadd1 n) (box-length (car ls))))]))])
           (make-pbox (fx+ n (box-length last)) ls last))))
     (define (boxify-vector x)
-      (let ([ls (map boxify (vector->list x))])
+      (let ([ls (map1ltr boxify (vector->list x))])
         (let ([n
                (let f ([ls ls] [n 0])
                  (cond
diff --git a/src/makefile.ss b/src/makefile.ss
index eace5e0..4f41ca6 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -124,44 +124,50 @@
         [(null? r) '()]
         [else (add (car r) (f (cdr r)))])))
 
-  (define (make-system-library export-subst export-env)
-    `(library (ikarus primlocs)
-       (export)
-       (import (scheme))
-       (install-library 
-          ',(gensym "system")   ;;; id
-          '(system)             ;;; name
-          '()                   ;;; version
-          '()                   ;;; import libs 
-          '()                   ;;; visit libs
-          '()                   ;;; invoke libs
-          ',export-subst        ;;; substitution
-          ',export-env          ;;; environment
-          void void)))
+  (define (build-system-library export-subst export-env)
+    (let-values ([(code empty-subst empty-env)
+                  (boot-library-expand
+                    `(library (ikarus primlocs)
+                       (export) ;;; must be empty
+                       (import (scheme))
+                       (install-library 
+                          ',(gensym "system")   ;;; id
+                          '(system)             ;;; name
+                          '()                   ;;; version
+                          '()                   ;;; import libs 
+                          '()                   ;;; visit libs
+                          '()                   ;;; invoke libs
+                          ',export-subst        ;;; substitution
+                          ',export-env          ;;; environment
+                          void void             ;;; visit/invoke codes
+                          )))])
+       (pretty-print code)
+       code))
 
-  (define (expand-all ls)
-    (define (insert x ls)
-      (cond ;;; insert before last library
-        [(null? (cdr ls))
-         (list x (library-code (car ls)))]
-        [else
-         (cons (library-code (car ls)) 
-           (insert x (cdr ls)))]))
-    (let ([libs (apply append (map expand-file ls))])
-      (let* ([export-subst 
-              (apply append (map library-export-subst libs))]
-             [export-env
-              (sanitize-export-env export-subst
-                (apply append (map library-export-env libs)))])
-        (let-values ([(code _subst _env) ; both must be empty
-                      (boot-library-expand 
-                        (make-system-library export-subst export-env))])
-          (printf "EXP:~s\n" (map car export-subst))
-          (values (insert code libs) #f)))))
+
+  (define (expand-all files)
+    (let ([code* '()]
+          [subst '()]
+          [env   '()])
+      (for-each
+        (lambda (file)
+          (load file
+            (lambda (x) 
+              (let-values ([(code export-subst export-env)
+                            (boot-library-expand x)])
+                 (set! code* (cons code code*))
+                 (set! subst (append export-subst subst))
+                 (set! env (append export-env env))))))
+        files)
+      (let ([env (sanitize-export-env subst env)])
+        (let ([code (build-system-library subst env)])
+          (values 
+            (reverse (list* (car code*) code (cdr code*)))
+            subst env)))))
 
   (printf "expanding ...\n")
   
-  (let-values ([(core* ??env) (expand-all scheme-library-files)])
+  (let-values ([(core* subst env) (expand-all scheme-library-files)])
     (printf "compiling ...\n")
     (let ([p (open-output-file "ikarus.boot" 'replace)])
       (for-each 
@@ -172,21 +178,3 @@
   (printf "Happy Happy Joy Joy\n"))
 
 (invoke (ikarus makefile))
-
-;;; ;;; NEW ARCHITECTURE
-;;;
-;;; (define expander-input-env
-;;;   '(;[prim-name      label       (core-prim . prim-name)]
-;;;     [car            car-label    (core-prim . car)]))
-;;; 
-;;; (define expander-output-env 
-;;;   '(;[export-name    export-loc]
-;;;     [ikarus-car      #{ikarus-car |174V9RJ/FjzvmJVu|}]))
-;;; 
-;;; (define bootstrap-knot
-;;;   '(;[prim-name      export-name]
-;;;     [car             ikarus-car]))
-;;; 
-;;; (define compile-input-env
-;;;   '(;[prim-name      export-loc]
-;;;     [car             #{ikarus-car |174V9RJ/FjzvmJVu|}]))