Improvements to code to add new -q and -x options to IMEter training script.