config improvements
config improvements