README and TODO updates 4