working on some configuration changes.
Tweaking setup.
Merge branch 'config' into develop