Updated CONTRIBUTING.md and TODO.md