Additional default configuration options
Bug fixes