Update notes and clean up comments, TODOs.