Config file and minor cleanups