Prevent music overlap

I did a few more tweaks. The primary reason for this was to fully eliminate having music be able to play more than once. In my latest testing I was not able to repro it. The other changes are pretty minor and mostly polish.