Various minor changes/bug fixes

Only new feature is ability to restart playback after a song ends