Making good features track better