various improvements to config