Update ProgressTracker, some minor tweaks here and there