fixes to trip_matcher