New config options, modified README.md