correct map info for each song
merge conflicts resolved