Cleaning up for #104, music past first song is still broken