diff --git a/app/bot.py b/app/bot.py
index 1cdc5cb6..1f19d97b 100755
--- a/app/bot.py
+++ b/app/bot.py
@@ -615,7 +615,7 @@ async def timeout(ctx, user: discord.Member = None, time=None, *, reason=None):
 
     time = humanfriendly.parse_timespan(time)
     await user.timeout(until=discord.utils.utcnow() + datetime.timedelta(seconds=time))
-    await user.send(reason)
+    await user.send("You have been timed out for %s seconds for %s" % (time, reason))
     await ctx.send("Timed %s out for %s seconds" % (user.mention, time))
 
 
@@ -633,10 +633,15 @@ async def source(ctx):
 
 
 @bot.command(name="youtube", aliases=["yt"])
-async def youtube(ctx):
-    import youtube
+async def youtube(ctx, *, query):
+    import re
+    from urllib import parse, request
 
-    result = youtube.parse_message(ctx.message.content)
+    query_string = parse.urlencode({"search_query": query})
+    html_content = request.urlopen("http://www.youtube.com/results?" + query_string)
+    search_results = re.findall("\/watch\?v=(.{11})", html_content.read().decode())
+
+    result = "https://www.youtube.com/watch?v=" + search_results[0]
 
     await ctx.send(result)
 
@@ -682,12 +687,13 @@ async def bf5(ctx):
 
 
 @bot.command(name="ffxiv")
-async def ffxiv(ctx):
+async def ffxiv(ctx, first_name, last_name, server):
     import ffxiv
 
     async with ctx.message.channel.typing():
         try:
-            await ctx.send(embed=ffxiv.parse_message(ctx.message.content))
+            name = "%s %s" % (first_name, last_name)
+            await ctx.send(embed=ffxiv.make_request(name=name, server=server))
         except Exception:
             await ctx.send(
                 "I encountered an error while searching for that player.\nPlease check that your player name and server are spelled correctly"
@@ -724,22 +730,13 @@ async def info(ctx):
 
 
 @bot.command(name="purge")
-async def purge(ctx):
+async def purge(ctx, count=None):
     def is_me(m):
         return m.author == ctx.message.author
 
     num = 20
-    if len(ctx.message.content.split()) > 1:
-        try:
-            num = int(ctx.message.content.split()[1]) + 1
-        except ValueError:
-            await ctx.send(
-                ctx.message.channel,
-                "You need to give me a number, you entered {}".format(
-                    ctx.message.content.split()[1]
-                ),
-            )
-            return
+    if count:
+        num = int(count) + 1
     await ctx.message.channel.purge(limit=num, check=is_me)
 
 
diff --git a/app/ffxiv.py b/app/ffxiv.py
index 3596d839..fe1ad0bb 100755
--- a/app/ffxiv.py
+++ b/app/ffxiv.py
@@ -8,13 +8,6 @@ else:
     token = ""
 
 
-def parse_message(message):
-    name = message.split()[1] + "+" + message.split()[2]
-    server = message.split()[3]
-
-    return make_request(name=name, server=server)
-
-
 def make_request(name, server):
     player_search = "https://xivapi.com/character/search?name=%s&server=%s%s" % (
         name,
diff --git a/app/youtube.py b/app/youtube.py
deleted file mode 100755
index 468e2a27..00000000
--- a/app/youtube.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import re
-from urllib import parse, request
-
-
-def parse_message(message):
-    query_string = parse.urlencode({"search_query": message.split()[1:]})
-    html_content = request.urlopen("http://www.youtube.com/results?" + query_string)
-    search_results = re.findall("\/watch\?v=(.{11})", html_content.read().decode())
-
-    return "https://www.youtube.com/watch?v=" + search_results[0]
diff --git a/helm/values.yaml b/helm/values.yaml
index ca700cb5..6ae3721e 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ldooks/dragon-bot
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "153"
+  tag: "154"
 
 imagePullSecrets: []
 nameOverride: ""