small bugfix and configuration adjustments