Track debug

Debugged some issues with track.