Small fixes and cleanup
Updated README.md