diff --git a/advanced/firmware/src/bin/usb-1-solution.rs b/advanced/firmware/src/bin/usb-1-solution.rs
index 94e8231..dd75819 100644
--- a/advanced/firmware/src/bin/usb-1-solution.rs
+++ b/advanced/firmware/src/bin/usb-1-solution.rs
@@ -46,7 +46,7 @@ mod app {
     }
 
     fn on_event(_usbd: &USBD, event: Event) {
-        defmt::println!("USB: {:?}", event);
+        defmt::println!("USB: {}", event);
     
         match event {
             Event::UsbReset => {
@@ -58,7 +58,7 @@ mod app {
     
             Event::UsbEp0Setup => {
                 defmt::println!("goal reached; move to the next section");
-                asm::bkpt();
+                dk::exit();
             }
         }
     }
diff --git a/advanced/firmware/src/bin/usb-1.rs b/advanced/firmware/src/bin/usb-1.rs
index 412933b..d49846c 100644
--- a/advanced/firmware/src/bin/usb-1.rs
+++ b/advanced/firmware/src/bin/usb-1.rs
@@ -53,7 +53,7 @@ mod app {
             // leave this at it is for now.
             Event::UsbEp0Setup => {
                 defmt::println!("goal reached; move to the next section");
-                asm::bkpt()
+                dk::exit();
             }
         }
     }
diff --git a/advanced/firmware/src/bin/usb-2-solution.rs b/advanced/firmware/src/bin/usb-2-solution.rs
index a9a0cae..f511a82 100644
--- a/advanced/firmware/src/bin/usb-2-solution.rs
+++ b/advanced/firmware/src/bin/usb-2-solution.rs
@@ -9,7 +9,6 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Event},
-        Peripherals,
     };
 
     use usb::{Descriptor, Request};
diff --git a/advanced/firmware/src/bin/usb-2.rs b/advanced/firmware/src/bin/usb-2.rs
index 8c827a1..7580458 100644
--- a/advanced/firmware/src/bin/usb-2.rs
+++ b/advanced/firmware/src/bin/usb-2.rs
@@ -10,7 +10,6 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Event},
-        Peripherals,
     };
 
     use usb::{Descriptor, Request};
@@ -44,7 +43,7 @@ mod app {
     }
 
     fn on_event(_usbd: &USBD, event: Event) {
-        defmt::println!("USB: {:?} @ {:?}", event, dk::uptime());
+        defmt::println!("USB: {} @ {}", event, dk::uptime());
     
         match event {
             Event::UsbReset => {
diff --git a/advanced/firmware/src/bin/usb-3-solution.rs b/advanced/firmware/src/bin/usb-3-solution.rs
index d784282..85b9668 100644
--- a/advanced/firmware/src/bin/usb-3-solution.rs
+++ b/advanced/firmware/src/bin/usb-3-solution.rs
@@ -9,8 +9,8 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Ep0In, Event},
-        Peripherals,
     };
+
     use usb::{Descriptor, Request};
 
     #[local]
@@ -44,7 +44,7 @@ mod app {
     }
 
     fn on_event(usbd: &USBD, ep0in: &mut Ep0In, event: Event) {
-        defmt::println!("USB: {:?} @ {:?}", event, dk::uptime());
+        defmt::println!("USB: {} @ {}", event, dk::uptime());
     
         match event {
             Event::UsbReset => {
diff --git a/advanced/firmware/src/bin/usb-3.rs b/advanced/firmware/src/bin/usb-3.rs
index 4336183..51f95d7 100644
--- a/advanced/firmware/src/bin/usb-3.rs
+++ b/advanced/firmware/src/bin/usb-3.rs
@@ -9,7 +9,6 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Ep0In, Event},
-        Peripherals,
     };
     use usb::{Descriptor, Request};
 
@@ -43,7 +42,7 @@ mod app {
     }
 
     fn on_event(usbd: &USBD, ep0in: &mut Ep0In, event: Event) {
-        defmt::println!("USB: {:?} @ {:?}", event, dk::uptime());
+        defmt::println!("USB: {} @ {}", event, dk::uptime());
     
         match event {
             Event::UsbReset => {
diff --git a/advanced/firmware/src/bin/usb-4-solution.rs b/advanced/firmware/src/bin/usb-4-solution.rs
index 451b5c6..7d15367 100644
--- a/advanced/firmware/src/bin/usb-4-solution.rs
+++ b/advanced/firmware/src/bin/usb-4-solution.rs
@@ -12,7 +12,6 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Ep0In, Event},
-        Peripherals,
     };
     use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State};
 
@@ -90,8 +89,8 @@ mod app {
     
         let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
             .expect("Error parsing request");
-        defmt::println!("EP0: {:?}", defmt::Debug2Format(&request));
-        //                        ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
+        defmt::println!("EP0: {}", defmt::Debug2Format(&request));
+        //                         ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
         //                                            `StandardRequest` with `defmt`
         match request {
             // section 9.4.3
diff --git a/advanced/firmware/src/bin/usb-4.rs b/advanced/firmware/src/bin/usb-4.rs
index 3746502..79aeb2f 100644
--- a/advanced/firmware/src/bin/usb-4.rs
+++ b/advanced/firmware/src/bin/usb-4.rs
@@ -13,7 +13,6 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Ep0In, Event},
-        Peripherals,
     };
     use usb2::State;
     // HEADS UP to use *your* USB packet parser uncomment line 12 and remove line 13
@@ -52,7 +51,7 @@ mod app {
     }
 
     fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) {
-        defmt::println!("USB: {:?} @ {:?}", event, dk::uptime());
+        defmt::println!("USB: {} @ {}", event, dk::uptime());
     
         match event {
             // TODO change `state` as specified in chapter 9.1 USB Device States, of the USB specification
@@ -94,7 +93,7 @@ mod app {
     
         let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
             .expect("Error parsing request");
-        defmt::println!("EP0: {:?}", defmt::Debug2Format(&request));
+        defmt::println!("EP0: {}", defmt::Debug2Format(&request));
         //                        ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
         //                                            `StandardRequest` with `defmt`
     
diff --git a/advanced/firmware/src/bin/usb-5-solution.rs b/advanced/firmware/src/bin/usb-5-solution.rs
index bacff4d..174f38b 100644
--- a/advanced/firmware/src/bin/usb-5-solution.rs
+++ b/advanced/firmware/src/bin/usb-5-solution.rs
@@ -12,7 +12,6 @@ mod app {
     use dk::{
         peripheral::USBD,
         usbd::{self, Ep0In, Event},
-        Peripherals,
     };
     use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State};
 
@@ -47,7 +46,7 @@ mod app {
         }
     }
     fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) {
-        defmt::println!("USB: {:?} @ {:?}", event, dk::uptime());
+        defmt::println!("USB: {} @ {}", event, dk::uptime());
     
         match event {
             Event::UsbReset => {
@@ -90,7 +89,7 @@ mod app {
     
         let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
             .expect("Error parsing request");
-        defmt::println!("EP0: {:?}", defmt::Debug2Format(&request));
+        defmt::println!("EP0: {}", defmt::Debug2Format(&request));
         //                        ^^^^^^^^^^^^^^^^^^^ this adapter is currently needed to log
         //                                            `StandardRequest` with `defmt`