Improved README plus some cleanup