Fixed up the tracking... still more to be done.