Update README and minor fixes