Typo in track template
Tweaks