diff --git a/collects/stepper/private/annotate.ss b/collects/stepper/private/annotate.ss
index bb7700fbb2..be9bd9f9d7 100644
--- a/collects/stepper/private/annotate.ss
+++ b/collects/stepper/private/annotate.ss
@@ -383,7 +383,7 @@
                . -> . (vector/p syntax? binding-set?))
       (lambda (exp tail-bound pre-break? procedure-name-info)
         
-        (cond [(stepper-syntax-property exp 'stepper-skipto)                
+        (cond [(stepper-syntax-property exp 'stepper-skipto)
                (let* ([free-vars-captured #f] ; this will be set!'ed
                       ;[dont-care (printf "expr: ~a\nskipto: ~a\n" expr (stepper-syntax-property expr 'stepper-skipto))]
                       ; WARNING! I depend on the order of evaluation in application arguments here:
@@ -398,7 +398,7 @@
                          skipto-mark
                          annotated)
                         free-vars-captured))]
-
+              
               [(stepper-syntax-property exp 'stepper-skip-completely)
                (2vals (wcm-wrap 13 exp) null)]
 
@@ -1143,7 +1143,6 @@
                                  (annotate/top-level/acl2 main-exp)]
                                 [else 
                                  (annotate/top-level main-exp)])])
-          #;(printf "annotated: \n~a\n" (syntax-object->datum annotated-exp))
           annotated-exp)
         (let*-2vals ([(annotated dont-care)
                      (annotate/inner (top-level-rewrite main-exp) 'all #f #f)])
diff --git a/collects/stepper/private/model.ss b/collects/stepper/private/model.ss
index 4db6f01b94..f7fa3aa4fa 100644
--- a/collects/stepper/private/model.ss
+++ b/collects/stepper/private/model.ss
@@ -326,8 +326,8 @@
     (program-expander
      (lambda ()
        ;; swap these to allow errors to escape (e.g., when debugging)
-       ;;(error-display-handler err-display-handler)
-       (void)
+       (error-display-handler err-display-handler)
+       #;(void)
        )
      (lambda (expanded continue-thunk) ; iter
        (r:reset-special-values)
diff --git a/collects/stepper/private/reconstruct.ss b/collects/stepper/private/reconstruct.ss
index 28e427bf7e..f2cd6ec814 100644
--- a/collects/stepper/private/reconstruct.ss
+++ b/collects/stepper/private/reconstruct.ss
@@ -403,6 +403,7 @@
                               [var-stx
                                (identifier? expr)
                                (let* ([var (syntax var-stx)])
+                                 var
                                  (cond [(eq? (identifier-binding var) 'lexical)
                                         ; has this varref's binding not been evaluated yet?
                                         ; (and this varref isn't in the list of must-lookups?)
@@ -422,8 +423,8 @@
                                                (recon-value (lookup-binding mark-list var) render-settings))
                                               ((let-bound)
                                                (stepper-syntax-property var
-                                                                'stepper-lifted-name
-                                                                (binding-lifted-name mark-list var)))
+                                                                        'stepper-lifted-name
+                                                                        (binding-lifted-name mark-list var)))
                                               ((stepper-temp)
                                                (error 'recon-source-expr "stepper-temp showed up in source?!?"))
                                               ((non-lexical)
diff --git a/collects/stepper/private/shared.ss b/collects/stepper/private/shared.ss
index efbac2ce66..df7841edb4 100644
--- a/collects/stepper/private/shared.ss
+++ b/collects/stepper/private/shared.ss
@@ -552,9 +552,10 @@
   ;; take info from source expressions to reconstructed expressions
 
   (define (attach-info to-exp from-exp)
-    ;; (if (stepper-syntax-property from-exp 'stepper-offset-index)
-    ;;   (>>> (stepper-syntax-property from-exp 'stepper-offset-index)))
-    (let* ([attached (syntax-property to-exp 'stepper-properties (syntax-property from-exp 'stepper-properties))]
+    (let* ([attached (syntax-property to-exp 'stepper-properties (append (or (syntax-property from-exp 'stepper-properties)
+                                                                             null)
+                                                                         (or (syntax-property to-exp 'stepper-properties)
+                                                                             null)))]
            [attached (syntax-property attached 'user-source (syntax-source from-exp))]
            [attached (syntax-property attached 'user-position (syntax-position from-exp))])
       attached))