README and TODO updates 7