Updated usage of ConfigFile
Other minor fixes/updates