Fix of the iterative tracking sequence and some cleanup