Fixes some conflicts from last merge.
Adds some dummy values to the configuration.