Update README.md and TODO.md