removed endPositions from match object, various optimizations