some configuration improvements