Incorporate trip option into display. Fixed inconsistency in timing display