Update README and minor changes