Update README and TODO given changes