diff --git a/TODO.md b/TODO.md
index 7ea8f1f..dcc66a9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,35 +1,49 @@
-TODO                                                                 -*-org-*-
+TODO
+====
 
-Issues in need of work. Mostly compatibility with GNU readline, BSD libedit,
-http://www.thrysoee.dk/editline/, and usability improvements.
+Issues in need of work. Mostly compatibility with GNU readline, BSD
+[libedit], and usability improvements.
 
-Remember, the general idea is to keep Minix editline small.
+Remember, the general idea is to keep this library editline small with
+no external dependencies, except a C library.
 
-* Verify for 1.14.0 that custom completion handlers still work
-After reverting "fix" in 0.2.2 that made rl_complete() a function pointer we need to
-make sure the same functionality is still available with the new infrastructure.
-(Which is more inspired by BSD libedit and GNU readline.
 
-* Investigate GNU readline dependencies needed for "fileman" example
-The BSD libedit library has imported the GNU readline "fileman" example into its
-tree to demonstrate the abilities of that library.  This would also be quite useful
-for Minix editline.
+Verify custom completion handlers
+---------------------------------
 
-The first task is to investigate the depependencies and form TODO list items
-detailing what is missing and, if possible, proposals how to implement including any
-optional configure flags.
+Verify for 1.14.0 that custom completion handlers still work After
+reverting "fix" in 0.2.2 that made rl_complete() a function pointer we
+need to make sure the same functionality is still available with the new
+infrastructure.  (Which is more inspired by BSD libedit and GNU
+readline.
 
-* Instead of supporting multiline input, try the Emacs approach, line scrolling.
 
-* Add support for rl_bind_key(), currently only en editline specific el_bind_key() exists.
+Check what's needed to run the fileman example
+----------------------------------------------
 
-* Make "char *rl_prompt" globally visible.
+The BSD libedit library has imported the GNU readline "fileman" example
+into its tree to demonstrate the abilities of that library.  This would
+also be quite useful for this library!
 
-* Add support for rl_set_prompt().
+The first task is to investigate the depependencies and form TODO list
+items detailing what is missing and, if possible, proposals how to
+implement including any optional configure flags.
 
-* Add support for --enable-utf8 to configure
 
-* Use strcmp(nl_langinfo(CODESET), "UTF-8") to look for utf8 capable terminal.
+Other minor TODO's
+------------------
 
-* Implement simple UTF-8 parser according to http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+- Instead of supporting multiline input, try the Emacs approach, line
+  scrolling.
+- Add support for `rl_bind_key()`, currently only en editline specific
+  `el_bind_key()` exists.
+- Make `char *rl_prompt;` globally visible.
+- Add support for `rl_set_prompt()`
+- Add support for `--enable-utf8` to configure script
+- Use `strcmp(nl_langinfo(CODESET), "UTF-8")` to look for utf8 capable
+  terminal
+- Implement simple UTF-8 parser according to
+  http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
 
+
+[libedit]: http://www.thrysoee.dk/editline/