Update README.md and TODO