tracker: some performance improvements