diff --git a/crabidy-server/src/lib.rs b/crabidy-server/src/lib.rs
index 524dd34..8db1b7d 100644
--- a/crabidy-server/src/lib.rs
+++ b/crabidy-server/src/lib.rs
@@ -58,7 +58,13 @@ impl QueueManager {
 
     pub fn shuffle_off(&mut self) {
         self.shuffle = false;
+        let pos = self.current_position();
+        self.current_offset = pos;
         self.play_order = (0..self.tracks.len()).collect();
+        debug!(
+            "offset: {}, order: {:?}",
+            self.current_offset, self.play_order
+        );
     }
 
     pub fn shuffle_all(&mut self) {
diff --git a/crabidy-server/src/playback.rs b/crabidy-server/src/playback.rs
index e7712b3..cbc7fe3 100644
--- a/crabidy-server/src/playback.rs
+++ b/crabidy-server/src/playback.rs
@@ -513,6 +513,7 @@ impl Playback {
 
     #[instrument(skip(self))]
     async fn flatten_node(&self, uuid: &str) -> Vec<Track> {
+        debug!("flattening node");
         let tx = self.provider_tx.clone();
         let (result_tx, result_rx) = flume::bounded(1);
         let span = debug_span!("prov-chan");
@@ -555,6 +556,7 @@ impl Playback {
 
     #[instrument(skip(self))]
     async fn get_urls_for_track(&self, uuid: &str) -> Result<Vec<String>, ProviderError> {
+        debug!("getting urls for track");
         let tx = self.provider_tx.clone();
         let (result_tx, result_rx) = flume::bounded(1);
         let span = tracing::trace_span!("prov-chan");
@@ -575,6 +577,7 @@ impl Playback {
 
     #[instrument(skip(self))]
     async fn play_or_stop(&self, track: Option<Track>) {
+        debug!("play or stop");
         if let Some(track) = track {
             let mut uuid = track.uuid.clone();
             let urls = loop {
@@ -621,6 +624,7 @@ impl Playback {
 
     #[instrument(skip(self))]
     async fn play(&self, track: Option<Track>) {
+        debug!("play");
         if let Some(track) = track {
             let mut uuid = track.uuid.clone();
             let urls = loop {
diff --git a/crabidy-server/src/provider.rs b/crabidy-server/src/provider.rs
index 6e97056..f0e4e72 100644
--- a/crabidy-server/src/provider.rs
+++ b/crabidy-server/src/provider.rs
@@ -132,6 +132,7 @@ impl ProviderClient for ProviderOrchestrator {
     }
     #[instrument(skip(self))]
     async fn get_urls_for_track(&self, track_uuid: &str) -> Result<Vec<String>, ProviderError> {
+        debug!("get_urls_for_track");
         self.tidal_client
             .get_urls_for_track(track_uuid)
             .in_current_span()