Some improvements to the config options