MusicPlayer bug fix - other misc changes