Improved README and TODO, fix typo