Patches a config bug and moved some things