Some config changes...

Merging to source...