README and TODO fixes