Sounds better?

- Fix an issue where the music didn't play all the time that it should.
- Some unrelated code refactoring.