Update for new Spotify + improvements