Modify other termination criteria to fit with new train.py cycle