minor change to order of config elements
todo cleanup