Added more configuration options, fixes