Updates README and TODO