Fixed bugs in the music instantiation
Merge branch 'production' into development