8 files changed, 35 insertions, 20 deletions
diff --git a/commands/Fun/getcredits.js b/commands/Fun/getcredits.js
index 1d8b79b..66ba282 100644
--- a/commands/Fun/getcredits.js
+++ b/commands/Fun/getcredits.js
@@ -6,21 +6,22 @@
  *   Licensed under the Open Software License version 3.0
  *
  * *************************************/
-const commandCooldown = new Set();
+const cooldown = new Set();
 
 exports.run = (bot, msg) => {
-  if (commandCooldown.has(msg.author.id)) return msg.reply('You have claimed credits too recently');
+  if (cooldown.has(msg.author.id)) return msg.reply('You have claimed credits too recently');
 
   if (bot.dbl.hasVoted(msg.author.id)) {
     bot.plugins.economy.add(msg.author.id, 100);
-    return msg.reply('Since you upvoted the bot, here is 100 credits.');
+    msg.reply('Since you upvoted the bot, here is 100 credits.');
   }
-  bot.plugins.economy.add(msg.author.id, 25);
-  msg.reply('Added 25 credits.');
-
-  commandCooldown.add(msg.author.id);
+  else {
+    bot.plugins.economy.add(msg.author.id, 25);
+    msg.reply('Added 25 credits.');
+  }
+  cooldown.add(msg.author.id);
   setTimeout(() => {
-    commandCooldown.delete(msg.author.id);
+    cooldown.delete(msg.author.id);
   }, 3600000);
 };
 
diff --git a/commands/Moderation/ban.js b/commands/Moderation/ban.js
index 545618c..b9ffa4d 100644
--- a/commands/Moderation/ban.js
+++ b/commands/Moderation/ban.js
@@ -12,12 +12,16 @@ exports.run = async (bot, msg, args) => {
   if (!msg.guild.member(bot.user).hasPermission('BAN_MEMBERS')) return msg.reply('I don\'t have permission to ban members.');
 
   const member = msg.mentions.members.first();
-  if (!member) return await msg.reply('Who am I gonna ban?');
+  if (!member) return await msg.reply('Who am I gonna ban? (Remember to @mention them)');
   const reason = args.join(' ').slice(3 + member.user.id.length);
 
   await member.ban({ days: 7, reason: msg.author.tag + (reason ? ': ' + reason : '') })
-    .catch(err => { msg.reply('There was an error.'); console.error(err.stack);});
-  msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+    .catch(err => {
+      msg.reply('There was an error.'); return console.error(err.stack);
+    })
+    .then(() => {
+      msg.channel.send(`Alright, I banned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+    });
 
   const { RichEmbed } = require('discord.js');
   try {
diff --git a/commands/Moderation/interrogate.js b/commands/Moderation/interrogate.js
index a8fc250..821c93a 100644
--- a/commands/Moderation/interrogate.js
+++ b/commands/Moderation/interrogate.js
@@ -14,7 +14,7 @@ exports.run = async (bot, msg) => {
   if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot interrogate anyone.');
 
   const member = msg.mentions.members.first();
-  if (!member) return await msg.reply('Who do I interrogate?');
+  if (!member) return await msg.reply('Who shall I interrogate? (Remember to @mention them)');
 
   member.addRole(msg.guild.roles.find('name', 'Interrogation'));
 
diff --git a/commands/Moderation/jail.js b/commands/Moderation/jail.js
index 3388663..2dc50cf 100644
--- a/commands/Moderation/jail.js
+++ b/commands/Moderation/jail.js
@@ -14,7 +14,7 @@ exports.run = async (bot, msg) => {
   if (!msg.guild.member(bot.user).hasPermission('MANAGE_ROLES')) return msg.reply('I cannot put anyone in jail.');
 
   const member = msg.mentions.members.first();
-  if (!member) return await msg.reply('Who do I put in jail?');
+  if (!member) return await msg.reply('Who do I put in jail? (Remember to @mention them)');
 
   member.addRole(msg.guild.roles.find('name', 'Jail'));
 
diff --git a/commands/Moderation/kick.js b/commands/Moderation/kick.js
index 3a8c597..174e867 100644
--- a/commands/Moderation/kick.js
+++ b/commands/Moderation/kick.js
@@ -12,7 +12,7 @@ exports.run = async (bot, msg, args) => {
   if (!msg.guild.member(bot.user).hasPermission('KICK_MEMBERS')) return msg.reply('I don\'t have permission to kick members.');
 
   const member = msg.mentions.members.first();
-  if (!member) return await msg.reply('Who am I gonna kick?');
+  if (!member) return await msg.reply('Who am I gonna kick? (Remember to @mention them)');
   const reason = args.join(' ').slice(3 + member.user.id.length);
 
   await member.kick(msg.author.tag + ': ' + (reason ? ': ' + reason : ''))
diff --git a/commands/Moderation/lswarns.js b/commands/Moderation/lswarns.js
index 0a165b3..732184d 100644
--- a/commands/Moderation/lswarns.js
+++ b/commands/Moderation/lswarns.js
@@ -12,11 +12,11 @@ exports.run = async (bot, msg) => {
   const { RichEmbed } = require('discord.js');
 
   const warns = await db.fetch(`warns_${msg.guild.id}_${msg.author.id}`);
-  if (!warns) return await msg.reply('Yay! You have no warns.');
+  if (!warns) return await msg.reply('You don\'t have any warnings in this server.');
   const embed = new RichEmbed()
     .setTitle('Warns');
   for (let i = 0; i < warns.count; i++) {
-    embed.addField('Warning #' + i+1, warns.reasons[i]);
+    embed.addField('Warning #' + i + 1, warns.reasons[i]);
   }
   msg.channel.send({ embed });
 };
diff --git a/commands/Moderation/softban.js b/commands/Moderation/softban.js
index a97f8a6..dd5b4a9 100644
--- a/commands/Moderation/softban.js
+++ b/commands/Moderation/softban.js
@@ -16,9 +16,19 @@ exports.run = async (bot, msg, args) => {
   const reason = args.join(' ').slice(3 + member.user.id.length);
 
   await member.ban({ days: 7, reason: msg.author.tag + ': ' + (reason ? reason : '') })
-    .catch(err => { msg.reply('There was an error.'); console.error(err.stack);});
-  await msg.guild.unban(member.user.id).catch(msg.reply('There was an error.'));
-  msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+    .catch(err => {
+      msg.reply('There was an error.');
+      return console.error(err.stack);
+    })
+    .then(() => {
+      msg.channel.send(`Alright, I softbanned **${member.user.tag}**${(reason ? ` for the reason **${reason}**.` : '.')}`);
+    });
+  await msg.guild.unban(member.user.id)
+    .catch(err => {
+      msg.reply('There was an error.');
+      return console.error(err.stack);
+    });
+
   const { RichEmbed } = require('discord.js');
   try {
     const embed = new RichEmbed()
diff --git a/commands/Owners Only/modifycredits.js b/commands/Owners Only/modifycredits.js
index 6401d85..050d74d 100644
--- a/commands/Owners Only/modifycredits.js
+++ b/commands/Owners Only/modifycredits.js
@@ -17,7 +17,7 @@ exports.run = async (bot, msg) => {
     user = msg.mentions.users.first();
   }
 
-  var oldbal = bot.plugins.economy.get(user.id);
+  const oldbal = bot.plugins.economy.get(user.id);
 
   bot.plugins.economy.subtract(user.id, oldbal);