Config file update, UI Dialog fix, misc other fixes and cleanup.