config simplification and changes