some more config, indentation fixes