diff --git a/Tools/idle/TODO.txt b/Tools/idle/TODO.txt
index d45359d5457..e33a6f0f357 100644
--- a/Tools/idle/TODO.txt
+++ b/Tools/idle/TODO.txt
@@ -12,14 +12,17 @@ TO DO:
   that have an associated filename
 - "GO" commands (execute whole buffer, selection, current line
   in the context of the Python Shell window)
-  Rename Run -> Load, Go -> Execute
-- output from module execution should go to Python Shell (?)
+  Rename Run -> Import, Go -> Run (like Pythonwin)
+- module __name__ should be '__main__' in console
+- when reopening the shell window, the old __main__ module's contents
+  should still be there
+- output from module execution should go to Python Shell
 - command expansion from keywords, module contents, other buffers, etc.
 - "Recent documents" menu item
+- Filter region command
 - more emacsisms:
     - parentheses matching
     - M-[, M-] to move by paragraphs
-    - filter region?
     - incremental search?
     - ^K should cut to buffer
 - restructure state sensitive code to avoid testing flags all the time
@@ -29,7 +32,24 @@ TO DO:
 - interface with RCS/CVS/Perforce ???
 - status bar?
 - better help?
-- don't open second class browser on same module
+- don't open second class browser on same module (nor second path browser)
+- unify class and path browsers
+- use a tree widget instead of a smalltalk/NeXT style multicolumn browser
+- Make command line behave more like the standard Python interpreter:
+    idle.py -- starts interactive shell
+    idle.py script.py arg ... -- runs script as main
+    idle.py -i script.py arg ... -- runs script as main, then interactive shell
+    idle.py -e file ... -- edit files
+    idle.py -i -e file ... -- edit files and pop up interactive shell
+    idle.py -c cmd arg ... -- run command
+    idle.py -i -c cmd arg ... -- run command, then interactive shell
+- In addition:
+    idle.py -t title -- specify alternate title for shell window    
+- And perhaps:
+    if $PYTHONSTARTUP is defined, use it (perhaps make it another option?)
+- Need to define a standard way whereby one can determine one is running
+  inside IDLE (needed for Tk mainloop, also handy for $PYTHONSTARTUP)
+- Add utility methods for use by extensions (e.g. to get selection)
 
 Details: