Clean up some old typos and TODOs