diff --git a/chatbot/chatbot.py b/chatbot/chatbot.py
index 7afbe30..74bf0cc 100644
--- a/chatbot/chatbot.py
+++ b/chatbot/chatbot.py
@@ -34,7 +34,7 @@ def get_queue(self):
 
     queue = property(fget=get_queue)
 
-    def reset(self):
+    def dump(self):
         if not os.path.isdir("chatdata"):
             os.mkdir("chatdata")
 
@@ -42,6 +42,9 @@ def reset(self):
         with open(f"chatdata/{uid}.txt", "w") as f:
             f.write(self.summary())
 
+    def reset(self):
+        self.dump()
+
         self.start_offset = 0
         self.__queue = []
 
diff --git a/discord/main.py b/discord/main.py
index de3065c..b97dace 100644
--- a/discord/main.py
+++ b/discord/main.py
@@ -67,22 +67,20 @@ async def on_message(self, message: discord.Message):
             self.convos[channel_id] = Conversation(convo_id)
             self.model.init_conversation(self.convos[channel_id])
 
-        content: str = message.content
+        content: str = message.clean_content
 
         if content.startswith(cmd_text):
             await self.handle_cmd(message)
             return
 
         convo = self.convos[message.channel.id]
-        convo.add_message(
-            ChatbotMessage(sender=message.author.display_name, message=message.content)
-        )
+        convo.add_message(ChatbotMessage(sender=message.author.display_name, message=content))
 
-        respond = name.lower() in message.content.lower()
+        respond = name.lower() in content.lower()
         respond = respond or self.user.mentioned_in(message)
         respond = respond or (len(message.mentions) == 0 and random() < 0.05)
         respond = respond or (
-            convo.queue[-2].sender == name and ("you" in message.content.lower() or random() < 0.33)
+            convo.queue[-2].sender == name and ("you" in content.lower() or random() < 0.33)
         )
 
         if respond:
@@ -113,7 +111,7 @@ async def handle_chat(self, message: discord.Message):
             )
 
     async def handle_cmd(self, message: discord.Message):
-        content = shlex.split(message.content)[1:]
+        content = shlex.split(message.clean_content)[1:]
         try:
             args = parser.parse_args(content)
         except EarlyExit as e:
@@ -166,6 +164,12 @@ def create_embed(self, author, title: str, description: str, footer=None) -> dis
 
         return embed
 
+    async def close(self):
+        for convo in self.convos.values():
+            convo.dump()
+
+        await super().close()
+
 
 if __name__ == "__main__":
     intents = discord.Intents.default()