Updated README and clean up a few