diff --git a/moq-warp/src/model/segment.rs b/moq-warp/src/model/segment.rs
index 5cac4e3..5726e39 100644
--- a/moq-warp/src/model/segment.rs
+++ b/moq-warp/src/model/segment.rs
@@ -49,7 +49,7 @@ impl Deref for Publisher {
 	}
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Subscriber {
 	pub info: Arc<Info>,
 
diff --git a/moq-warp/src/model/track.rs b/moq-warp/src/model/track.rs
index 4cc38ce..0704c72 100644
--- a/moq-warp/src/model/track.rs
+++ b/moq-warp/src/model/track.rs
@@ -51,7 +51,7 @@ impl fmt::Debug for Publisher {
 	}
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Subscriber {
 	pub name: String,
 
@@ -72,12 +72,6 @@ impl Subscriber {
 	}
 }
 
-impl fmt::Debug for Subscriber {
-	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-		write!(f, "track subscriber: {:?}", self.name)
-	}
-}
-
 #[derive(Clone)]
 pub struct Error {
 	pub code: VarInt,
diff --git a/moq-warp/src/model/watch.rs b/moq-warp/src/model/watch.rs
index 8c64576..3ae16df 100644
--- a/moq-warp/src/model/watch.rs
+++ b/moq-warp/src/model/watch.rs
@@ -1,3 +1,4 @@
+use core::fmt;
 use std::collections::VecDeque;
 use tokio::sync::watch;
 
@@ -7,6 +8,18 @@ struct State<T> {
 	drained: usize,
 }
 
+impl<T> fmt::Debug for State<T> {
+	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+		write!(
+			f,
+			"State<{}> ( queue.len(): {}, drained: {} )",
+			std::any::type_name::<T>(),
+			&self.queue.len(),
+			&self.drained
+		)
+	}
+}
+
 impl<T> State<T> {
 	fn new() -> Self {
 		Self {
@@ -85,7 +98,7 @@ impl<T: Clone> Default for Publisher<T> {
 	}
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Subscriber<T: Clone> {
 	state: watch::Receiver<State<T>>,
 	index: usize,