Update of README and TODO