fix feedback for new schema
merge changes from master
add music
Merge pull request #4 from XanderStrike/development

fix feedback for new schema
merge