Fixing up comments and TODO list