Fixed overwriting of tracks.
Cleaned up