Config and minor mods