Stop tracking dist
Tweak stuff