Add new TODO entries.
Fix a couple of grammar mistakes after the merge.