Minor improvements to the timing system