diff --git a/embassy/demos/std/src/main.rs b/embassy/demos/std/src/main.rs
index cab788b3e4c7726dfb1d756ce0202f1b775ab1ab..96841eb61d884ba48f9ae7b80ee841c698ab77d2 100644
--- a/embassy/demos/std/src/main.rs
+++ b/embassy/demos/std/src/main.rs
@@ -150,7 +150,7 @@ impl DemoServer {
 
 impl ServBehaviour for DemoServer {
     fn hostkeys(&mut self) -> BhResult<&[SignKey]> {
-        todo!()
+        todo!("hostkeys()")
         // Ok(&self.keys)
     }
 
diff --git a/embassy/src/embassy_sunset.rs b/embassy/src/embassy_sunset.rs
index 33eff100e90678fce76c3ae15986d290782e3c23..2646ec2eca0b7ec5d7e99944bbe1201676cdbe71 100644
--- a/embassy/src/embassy_sunset.rs
+++ b/embassy/src/embassy_sunset.rs
@@ -27,7 +27,6 @@ pub struct EmbassySunset<'a> {
     pub(crate) inner: Mutex<NoopRawMutex, Inner<'a>>,
 
     progress_notify: Signal<NoopRawMutex, ()>,
-    lock_waker: WakerRegistration,
 }
 
 impl<'a> EmbassySunset<'a> {
@@ -44,7 +43,6 @@ impl<'a> EmbassySunset<'a> {
         Self {
             inner,
             progress_notify,
-            lock_waker: WakerRegistration::new(),
          }
     }
 
@@ -94,14 +92,13 @@ impl<'a> EmbassySunset<'a> {
 
     pub async fn read(&self, buf: &mut [u8]) -> Result<usize> {
         poll_fn(|cx| {
-
-            trace!("read locking");
+            // Attempt to lock .inner
             let i = self.inner.lock();
             pin_mut!(i);
             let r = match i.poll(cx) {
                 Poll::Ready(mut inner) => {
-                    warn!("read lock ready");
                     match inner.runner.output(buf) {
+                        // no output ready
                         Ok(0) => {
                             inner.runner.set_output_waker(cx.waker());
                             Poll::Pending
@@ -111,12 +108,10 @@ impl<'a> EmbassySunset<'a> {
                     }
                 }
                 Poll::Pending => {
-                    trace!("read lock pending");
+                    // .inner lock is busy
                     Poll::Pending
                 }
             };
-            trace!("read result {r:?}");
-
             r
         })
         .await
@@ -124,12 +119,10 @@ impl<'a> EmbassySunset<'a> {
 
     pub async fn write(&self, buf: &[u8]) -> Result<usize> {
         poll_fn(|cx| {
-            trace!("write locking");
             let i = self.inner.lock();
             pin_mut!(i);
             let r = match i.poll(cx) {
                 Poll::Ready(mut inner) => {
-                    warn!("write lock ready");
                     if inner.runner.ready_input() {
                         match inner.runner.input(buf) {
                             Ok(0) => {
@@ -144,14 +137,14 @@ impl<'a> EmbassySunset<'a> {
                     }
                 }
                 Poll::Pending => {
-                    trace!("write lock pending");
+                    // .inner lock is busy
                     Poll::Pending
                 }
             };
             if r.is_ready() {
+                // wake up .progress() to handle the input
                 self.progress_notify.signal(())
             }
-            trace!("write result {r:?}");
             r
         })
         .await
diff --git a/src/channel.rs b/src/channel.rs
index 175a2e10e328b07627a7f67c491bf931ba3ae686..60fc9a46847664f443cba40157d18a352352f59c 100644
--- a/src/channel.rs
+++ b/src/channel.rs
@@ -411,7 +411,7 @@ impl Channels {
                 trace!("channel success, TODO");
             }
             Packet::ChannelFailure(_p) => {
-                todo!();
+                todo!("ChannelFailure");
             }
             _ => Error::bug_msg("unreachable")?,
         };
diff --git a/src/cliauth.rs b/src/cliauth.rs
index f9cdc8ecfe56b34ea1275bb8a42c4a3687d2aca0..211e88a335e45bab49f88983ea85a9e31d873c8b 100644
--- a/src/cliauth.rs
+++ b/src/cliauth.rs
@@ -184,7 +184,7 @@ impl CliAuth {
 
         match auth60 {
             Userauth60::PkOk(pkok) => self.auth_pkok(pkok, sess_id, parse_ctx, s),
-            _ => todo!(),
+            Userauth60::PwChangeReq(_req) => todo!("pwchange"),
         }
     }
 
diff --git a/src/packets.rs b/src/packets.rs
index 106987338cf4db230c84ab63643cc52906b696a3..ec6e08157bd781db52efb00a33ddcd018ad2f650 100644
--- a/src/packets.rs
+++ b/src/packets.rs
@@ -349,7 +349,7 @@ impl <'a> From<&'a OwnedSig> for Signature<'a> {
     fn from(s: &'a OwnedSig) -> Self {
         match s {
             OwnedSig::Ed25519(e) => Signature::Ed25519(Ed25519Sig { sig: BinString(e) }),
-            OwnedSig::RSA256 => todo!(),
+            OwnedSig::RSA256 => todo!("sig from rsa"),
         }
     }
 }
diff --git a/src/runner.rs b/src/runner.rs
index 5543ba46d89043987ab5c289166d7f81e48570fd..526c2bcb2b4085fe45f74ae49e03579a9a2c281b 100644
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -267,7 +267,7 @@ impl<'a> Runner<'a> {
     }
 
     pub fn term_window_change(&self, _chan: u32, _wc: packets::WinChange) -> Result<()> {
-        todo!();
+        todo!("term_window_change()");
         // self.conn.channels.term_window_change(chan, wc)
     }