README and TODO updated