Camelcase config, minor updates