typo and clarify TODOs