some config improvements