misc config file changes
branch merge - config file path fixes