improvements to tracking, turn off z matching