added spotify_queue, cleaned up