Minor Updates
config changes
Merged