Updates to README and TODO