README and TODO updates