Put NOM_SEGMENT_TIME back in the trapezoid calculations. Minor tweaks.