Bug fixes and more config options at runtime