CHANGELOG.md and TODO.md updated