Small update of README and TODO