Bugfix and config file adjustments