Updates to add timeout and terminator to settings.