Updated README and TODO list