Added TODOs, some typos