ChangeLog edits and TODOs
Merge pull request #1377 from tzz/doc/changelog-edits

ChangeLog edits and TODOs