diff --git a/Cargo.toml b/Cargo.toml
index 7629d6d..b3b7132 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-# TODO(1) fix `authors` and `name` if you didn't use `cargo-generate`
+# TODO fix `authors` and `name` if you didn't use `cargo-generate`
 authors = ["{{authors}}"]
 name = "{{project-name}}"
 edition = "2018"
@@ -14,8 +14,10 @@ defmt-rtt = "0.3.0"
 panic-probe = { version = "0.3.0", features = ["print-defmt"] }
 cortex-m-rtic = "1.1"
 cortex-m = "0.7"
-# TODO(4) enter your HAL here
+# TODO enter your HAL here
 # some-hal = "1.2.3"
+# TODO add a monotonic if you use scheduling
+# some-monotonic = "1.2.3"
 
 # cargo build/run
 [profile.dev]
diff --git a/src/bin/minimal.rs b/src/bin/minimal.rs
index 5fef442..24fb599 100644
--- a/src/bin/minimal.rs
+++ b/src/bin/minimal.rs
@@ -3,8 +3,10 @@
 
 use {{crate_name}} as _; // global logger + panicking-behavior + memory layout
 
-// TODO: Replace `some_hal::pac` with the path to the PAC
-#[rtic::app(device = some_hal::pac)]
+#[rtic::app(
+    device = some_hal::pac, // TODO: Replace `some_hal::pac` with the path to the PAC
+    dispatchers = [FreeInterrupt1, ...] // TODO: Replace the `FreeInterrupt1, ...` with free interrupt vectors if software tasks are used
+)]
 mod app {
     // TODO: Add a monotonic if scheduling will be used
     // #[monotonic(binds = SysTick, default = true)]
diff --git a/src/lib.rs b/src/lib.rs
index 8b34265..f181f6a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,9 +3,9 @@
 use core::sync::atomic::{AtomicUsize, Ordering};
 
 use defmt_rtt as _; // global logger
-// TODO(5) adjust HAL import
-// use some_hal as _; // memory layout
 
+// TODO adjust HAL import
+// use some_hal as _; // memory layout
 use panic_probe as _;
 
 // same panicking *behavior* as `panic-probe` but doesn't print a panic message
diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml
index 5ee1296..06834a5 100644
--- a/testsuite/Cargo.toml
+++ b/testsuite/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-# TODO(1) fix `authors` if you didn't use `cargo-generate`
+# TODO fix `authors` if you didn't use `cargo-generate`
 authors = ["{{authors}}"]
 name = "testsuite"
 publish = false