moved some configuration directives around