change removeOverlaps to have options to prioritize TE states.  switch repet track in all XMLs to point to this version so dont forget...