Update README and TODO