Add help, cleanup output functions.
Remove a couple of todo items that are now complete.
Add a note.