updated config files and minor cleanups.