Make sure times are passed consistent with DM2 and fix some display problems