Updated CHANGELOG.md and TODO.md