Some updates to the song model

I'm not particularly happy with the song design. Going to have to give
it some consideration.