README and TODO updates 3