configuration improvements

preparing for more robust configuration framework