Various bug fixes
Merge branch 'master' of https://github.com/James3432/MusicPlayer.git