Miscellaneous config additions and updates

Miscellaneous config additions and updates #191