diff --git a/lib/ikarus.boot b/lib/ikarus.boot
index 58af175..4d6c6ab 100644
Binary files a/lib/ikarus.boot and b/lib/ikarus.boot differ
diff --git a/lib/libtokenizer.ss b/lib/libtokenizer.ss
index b578587..c1ba9f6 100644
--- a/lib/libtokenizer.ss
+++ b/lib/libtokenizer.ss
@@ -260,77 +260,79 @@
                   (list->string (reverse (cons c chars))))]))))
   (define tokenize-hash
     (lambda (p)
-      (let ([c (read-char p)])
-        (cond
-          [(eof-object? c) (error 'tokenize "invalid # near end of file")]
-          [($char= c #\t) 
-           (let ([c (peek-char p)])
-             (cond
-               [(eof-object? c) '(datum . #t)]
-               [(delimiter? c)  '(datum . #t)]
-               [else (error 'tokenize "invalid syntax near #t")]))]
-          [($char= c #\f) 
-           (let ([c (peek-char p)])
-             (cond
-               [(eof-object? c) '(datum . #f)]
-               [(delimiter? c)  '(datum . #f)]
-               [else (error 'tokenize "invalid syntax near #f")]))]
-          [($char= #\\ c) (tokenize-char p)]
-          [($char= #\( c) 'vparen]
-          [($char= #\x c) (tokenize-hex-init p)]
-          [($char= #\' c) '(macro . syntax)]
-          [($char= #\; c) 'hash-semi]
-          [($char= #\% c) '(macro . |#primitive|)]
-          [($char= #\| c) (multiline-comment p) (tokenize p)]
-          [($char= #\b c) 
-           (let ([c (read-char p)])
-             (cond
-               [(eof-object? c) 
-                (error 'tokenize "invalid eof while reading #b")]
-               [($char= #\- c)
-                (let ([c (read-char p)])
-                  (cond
-                    [(eof-object? c)
-                     (error 'tokenize "invalid eof while reading #b-")]
-                    [($char= #\0 c)
-                     (cons 'datum
-                       (* -1 (read-binary 0 '(#\0 #\-) p)))]
-                    [($char= #\1 c)
-                     (cons 'datum
-                       (* -1 (read-binary 1 '(#\1 #\-) p)))]
-                    [else 
-                     (unread-char c p)
-                     (error 'tokenize "invalid binary syntax #b-~a" c)]))]
-               [($char= #\0 c)
-                (cons 'datum (read-binary 0 '(#\0) p))]
-               [($char= #\1 c)
-                (cons 'datum (read-binary 1 '(#\1) p))]
-               [else 
-                (unread-char c p)
-                (error 'tokenize "invalid syntax #b~a" c)]
-               ))]
-          [($char= #\! c) 
-           (let ([e (read-char p)])
-             (when (eof-object? e)
-               (error 'tokenize "invalid eof near #!"))
-             (unless ($char= #\e e)
-               (error 'tokenize "invalid syntax near #!~a" e))
-             (let ([o (read-char p)])
-               (when (eof-object? o)
-                 (error 'tokenize "invalid eof near #!e"))
-               (unless ($char= #\o o)
-                 (error 'tokenize "invalid syntax near #!e~a" o))
-               (let ([f (read-char p)])
-                 (when (eof-object? f)
-                   (error 'tokenize "invalid syntax near #!eo"))
-                 (unless ($char= #\f f)
-                   (error 'tokenize "invalid syntax near #!eo~a" f))
-                 (cons 'datum (eof-object)))))]
-          [(digit? c) 
-           (tokenize-hashnum p (char->num c))]
-          [else 
-           (unread-char c p)
-           (error 'tokenize "invalid syntax #~a" c)]))))
+      (tokenize-hash/c (read-char p) p)))
+  (define tokenize-hash/c
+    (lambda (c p)
+      (cond
+        [(eof-object? c) (error 'tokenize "invalid # near end of file")]
+        [($char= c #\t) 
+         (let ([c (peek-char p)])
+           (cond
+             [(eof-object? c) '(datum . #t)]
+             [(delimiter? c)  '(datum . #t)]
+             [else (error 'tokenize "invalid syntax near #t")]))]
+        [($char= c #\f) 
+         (let ([c (peek-char p)])
+           (cond
+             [(eof-object? c) '(datum . #f)]
+             [(delimiter? c)  '(datum . #f)]
+             [else (error 'tokenize "invalid syntax near #f")]))]
+        [($char= #\\ c) (tokenize-char p)]
+        [($char= #\( c) 'vparen]
+        [($char= #\x c) (tokenize-hex-init p)]
+        [($char= #\' c) '(macro . syntax)]
+        [($char= #\; c) 'hash-semi]
+        [($char= #\% c) '(macro . |#primitive|)]
+        [($char= #\| c) (multiline-comment p) (tokenize p)]
+        [($char= #\b c) 
+         (let ([c (read-char p)])
+           (cond
+             [(eof-object? c) 
+              (error 'tokenize "invalid eof while reading #b")]
+             [($char= #\- c)
+              (let ([c (read-char p)])
+                (cond
+                  [(eof-object? c)
+                   (error 'tokenize "invalid eof while reading #b-")]
+                  [($char= #\0 c)
+                   (cons 'datum
+                     (* -1 (read-binary 0 '(#\0 #\-) p)))]
+                  [($char= #\1 c)
+                   (cons 'datum
+                     (* -1 (read-binary 1 '(#\1 #\-) p)))]
+                  [else 
+                   (unread-char c p)
+                   (error 'tokenize "invalid binary syntax #b-~a" c)]))]
+             [($char= #\0 c)
+              (cons 'datum (read-binary 0 '(#\0) p))]
+             [($char= #\1 c)
+              (cons 'datum (read-binary 1 '(#\1) p))]
+             [else 
+              (unread-char c p)
+              (error 'tokenize "invalid syntax #b~a" c)]
+             ))]
+        [($char= #\! c) 
+         (let ([e (read-char p)])
+           (when (eof-object? e)
+             (error 'tokenize "invalid eof near #!"))
+           (unless ($char= #\e e)
+             (error 'tokenize "invalid syntax near #!~a" e))
+           (let ([o (read-char p)])
+             (when (eof-object? o)
+               (error 'tokenize "invalid eof near #!e"))
+             (unless ($char= #\o o)
+               (error 'tokenize "invalid syntax near #!e~a" o))
+             (let ([f (read-char p)])
+               (when (eof-object? f)
+                 (error 'tokenize "invalid syntax near #!eo"))
+               (unless ($char= #\f f)
+                 (error 'tokenize "invalid syntax near #!eo~a" f))
+               (cons 'datum (eof-object)))))]
+        [(digit? c) 
+         (tokenize-hashnum p (char->num c))]
+        [else 
+         (unread-char c p)
+         (error 'tokenize "invalid syntax #~a" c)])))
   (define (tokenize-hashnum p n)
     (let ([c (read-char p)])
       (cond
@@ -357,50 +359,71 @@
                [else (tokenize-bar p (cons c ac))]))]
           [($char= #\| c) ac]
           [else (tokenize-bar p (cons c ac))]))))
+  (define tokenize/c
+    (lambda (c p)
+      (cond
+        [(eof-object? c) (eof-object)]
+        [(char-whitespace? c) (tokenize p)]
+        [($char= #\( c)   'lparen]
+        [($char= #\) c)   'rparen]
+        [($char= #\[ c)   'lbrack]
+        [($char= #\] c)   'rbrack]
+        [($char= #\' c)   '(macro . quote)]
+        [($char= #\` c)   '(macro . quasiquote)]
+        [($char= #\, c) 
+         (let ([c (peek-char p)])
+           (cond
+            [(eof-object? c) '(macro . unquote)]
+            [($char= c #\@) 
+             (read-char p)
+             '(macro . unquote-splicing)]
+            [else '(macro . unquote)]))]
+        [($char= #\# c) (tokenize-hash p)]
+        [(digit? c) 
+         (cons 'datum (tokenize-number (char->num c) p))]
+        [(initial? c) 
+         (let ([ls (reverse (tokenize-identifier (cons c '()) p))])
+           (cons 'datum (string->symbol (list->string ls))))]
+        [($char= #\" c) 
+         (let ([ls (tokenize-string '() p)])
+           (cons 'datum (list->string (reverse ls))))]
+        [($char= #\; c)
+         (skip-comment p)
+         (tokenize p)]
+        [($char= #\+ c)
+         (tokenize-plus p)]
+        [($char= #\- c)
+         (tokenize-minus p)]
+        [($char= #\. c)
+         (tokenize-dot p)]
+        [($char= #\| c)
+         (let ([ls (reverse (tokenize-bar p '()))])
+           (cons 'datum (string->symbol (list->string ls))))]
+        [else
+         (unread-char c p) 
+         (error 'tokenize "invalid syntax ~a" c)])))
+
   (define tokenize
+    (lambda (p)
+      (tokenize/c (read-char p) p)))
+
+  (define tokenize-initial
     (lambda (p)
       (let ([c (read-char p)])
         (cond
-          [(eof-object? c) (eof-object)]
-          [(char-whitespace? c) (tokenize p)]
-          [($char= #\( c)   'lparen]
-          [($char= #\) c)   'rparen]
-          [($char= #\[ c)   'lbrack]
-          [($char= #\] c)   'rbrack]
-          [($char= #\' c)   '(macro . quote)]
-          [($char= #\` c)   '(macro . quasiquote)]
-          [($char= #\, c) 
-           (let ([c (peek-char p)])
+          [(eof-object? c) c]
+          [($char= #\# c) 
+           (let ([c (read-char p)])
              (cond
-              [(eof-object? c) '(macro . unquote)]
-              [($char= c #\@) 
-               (read-char p)
-               '(macro . unquote-splicing)]
-              [else '(macro . unquote)]))]
-          [($char= #\# c) (tokenize-hash p)]
-          [(digit? c) 
-           (cons 'datum (tokenize-number (char->num c) p))]
-          [(initial? c) 
-           (let ([ls (reverse (tokenize-identifier (cons c '()) p))])
-             (cons 'datum (string->symbol (list->string ls))))]
-          [($char= #\" c) 
-           (let ([ls (tokenize-string '() p)])
-             (cons 'datum (list->string (reverse ls))))]
-          [($char= #\; c)
-           (skip-comment p)
-           (tokenize p)]
-          [($char= #\+ c)
-           (tokenize-plus p)]
-          [($char= #\- c)
-           (tokenize-minus p)]
-          [($char= #\. c)
-           (tokenize-dot p)]
-          [($char= #\| c)
-           (let ([ls (reverse (tokenize-bar p '()))])
-             (cons 'datum (string->symbol (list->string ls))))]
-          [else
-           (unread-char c p) 
-           (error 'tokenize "invalid syntax ~a" c)]))))
+               [(eof-object? c)
+                (error 'tokenize "invalid eof after #")]
+               [($char= #\! c)
+                (skip-comment p)
+                (tokenize p)]
+               [else
+                (tokenize-hash/c c p)]))]
+          [else (tokenize/c c p)]))))
+
 
   ;;;
   ;;;--------------------------------------------------------------* READ *---
@@ -554,10 +577,15 @@
            [else (error 'read "invalid token! ~s" t)])]
         [else
          (error 'read "unexpected ~s found" t)])))
+
   (define read-expr
     (lambda (p locs k)
       (parse-token p locs k (read-token p))))
-          
+  
+  (define read-expr-initial
+    (lambda (p locs k)
+      (parse-token p locs k (tokenize-initial p))))
+
   (define reduce-loc!
     (lambda (x)
        (let ([loc (cdr x)])
@@ -592,7 +620,17 @@
                (loc-value expr)
                expr)]))))
 
-
+  (define read-initial
+    (lambda (p)
+      (let-values ([(expr locs k) (read-expr-initial p '() void)])
+        (cond
+          [(null? locs) expr]
+          [else
+           (for-each reduce-loc! locs)
+           (k)
+           (if (loc? expr)
+               (loc-value expr)
+               expr)]))))
 
 
   ;;;      
@@ -619,12 +657,16 @@
           (unless (eof-object? x)
             (eval x)
             (read-and-eval p)))))
+
     (primitive-set! 'load
       (lambda (x)
         (unless (string? x)
           (error 'load "~s is not a string" x))
         (let ([p (open-input-file x)])
-          (read-and-eval p)
+          (let ([x (read-initial p)])
+            (unless (eof-object? x)
+              (eval x)
+              (read-and-eval p)))
           (close-input-port p)))))
   )
 
diff --git a/lib/makefile.ss b/lib/makefile.ss
index 521a19a..63f4d8c 100644
--- a/lib/makefile.ss
+++ b/lib/makefile.ss
@@ -116,60 +116,53 @@
     ))
 
 (define system-primitives
-  '(immediate? $unbound-object? $forward-ptr?
-    pointer-value 
-    primitive-ref primitive-set!
-    $fx= $fx< $fx<= $fx> $fx>= $fxzero?
-    $fx+ $fx- $fx* $fxadd1 $fxsub1 $fxquotient $fxremainder $fxmodulo 
-    $fxsll $fxsra $fxlognot $fxlogor $fxlogand $fxlogxor
-    $fixnum->char $char->fixnum
-    $char= $char< $char<= $char> $char>=
-    $car $cdr $set-car! $set-cdr!
+  '(
+
+    immediate? $unbound-object? $forward-ptr?  pointer-value
+    primitive-ref primitive-set!  $fx= $fx< $fx<= $fx> $fx>=
+    $fxzero?  $fx+ $fx- $fx* $fxadd1 $fxsub1 $fxquotient
+    $fxremainder $fxmodulo $fxsll $fxsra $fxlognot $fxlogor
+    $fxlogand $fxlogxor $fixnum->char $char->fixnum $char= $char<
+    $char<= $char> $char>= $car $cdr $set-car! $set-cdr!
     $make-vector $vector-ref $vector-set! $vector-length
     $make-string $string-ref $string-set! $string-length $string
     $symbol-string $symbol-unique-string $symbol-value
-    $set-symbol-string! $set-symbol-unique-string! $set-symbol-value!
-    $make-symbol $set-symbol-plist!  $symbol-plist
-    $sc-put-cte 
-    $record? $record/rtd? $record-set! $record-ref $record-rtd
-    $make-record $record
-    $base-rtd
-    $code? $code-reloc-vector $code-freevars $code-size $code-ref $code-set!
-    $code->closure list*->code* 
-    make-code code? set-code-reloc-vector! code-reloc-vector code-freevars
-    code-size code-ref code-set!
-    $frame->continuation $fp-at-base $current-frame $arg-list $seal-frame-and-call
+    $set-symbol-string! $set-symbol-unique-string!
+    $set-symbol-value!  $make-symbol $set-symbol-plist!
+    $symbol-plist $sc-put-cte $record? $record/rtd? $record-set!
+    $record-ref $record-rtd $make-record $record $base-rtd $code?
+    $code-reloc-vector $code-freevars $code-size $code-ref
+    $code-set!  $code->closure list*->code* make-code code?
+    set-code-reloc-vector! code-reloc-vector code-freevars code-size
+    code-ref code-set!  $frame->continuation $fp-at-base
+    $current-frame $arg-list $seal-frame-and-call
     $make-call-with-values-procedure $make-values-procedure
-    do-overflow collect
-    $make-tcbucket $tcbucket-next $tcbucket-key $tcbucket-val
-    $set-tcbucket-next! $set-tcbucket-val! $set-tcbucket-tconc!
-    $tcbucket-dlink-prev
-    $tcbucket-dlink-next
-    $set-tcbucket-dlink-prev!
-    $set-tcbucket-dlink-next!
-    call/cf trace-symbol! untrace-symbol! make-traced-procedure
-    fixnum->string 
-    vector-memq vector-memv
+    do-overflow collect $make-tcbucket $tcbucket-next $tcbucket-key
+    $tcbucket-val $set-tcbucket-next! $set-tcbucket-val!
+    $set-tcbucket-tconc!  $tcbucket-dlink-prev $tcbucket-dlink-next
+    $set-tcbucket-dlink-prev!  $set-tcbucket-dlink-next!  call/cf
+    trace-symbol! untrace-symbol! make-traced-procedure
+    fixnum->string vector-memq vector-memv
 
-    ;;; must open-code
-    $make-port/input
-    $make-port/output
-    $make-port/both
+    ;;; TODO: must open-code
+
+    $make-port/input $make-port/output $make-port/both
     $make-input-port $make-output-port $make-input/output-port
-    $port-handler
-    $port-input-buffer $port-input-index $port-input-size 
-    $port-output-buffer $port-output-index $port-output-size 
-    $set-port-input-index! $set-port-input-size!
+    $port-handler $port-input-buffer $port-input-index
+    $port-input-size $port-output-buffer $port-output-index
+    $port-output-size $set-port-input-index! $set-port-input-size!
     $set-port-output-index! $set-port-output-size!
 
     ;;; better open-code
+
     $write-char $read-char $peek-char $unread-char
 
     ;;; never open-code 
-    $reset-input-port! $close-input-port
-    $close-output-port $flush-output-port
-    *standard-output-port* *standard-error-port* *current-output-port*
-    *standard-input-port* *current-input-port*
+
+    $reset-input-port! $close-input-port $close-output-port
+    $flush-output-port *standard-output-port* *standard-error-port*
+    *current-output-port* *standard-input-port* *current-input-port*
+    
     ))
  
 
@@ -214,6 +207,7 @@
 
 
 (when (eq? "" "")
+  (error #f "SEVERELY OUT OF DATE!\n")
   (load "chez-compat.ss")
   (set! primitive-ref top-level-value)
   (set! primitive-set! set-top-level-value!)
@@ -300,3 +294,4 @@
 (system
   (format "cat ~a > ikarus.boot"
           (join " " (map caddr scheme-library-files))))
+
diff --git a/lib/psyntax-7.1.ss b/lib/psyntax-7.1.ss
index a05d33e..10006d8 100644
--- a/lib/psyntax-7.1.ss
+++ b/lib/psyntax-7.1.ss
@@ -4101,6 +4101,7 @@
       (else (match* (unannotate e) p empty-wrap '())))))
 ))
 
+;;; global macros
 
 (define-syntax with-syntax
    (lambda (x)