diff --git a/app.py b/app.py
index 441a8ce..045f4df 100644
--- a/app.py
+++ b/app.py
@@ -19,12 +19,9 @@ async def on_ready():
 @client.event
 async def on_message(message):
     # Only allow chats in DM or whitelisted channels
-    # TODO: FIX
     if not (isinstance(message.channel, discord.channel.DMChannel)) and not (message.channel.id in config['bot']['channels']):
-        print(isinstance(message.channel, discord.channel.DMChannel))
-        print(message.channel.id)
         return
-    # print(message.channel.name)
+
     # Handle own messages
     if message.author == client.user:
         return
@@ -41,11 +38,6 @@ async def on_message(message):
         await message.channel.send(f"{message.author.mention} 👋")
         return
 
-    # if message.content == f"{client.user.mention} version":
-    #    logger.info(f"Version by {message.author.name}")
-    #    await message.channel.send(f"{message.author.mention} ")
-    #    return
-
     # Handle @Bot mention
     messagearray = message.content.split()
     if messagearray[0] == client.user.mention:
@@ -53,39 +45,57 @@ async def on_message(message):
     else:
         return
 
-    if messagearray[0] == "help":
+    command = messagearray[0].lower()
+
+    # message starts with "help"
+    if command == "help":
         logger.info(f"Help by {message.author.name}")
         await message.channel.send(BuildHelpList())
         return
-    if messagearray[0] in ["list", "info"]:
-        logger.info(f"{messagearray[0]} by {message.author.name}")
+
+    # message starts with "list" or "info"
+    if command in ["list", "info"]:
+        logger.info(f"{command} by {message.author.name}")
         await message.channel.send(BuildGameList())
         return
 
-    if messagearray[0] in ["start", "stop", "restart"] and len(messagearray) >= 2:
+    if command in ["start", "stop", "restart"]:
+        if len(messagearray) != 2:
+            logger.error(
+                f"{command} with invalid numer of arguments by {message.author.name}. Command: \"{message.content}\"")
+            await message.add_reaction("❌")
+            await message.channel.send(f"Invalid number of arguments")
+            return
         game = GetGameByGameSlug(messagearray[1])
         if not game:
             logger.error(
-                f"{messagearray[0]} for invalid Game \"{messagearray[1]}\" by {message.author.name}")
+                f"{command} for invalid Game \"{messagearray[1]}\" by {message.author.name}")
             await message.add_reaction("❌")
             await message.channel.send(f"Invalid game: {messagearray[1]}")
             return
         logger.info(
-            f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]}")
-        success = HandleSystemdService(game, messagearray[0])
+            f"{command} by {message.author.name}, Game: {messagearray[1]}")
+        success = HandleSystemdService(game, command)
 
         # :white_check_mark: :x:
         if success:
             logger.info(
-                f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]} was SUCESSFUL")
+                f"{command} by {message.author.name}, Game: {messagearray[1]} was SUCESSFUL")
             await message.add_reaction("✅")
+            await message.channel.send(f"Successfully started {game['displayname']}! Happy gaming! 🎮")
         else:
             logger.error(
-                f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]} FAILED!")
+                f"{command} by {message.author.name}, Game: {messagearray[1]} FAILED!")
             await message.add_reaction("❌")
             await message.channel.send(f"Sorry {message.author.mention}, that didn't work. Ping @lauralani")
 
-    if messagearray[0] == "status":
+    if command == "status":
+        if len(messagearray) != 2:
+            logger.error(
+                f"Status with invalid numer of arguments by {message.author.name}. Command: \"{message.content}\"")
+            await message.add_reaction("❌")
+            await message.channel.send(f"Invalid number of arguments")
+            return
         status = BuildSingleGameStatus(messagearray[1])
         if not status:
             logger.error(