Reworked some of the config variables