typos and final TODOs