added some more configuration options