fixed some missing default params in config options
fixed merge conflict