Added return to current playing song, bug fixes.