Update README and some config changes