Updated README and some minor changes