add TODOs and fix up comments