improvements to configuration