Improved README and minor fixes