fixed tracking AGAIN to include vendors and other important things that make it actually work