Minor modifications. Needs streaming part, and addSong activity.