clean up comments and update to do list