Tweaking configurations.

WIP
more config code

probably just 1 more to go