Correct minor language issues and edit TODO list