Bug fix and working version of TrackViewer