lots of music-y fixes