diff --git a/collects/gui-debugger/annotator.ss b/collects/gui-debugger/annotator.ss
index 943d8ddf51..b664ecbc0d 100644
--- a/collects/gui-debugger/annotator.ss
+++ b/collects/gui-debugger/annotator.ss
@@ -209,10 +209,7 @@
         (define annotate-break?
           (let ([pos (syntax-position expr)]
                 [src (syntax-source expr)])
-            (and (or (not source)
-                     (eq? src #;source (syntax-source stx)))
-                 ; (is-a? src object%) ; FIX THIS
-                 pos
+            (and src pos
                  (hash-table-get breakpoints pos (lambda () #t))
                  (kernel:kernel-syntax-case
                   expr #f
@@ -363,7 +360,7 @@
              (let ([subexprs (map (lambda (expr) 
                                     (annotate expr bound-vars #f module-name ))
                                   (syntax->list #'exprs))])
-               (if is-tail?
+               (if (or is-tail? (not (syntax-source expr)))
                    (quasisyntax/loc expr #,subexprs)
                    (wcm-wrap (make-debug-info module-name expr bound-vars bound-vars 'normal #f (previous-bindings bound-vars))
                              (quasisyntax/loc expr #,subexprs))))]
diff --git a/collects/scribblings/drscheme/debugger1.png b/collects/scribblings/drscheme/debugger1.png
index 384bf2dcf9..3fc2b1094d 100644
Binary files a/collects/scribblings/drscheme/debugger1.png and b/collects/scribblings/drscheme/debugger1.png differ
diff --git a/collects/scribblings/drscheme/interface-essentials.scrbl b/collects/scribblings/drscheme/interface-essentials.scrbl
index f08466e7ec..8fb88e2dfe 100644
--- a/collects/scribblings/drscheme/interface-essentials.scrbl
+++ b/collects/scribblings/drscheme/interface-essentials.scrbl
@@ -538,7 +538,7 @@ While execution is paused, several buttons are available:
 
 @itemize{
 
-    @item{The @as-index{@onscreen{Continue} button} is enabled
+    @item{The @as-index{@onscreen{Go} button} is enabled
 whenever the program is paused.  It causes the program to resume
 until it either completes, reaches a breakpoint, or raises an
 unhandled exception.}