Config and minor changes.