Update for Spotify + improvements