Integrated Configuration Changes and bergey tweaks