config settings revisited
fix merge