Config file changes. Minor code changes.