diff --git a/bot.py b/bot.py
index 68268c3..c0ddded 100644
--- a/bot.py
+++ b/bot.py
@@ -11,9 +11,9 @@ from heidi_client import *
 install(show_locals=True)
 
 
-# TODO: Only post in heidi-spam channel
-# TODO: yt-dlp music support
-# TODO: Somehow upload voicelines more easily (from discord voice message?)
+# @todo Only post in heidi-spam channel
+# @todo yt-dlp music support
+# @todo Somehow upload voicelines more easily (from discord voice message?)
 
 
 # Log to file
@@ -124,7 +124,7 @@ def user_entrance_sound_autocomplete(
         for board in boards
     }  # These are all sounds, organized per board
 
-    # TODO: Initially only suggest boards, because there are too many sounds to show them all
+    # @todo Initially only suggest boards, because there are too many sounds to show them all
     completions: List[Choice[str]] = []
     for (
         board,
@@ -224,7 +224,7 @@ async def magic_shell(interaction: Interaction, question: str) -> None:
     )
 
 
-# TODO: Allow , separated varargs, need to parse manually as slash commands don't support varargs
+# @todo Allow , separated varargs, need to parse manually as slash commands don't support varargs
 @client.tree.command(name="wähle", description="Heidi trifft die Wahl!")
 @app_commands.rename(option_a="entweder")
 @app_commands.describe(option_a="Ist es vielleicht dies?")
diff --git a/heidi_helpers.py b/heidi_helpers.py
index 9780e39..a424db8 100644
--- a/heidi_helpers.py
+++ b/heidi_helpers.py
@@ -8,6 +8,7 @@ from heidi_constants import *
 
 print("Debug: Importing heidi_helpers.py")
 
+# @todo Normalize volume when playing
 async def play_voice_line(
         interaction: Union[Interaction, None],
         voice_channel: VoiceChannel,
diff --git a/textgen_lstm.py b/textgen_lstm.py
index 019b343..a752066 100644
--- a/textgen_lstm.py
+++ b/textgen_lstm.py
@@ -178,7 +178,7 @@ class LSTMTextGenerator(textgen):
 
     # Interface shit
 
-    # TODO: Also save/load generated prefixes
+    # @todo Also save/load generated prefixes
     def load(self):
         print(f"Loading \"{self.filename}\" LSTM model with {len(self.charbase)} characters from file.")
 
diff --git a/textgen_markov.py b/textgen_markov.py
index 9d96068..ccfb604 100644
--- a/textgen_markov.py
+++ b/textgen_markov.py
@@ -8,8 +8,8 @@ from rich.traceback import install
 install()
 
 # NOTE: This is word based, not character based
-# TODO: Serialize and save/load model (don't train on the server)
-# TODO: Maybe extract sentence beginnings and use them as starters?
+# @todo Serialize and save/load model (don't train on the server)
+# @todo Maybe extract sentence beginnings and use them as starters?
 
 class MarkovTextGenerator(textgen):
     # The greater the order (prefix length), the lesser the variation in generation, but the better the sentences (generally).