Small additions.
Removed source from tracks.