General cleanup and expansion of config