Improved song model and spec a bit