Various config additions and changes