diff --git a/TODO.txt b/TODO.txt
index 3b1711dc8c..af3b80ad24 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,13 +1,14 @@
 + 0.87:
 
 - callback scheduling issue
-- error window: ENTER hides it
+- error popup obscures input area
+- browser: tile titles should respond to right-clicks and/or have a
+  menu popup button
+- ui docs
 
 + 0.88:
 
 - lisppaste gui
-- browser: tile titles should respond to right-clicks and/or have a
-  menu popup button
 - growable data heap
 - variable width word wrap
 - graphical crossref tool
@@ -19,9 +20,7 @@
 - use crc32 instead of modification date in reload-modules
 - models: don't do redundant work
 - top level window positioning on ms windows
-- crashes:
-  - httpd crash
-  - fep when closing window
+- httpd crash
 - these things are "Too Slow":
   - make-image
   - workspace-window
@@ -36,7 +35,6 @@
 - new windows don't always have focus, eg focus follows mouse
 - recompile get/set/>n/n>/ndrop if needed
 - cross-word type inference
-- ui docs
 - some kind of declarative wiring framework for ui
 - if we're printing a block on multiple lines, break at some words like
   set off on % # , ... and assembler opcodes
diff --git a/core/ui/test/lists.factor b/core/ui/test/lists.factor
index 8da2c9aeb9..d51e7f318f 100644
--- a/core/ui/test/lists.factor
+++ b/core/ui/test/lists.factor
@@ -1,4 +1,4 @@
 IN: temporary
-USING: gadgets-lists models prettyprint math test ;
+USING: gadgets-lists models prettyprint math test kernel ;
 
-[ ] [ [ ] [ 3 + . ] f <model> <list> list-action ] unit-test
+[ ] [ [ drop ] [ 3 + . ] f <model> <list> list-action ] unit-test
diff --git a/core/ui/tools/operations.factor b/core/ui/tools/operations.factor
index b3097c81f5..d403b7fea8 100644
--- a/core/ui/tools/operations.factor
+++ b/core/ui/tools/operations.factor
@@ -129,11 +129,6 @@ M: operation invoke-command
     { +quot+ [ help-gadget call-tool ] }
 } define-operation
 
-[ word? ] H{
-    { +name+ "Edit documentation" }
-    { +quot+ [ <link> edit ] }
-} define-operation
-
 [ word? ] H{
     { +name+ "Usage" }
     { +keyboard+ T{ key-down f { A+ } "u" } }
diff --git a/core/ui/tools/test/listener.factor b/core/ui/tools/test/listener.factor
index 5ec3f0ef8f..e54ccef872 100644
--- a/core/ui/tools/test/listener.factor
+++ b/core/ui/tools/test/listener.factor
@@ -1,12 +1,15 @@
 IN: temporary
 USING: gadgets-listener words arrays namespaces test kernel
-freetype timers gadgets-workspace ;
+freetype timers gadgets-workspace sequences gadgets-text ;
 
 timers [ init-timers ] unless
 
 [
     <listener-gadget> "listener" set
     
+    { "kernel" } [ vocab ] map
+    "listener" get listener-gadget-input set-interactor-use
+    
     [ "dup" ] [ \ dup "listener" get word-completion-string ] unit-test
     
     [ "USE: words word-name" ]