diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b24749a..cb88657 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1082,12 +1082,8 @@
 
 Vim 7.3:
 Patches to include:
--   gettabvar() and settabvar() functions. (Yegappan Lakshmanan, 2010 May 14)
 -   Patch to support netbeans in Unix console Vim. (Xavier de Gaye, 2009 Apr
     26) Now with Mercurial repository (2010 Jan 2)
-- More float functions.  (Bill McCarthy)
-  ~/tmp/eval.diff
-  http://groups.google.com/group/vim_dev/browse_thread/thread/de192817983abb54
 - Include conceal patch?
   http://vince.negri.googlepages.com/
   http://vim.wikia.com/wiki/Patch_to_conceal_parts_of_lines
@@ -1157,16 +1153,34 @@
 -   Easier/standard way to disable default plugins.
 8   Persistent undo: store undo in a file.  Patch by Jordan Lewis, 2009 Feb
     20.  Repost 2009 Nov 16.
+    Get tar file from: http://repo.or.cz/w/vim_extended.git/tree/feat/persistent-undo
     -> disable by default and add remark that it's new and may fail.
     Testing remarks by Christian Brabandt, 2010 May 1:
 	- doesn't work well with symlinks (Jordan will look into it)
 	- old undo files tend to pile up
         - :rundo should output a message (Jordan will fix this)
+    Bugs / fixes:
+    - Undo file should be stored with the original file by default, the undo
+      directory doesn't handle remote files or directory renames.
+      Use same mechanism as for swap files?  But only with one file name.
+    - Read coladd depending on FEAT_VIRTUALEDIT, should always read/write it
+    - invoke u_wundo() inside buf_write()
+    - invoke u_rundo() inside readfile()
+    - Document that ":wundo" and ":rundo" should only be used in autocommands.
+    - unserialize_pos() does not need a return value
+    - function comments go before the function, not inside
+    - u_get_undofile() changes its argument ffname
+    - make magic four bytes.
+    - errors need numbers "E000:"
+    - also put 'enc' in undo file.
+    - don't use timestamp, "touch file" or dir copy may change it and undo
+      still works.
     Older ideas:
-    Use timestamps, so that a version a certain time ago can be found and info
-    before some time/date can be flushed. 'undopersist' gives maximum time to
-    keep undo: "3h", "1d", "2w", "1y", etc.  For the file use dot and
-    extension: ".filename.un~" (like swapfile but "un~" instead of "swp").
+    - Use timestamps, so that a version a certain time ago can be found and
+      info before some time/date can be flushed. 'undopersist' gives maximum
+      time to keep undo: "3h", "1d", "2w", "1y", etc.  For the file use dot
+      and extension: ".filename.un~" (like swapfile but "un~" instead of
+      "swp").
 -   ":{range}source": source the lines from the current file.
 	You can already yank lines and use :@" to execute them.
 	Most of do_source() would not be used, need a new function.
@@ -1693,7 +1707,7 @@
 
 
 Windows 95:
-8   Editing a file by it's short file name and writing it, makes the long file
+8   Editing a file by its short file name and writing it, makes the long file
     name disappear.  Setting 'backupcopy' helps.
     Use FindFirstFile()->cAlternateFileName in fname_case() (George Reilly).
 8   Doing wildcard expansion, will match the short filename, but result in the
@@ -3134,7 +3148,7 @@
     gettext and menus work.
 8   Could keep console open to run multiple commands, to avoid the need to hit
     return in every console.
-    Also: Look at how Emacs does runs external commands:
+    Also: Look at how Emacs does run external commands:
 	http://www.cs.washington.edu/homes/voelker/ntemacs.html.
 8   Need a separate PopUp menu for modeless selection.  Need two new commands:
     Copy selection to clipboard, Paste selection (as typed text).
@@ -4675,7 +4689,7 @@
 -   Amiga: When 'r' protection bit is not set, file can still be opened but
     gives read errors.  Check protection before opening.
 -   When writing check for file exists but no permission, "Permission denied".
--   If file does not exists, check if directory exists.
+-   If file does not exist, check if directory exists.
 -   MSDOS: although t_cv and t_ci are not set, do invert char under cursor.
 -   Settings edit mode: make file with ":set opt=xx", edit it, parse it as ex
     commands.