fix typos and clean up TODOs