Adding a few to-do's, adding some documentation, and clearing up
a few unneeded debugging output.