Added some TODOs.
Removed a word.