typos, and a TODO list