7 files changed, 11 insertions, 11 deletions
diff --git a/commands/Pokemon/claim.js b/commands/Pokemon/claim.js
index e76c2a7..506ca0f 100644
--- a/commands/Pokemon/claim.js
+++ b/commands/Pokemon/claim.js
@@ -9,7 +9,7 @@
 
 exports.run = async (bot, msg) => {
   const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
-  if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
+  if (!isWhitelist) return msg.reply ('This command is still in testing. Only whitelisted servers can use this command. Sorry!');
 
   if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
 
diff --git a/commands/Pokemon/drop.js b/commands/Pokemon/drop.js
index 3b2bf97..555213e 100644
--- a/commands/Pokemon/drop.js
+++ b/commands/Pokemon/drop.js
@@ -9,7 +9,7 @@
 
 exports.run = async (bot, msg) => {
   const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
-  if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
+  if (!isWhitelist) return msg.reply ('This command is still in testing. Only whitelisted servers can use this command. Sorry!');
   if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
   if (msg.channel.topic == 'Current Owner: *none*') {
     msg.reply('There is no owner for this gym. Claim it now with p:claim!');
diff --git a/commands/Pokemon/forcedrop.js b/commands/Pokemon/forcedrop.js
index 053bfe8..bc2945d 100644
--- a/commands/Pokemon/forcedrop.js
+++ b/commands/Pokemon/forcedrop.js
@@ -9,7 +9,7 @@
 
 exports.run = async (bot, msg) => {
   const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
-  if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
+  if (!isWhitelist) return msg.reply ('This command is still in testing. Only whitelisted servers can use this command. Sorry!');
 
   if (!msg.member.hasPermission('MANAGE_MESSAGES')) return msg.reply('You don\'t have permission to force drop.');
   if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
diff --git a/commands/Pokemon/join.js b/commands/Pokemon/join.js
index 2187eef..59bc0c7 100644
--- a/commands/Pokemon/join.js
+++ b/commands/Pokemon/join.js
@@ -9,25 +9,25 @@
 
 exports.run = async (bot, msg, args) => {
   const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
-  if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
+  if (!isWhitelist) return msg.reply ('This command is still in testing. Only whitelisted servers can use this command. Sorry!');
 
   if (args.length < 1) return msg.reply('Please choose a team to join');
 
-  const team = findTeam(msg, args[0]);
+  const team = findTeam(msg, args[0].toUpperCase());
   switch (args[0])
   {
-    case 'skull': {
+    case 'SKULL': {
       msg.member.addRole(msg.guild.roles.find('name', 'Skull'));
       msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Skull.`);
       break;
     }
-    case 'flare' : {
+    case 'FLARE' : {
       msg.member.addRole(msg.guild.roles.find('name', 'Flare'));
       msg.reply(`Alright, ${team ? 'you have left team ' + team + ' and ' : 'you have '}joined team Flare.`);
       break;
     }
     default : {
-      msg.reply('You have to pick skull, or flare.');
+      msg.reply('You have to pick a team (skull, flare.)');
       break;
     }
   }
diff --git a/commands/Pokemon/leave.js b/commands/Pokemon/leave.js
index 813debe..397cecb 100644
--- a/commands/Pokemon/leave.js
+++ b/commands/Pokemon/leave.js
@@ -9,7 +9,7 @@
 
 exports.run = async (bot, msg) => {
   const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
-  if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
+  if (!isWhitelist) return msg.reply ('This command is still in testing. Only whitelisted servers can use this command. Sorry!');
 
   if (msg.member.roles.find('name', 'Skull')) {
     msg.member.removeRole(msg.guild.roles.find('name', 'Skull'));
diff --git a/commands/Pokemon/lsitem.js b/commands/Pokemon/lsitem.js
index dd628ae..6956ef2 100644
--- a/commands/Pokemon/lsitem.js
+++ b/commands/Pokemon/lsitem.js
@@ -8,7 +8,7 @@
  * *************************************/
 
 exports.run = async (bot, msg, args) => {
-  if (msg.guild.id != '417088992329334792') return msg.reply ('This is a PokeWorld exclusive command. Sorry!');
+  if (msg.guild.id != '417088992329334792') return msg.reply ('This command is still in early testing, so it is only available within Pokeworld.');
 
   const { RichEmbed } = require('discord.js');
   const data = args.join(' ').split('|');
diff --git a/commands/Pokemon/tradegym.js b/commands/Pokemon/tradegym.js
index e195b62..5d981be 100644
--- a/commands/Pokemon/tradegym.js
+++ b/commands/Pokemon/tradegym.js
@@ -9,7 +9,7 @@
 
 exports.run = async (bot, msg) => {
   const isWhitelist = await bot.plugins.whitelist.isWhitelist(msg.guild.id);
-  if (!isWhitelist) return msg.reply ('This is a Whiltelisted command. Only whitelisted servers can use this command. Sorry!');
+  if (!isWhitelist) return msg.reply ('This command is still in testing. Only whitelisted servers can use this command. Sorry!');
 
   if (!msg.channel.name.startsWith('gym-')) return msg.reply('Go into one of the gym channels and try again.');
   let team;