diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js
index df9cc6a8..1924f8e0 100644
--- a/commands/avataredit/3000years.js
+++ b/commands/avataredit/3000years.js
@@ -21,11 +21,11 @@ module.exports = class YearsCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         if (message.mentions.users.size !== 1) {
-            message.channel.send(':x: Error! Please mention one user!');
+            return message.channel.send(':x: Error! Please mention one user!');
         }
         else {
             if (!message.mentions.users.first().avatarURL) {
-                message.channel.send(":x: Error! This user has no avatar!");
+                return message.channel.send(":x: Error! This user has no avatar!");
             }
             else {
                 let userAvatar = message.mentions.users.first().avatarURL;
@@ -34,12 +34,12 @@ module.exports = class YearsCommand extends commando.Command {
                 let images = [];
                 images.push(Jimp.read(userAvatar));
                 images.push(Jimp.read("./images/3000years.png"));
-                Promise.all(images).then(([avatar, years]) => {
+                await Promise.all(images).then(([avatar, years]) => {
                     avatar.resize(200, 200);
                     years.blit(avatar, 461, 127);
                     years.getBuffer(Jimp.MIME_PNG, (err, buff) => {
                         if (err) throw err;
-                        message.channel.sendFile(buff);
+                        return message.channel.sendFile(buff);
                     });
                 });
             }
diff --git a/commands/roleplay/divorce.js b/commands/roleplay/divorce.js
index aaadf33b..046375dc 100644
--- a/commands/roleplay/divorce.js
+++ b/commands/roleplay/divorce.js
@@ -17,6 +17,6 @@ module.exports = class DivorceCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *divorces* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *divorces* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js
index bf9d6565..c29a46c3 100644
--- a/commands/roleplay/eat.js
+++ b/commands/roleplay/eat.js
@@ -17,6 +17,6 @@ module.exports = class EatCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *eats* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *eats* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/falconpunch.js b/commands/roleplay/falconpunch.js
index bfac4b74..1483517e 100644
--- a/commands/roleplay/falconpunch.js
+++ b/commands/roleplay/falconpunch.js
@@ -17,6 +17,6 @@ module.exports = class FalconPunchCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *falcon punches* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *falcon punches* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/fistbump.js b/commands/roleplay/fistbump.js
index 602b9b98..ffe5e9b5 100644
--- a/commands/roleplay/fistbump.js
+++ b/commands/roleplay/fistbump.js
@@ -17,6 +17,6 @@ module.exports = class FistBumpCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *fist-bumps* ${thingToRoleplay} *badalalala*`);
+        return message.channel.send(`${message.author} *fist-bumps* ${thingToRoleplay} *badalalala*`);
     }
 };
diff --git a/commands/roleplay/highfive.js b/commands/roleplay/highfive.js
index 638198a3..a13d7461 100644
--- a/commands/roleplay/highfive.js
+++ b/commands/roleplay/highfive.js
@@ -17,6 +17,6 @@ module.exports = class HighFivesCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *high-fives* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *high-fives* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/hitwithshovel.js b/commands/roleplay/hitwithshovel.js
index 80eebeb7..559d0155 100644
--- a/commands/roleplay/hitwithshovel.js
+++ b/commands/roleplay/hitwithshovel.js
@@ -17,6 +17,6 @@ module.exports = class HitwithShovelCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *hits* ${thingToRoleplay} *with a shovel*`);
+        return message.channel.send(`${message.author} *hits* ${thingToRoleplay} *with a shovel*`);
     }
 };
diff --git a/commands/roleplay/hug.js b/commands/roleplay/hug.js
index 7b01179a..e37b95ec 100644
--- a/commands/roleplay/hug.js
+++ b/commands/roleplay/hug.js
@@ -17,6 +17,6 @@ module.exports = class HugCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *hugs* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *hugs* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/inhales.js b/commands/roleplay/inhales.js
index 5bcef823..647fce4e 100644
--- a/commands/roleplay/inhales.js
+++ b/commands/roleplay/inhales.js
@@ -17,6 +17,6 @@ module.exports = class InhaleCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *inhales* ${thingToRoleplay} *but gained no ability...*`);
+        return message.channel.send(`${message.author} *inhales* ${thingToRoleplay} *but gained no ability...*`);
     }
 };
diff --git a/commands/roleplay/kill.js b/commands/roleplay/kill.js
index 9d71bdaa..4afeb6c0 100644
--- a/commands/roleplay/kill.js
+++ b/commands/roleplay/kill.js
@@ -17,6 +17,6 @@ module.exports = class KillCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *kills* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *kills* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/kiss.js b/commands/roleplay/kiss.js
index 9f57c837..eb098af9 100644
--- a/commands/roleplay/kiss.js
+++ b/commands/roleplay/kiss.js
@@ -17,6 +17,6 @@ module.exports = class KissCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *kisses* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *kisses* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/marries.js b/commands/roleplay/marries.js
index f757a9a2..ff6dd2e7 100644
--- a/commands/roleplay/marries.js
+++ b/commands/roleplay/marries.js
@@ -17,6 +17,6 @@ module.exports = class MarryCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *marries* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *marries* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/pat.js b/commands/roleplay/pat.js
index c151a661..a435d719 100644
--- a/commands/roleplay/pat.js
+++ b/commands/roleplay/pat.js
@@ -17,6 +17,6 @@ module.exports = class PatCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *pats* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *pats* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/poke.js b/commands/roleplay/poke.js
index a94a9b8f..ecbf3d7a 100644
--- a/commands/roleplay/poke.js
+++ b/commands/roleplay/poke.js
@@ -17,6 +17,6 @@ module.exports = class PokeCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *pokes* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *pokes* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/punch.js b/commands/roleplay/punch.js
index 70dda67e..075fb2c9 100644
--- a/commands/roleplay/punch.js
+++ b/commands/roleplay/punch.js
@@ -17,6 +17,6 @@ module.exports = class PunchCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *punches* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *punches* ${thingToRoleplay}`);
     }
 };
diff --git a/commands/roleplay/slap.js b/commands/roleplay/slap.js
index 490fa332..9528aa8d 100644
--- a/commands/roleplay/slap.js
+++ b/commands/roleplay/slap.js
@@ -17,6 +17,6 @@ module.exports = class SlapCommand extends commando.Command {
         }
         console.log(`[Command] ${message.content}`);
         let thingToRoleplay = message.content.split(" ").slice(1).join(" ");
-        message.channel.send(`${message.author} *slaps* ${thingToRoleplay}`);
+        return message.channel.send(`${message.author} *slaps* ${thingToRoleplay}`);
     }
 };