Fix track_no
Remove debug, make track_no more robust
Merge branch 'fix_track_no' into develop