README and TODO updates 6