Updates and fixes for the new tracking algorithm. Diverging is still
work in progress.