README and TODO updates 5