MUSICCCCCC

And maybe a couple other small changes.