addTrack functionality (to add lyrics) and routing cleanup