General tidy up and improved README.md