README and TODO update