Music and trigger fixes
Merge branch 'master' of https://github.com/Tarwine/hollow
Some missed changes
Merge branch 'master' of https://github.com/Tarwine/hollow