diff --git a/doc/handbook/tools.facts b/doc/handbook/tools.facts
index 28d0bf8363..fce8ad3e59 100644
--- a/doc/handbook/tools.facts
+++ b/doc/handbook/tools.facts
@@ -146,8 +146,6 @@ ARTICLE: "timing" "Timing code"
 ARTICLE: "annotations" "Word annotations"
 "The word annotation feature modifies word definitions to add debugging code. You can restore the old definition by calling " { $link reload } " on the word in question."
 { $subsection watch }
-{ $subsection break }
-{ $subsection break-on }
 { $subsection profile }
 "All of the above words are implemented using a single combinator which applies a quotation to a word definition to yield a new definition:"
 { $subsection annotate } ;
diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index 4513abf2e2..d724952f15 100644
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -94,10 +94,11 @@ sequences vectors words ;
         "/library/syntax/see.factor"
         "/library/syntax/parser.factor"
 
-        "/library/tools/interpreter.factor"
         "/library/tools/describe.factor"
         "/library/tools/debugger.factor"
         
+        "/library/threads.factor"
+
         "/library/help/stylesheet.factor"
         "/library/help/topics.factor"
         "/library/help/markup.factor"
@@ -115,7 +116,7 @@ sequences vectors words ;
         
         "/library/test/test.factor"
 
-        "/library/threads.factor"
+        "/library/tools/interpreter.factor"
         
         "/library/io/server.factor"
         "/library/tools/jedit.factor"
@@ -206,6 +207,7 @@ sequences vectors words ;
         "/library/ui/ui.factor"
         "/library/ui/gadgets/presentations.factor"
         "/library/ui/tools/listener.factor"
+        "/library/ui/tools/walker.factor"
         "/library/ui/tools/search.factor"
         "/library/ui/tools/browser.factor"
         "/library/ui/tools/help.factor"
diff --git a/library/tools/word-tools.facts b/library/tools/word-tools.facts
index 6e30da6d29..5823184d13 100644
--- a/library/tools/word-tools.facts
+++ b/library/tools/word-tools.facts
@@ -14,7 +14,7 @@ HELP: apropos "( substr -- )"
 HELP: annotate "( word quot -- )"
 { $values { "word" "a word" } { "quot" "a quotation with stack effect " { $snippet "( word def -- def )" } } }
 { $description "Changes a word definition to the result of applying a quotation to the old definition." }
-{ $notes "This is the common word to implement " { $link watch } ", " { $link break } ", " { $link break-on } " and " { $link profile } "." } ;
+{ $notes "This word is used to implement " { $link watch } " and " { $link profile } "." } ;
 
 HELP: watch "( word -- )"
 { $values { "word" "a word" } }