Fix typo and add a few more items in TODO.md