more minor moving to config