resolved some bugs with songs