Feature/music models fix

Me and @coaxmetal fixed up the models to reflect the stuff in the Torrents model. @senturio  can you check these just in case before we pull?