tracker improvements