moved some config stuff around