Updated README and small cleanups