diff --git a/Tools/idle/TODO.txt b/Tools/idle/TODO.txt
index 092560f..a520b30 100644
--- a/Tools/idle/TODO.txt
+++ b/Tools/idle/TODO.txt
@@ -9,6 +9,7 @@
     - better integration of "debug module"
     - debugger should be global resource (attached to flist, not to shell)
     - fix the stupid bug where you need to step twice
+    - after closing and reopening PyShell, debugger no longer works :-(
 - insert the initial current directory into sys.path
 - default directory attribute for each window instead of only for windows
   that have an associated filename
@@ -21,6 +22,7 @@
     - M-[, M-] to move by paragraphs
     - incremental search?
     - ^K should cut to buffer
+- search should indicate wrap-around in some way
 - restructure state sensitive code to avoid testing flags all the time
 - persistent user state (e.g. window and cursor positions, bindings)
 - make backups when saving
@@ -43,12 +45,15 @@
 - after paste, show end of pasted text
 - on Windows, should turn short filename to long filename (not only in argv!)
   (shouldn't this be done -- or undone -- by ntpath.normpath?)
+- new autoindent after colon even indents when the colon is in a comment!
+- sometimes forward slashes in pathname remain
+- sometimes star in window name remains in Windows menu
 
 Structural problems:
 
 - too much knowledge in FileList about EditorWindow (for example)
-- Several occurrences of scrollable listbox with title and certain
-  behavior; should create base class to generalize this
+- should add some primitives for accessing the selection etc.
+  to repeat cumbersome code over and over
 
 ======================================================================