Updated README and minor fixes