diff --git a/TFGuilds.iml b/TFGuilds.iml
index 1d1114b..3a8dfbd 100644
--- a/TFGuilds.iml
+++ b/TFGuilds.iml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/AddModSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/AddModSubcommand.java
index fd9d967..40282de 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/AddModSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/AddModSubcommand.java
@@ -18,7 +18,8 @@ public class AddModSubcommand extends Common implements CommandExecutor
     {
         if (args.length == 1 || args.length > 3)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g addmod <guild <player> | player>"));
+            return true;
         }
 
         if (args.length == 3)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/CreateRankSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/CreateRankSubcommand.java
index 9d6519c..c1f0bc5 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/CreateRankSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/CreateRankSubcommand.java
@@ -24,7 +24,8 @@ public class CreateRankSubcommand extends Common implements CommandExecutor
 
         if (args.length < 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g createrank <name>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java
index 9c1b60f..f0307a9 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java
@@ -28,7 +28,8 @@ public class CreateSubcommand extends Common implements CommandExecutor
 
         if (args.length < 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g create <name>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/DeleteRankSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/DeleteRankSubcommand.java
index b1f0e93..113525d 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/DeleteRankSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/DeleteRankSubcommand.java
@@ -23,7 +23,8 @@ public class DeleteRankSubcommand extends Common implements CommandExecutor
 
         if (args.length < 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g deleterank <rank>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/DisbandSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/DisbandSubcommand.java
index 213637a..ddde390 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/DisbandSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/DisbandSubcommand.java
@@ -20,7 +20,8 @@ public class DisbandSubcommand extends Common implements CommandExecutor
     {
         if (args.length > 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g disband [name]"));
+            return true;
         }
 
         if (args.length == 2)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java b/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
index f61b1ff..c116f54 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
@@ -6,12 +6,10 @@ import java.util.List;
 import me.totalfreedom.tfguilds.Common;
 import me.totalfreedom.tfguilds.guild.Guild;
 import me.totalfreedom.tfguilds.util.GUtil;
-import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
 
 public class GuildCommand extends Common implements CommandExecutor, TabCompleter
 {
@@ -70,12 +68,13 @@ public class GuildCommand extends Common implements CommandExecutor, TabComplete
                     return new RosterSubcommand().onCommand(sender, command, label, args);
                 case "setdefaultrank":
                     return new SetDefaultRankSubcommand().onCommand(sender, command, label, args);
-                /*case "toggletags":
+                case "toggletags":
                     return new ToggleTagsSubcommand().onCommand(sender, command, label, args);
                 case "toggletag":
-                    return new ToggleTagSubcommand().onCommand(sender, command, label, args);*/
+                    return new ToggleTagSubcommand().onCommand(sender, command, label, args);
             }
-            return false;
+            sender.sendMessage(tl(PREFIX + "Unknown command - Run /g help if you need help"));
+            return true;
         }
         return new HelpSubcommand().onCommand(sender, command, label, args);
     }
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
index ab77cbd..f60028b 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
@@ -14,6 +14,7 @@ public class HelpSubcommand extends Common implements CommandExecutor
         sender.sendMessage(tl("%s% - %p%list"));
         sender.sendMessage(tl("%s% - %p%help"));
         sender.sendMessage(tl("%s% - %p%create <name>"));
+        sender.sendMessage(tl("%s% - %p%join <guild>"));
         sender.sendMessage(tl("%s% - %p%disband [name]"));
         sender.sendMessage(tl("%s% - %p%invite <player>"));
         sender.sendMessage(tl("%s% - %p%addmod <guild <player> | player>"));
@@ -34,6 +35,8 @@ public class HelpSubcommand extends Common implements CommandExecutor
         sender.sendMessage(tl("%s% - %p%roster [guild | player]"));
         sender.sendMessage(tl("%s% - %p%setstate <open | invite | closed>"));
         sender.sendMessage(tl("%s% - %p%setdefaultrank <rank | none>"));
+        sender.sendMessage(tl("%s% - %p%toggletags"));
+        sender.sendMessage(tl("%s% - %p%toggletag"));
         return true;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/HomeSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/HomeSubcommand.java
index 7112ada..d0b0e8f 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/HomeSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/HomeSubcommand.java
@@ -16,7 +16,8 @@ public class HomeSubcommand extends Common implements CommandExecutor
     {
         if (args.length > 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g home [set]"));
+            return true;
         }
 
         if (sender instanceof ConsoleCommandSender)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/InviteSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/InviteSubcommand.java
index be169ab..da8ba54 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/InviteSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/InviteSubcommand.java
@@ -26,7 +26,8 @@ public class InviteSubcommand extends Common implements CommandExecutor
 
         if (args.length != 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g invite <player>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/JoinSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/JoinSubcommand.java
index bd6e52e..78508b0 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/JoinSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/JoinSubcommand.java
@@ -25,7 +25,8 @@ public class JoinSubcommand extends Common implements CommandExecutor
 
         if (args.length < 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g join <guild>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/KickSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/KickSubcommand.java
index 7f4fd81..7729b99 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/KickSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/KickSubcommand.java
@@ -18,7 +18,8 @@ public class KickSubcommand extends Common implements CommandExecutor
     {
         if (args.length > 3)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g kick <guild <player> | player>"));
+            return true;
         }
 
         if (args.length == 3)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/LeaveSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/LeaveSubcommand.java
index 812d924..2d1f5cb 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/LeaveSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/LeaveSubcommand.java
@@ -16,7 +16,8 @@ public class LeaveSubcommand extends Common implements CommandExecutor
     {
         if (args.length > 1)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g leave"));
+            return true;
         }
 
         if (sender instanceof ConsoleCommandSender)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/MOTDSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/MOTDSubcommand.java
index 006bd3b..ec88d9c 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/MOTDSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/MOTDSubcommand.java
@@ -18,7 +18,8 @@ public class MOTDSubcommand extends Common implements CommandExecutor
     {
         if (args.length == 1)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g motd <set <motd> | clear>"));
+            return true;
         }
 
         if (sender instanceof ConsoleCommandSender)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/RemoveModSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/RemoveModSubcommand.java
index 975b6b9..27c7326 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/RemoveModSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/RemoveModSubcommand.java
@@ -18,7 +18,8 @@ public class RemoveModSubcommand extends Common implements CommandExecutor
     {
         if (args.length == 1 || args.length > 3)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g removemod <guild <name> | name>>"));
+            return true;
         }
 
         if (args.length == 3)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
index 5c36052..f6c31ee 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
@@ -21,7 +21,8 @@ public class RenameSubcommand extends Common implements CommandExecutor
     {
         if (args.length < 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g rename <name>"));
+            return true;
         }
 
         if (sender instanceof ConsoleCommandSender)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/SetDefaultRankSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/SetDefaultRankSubcommand.java
index b906ebc..87436f0 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/SetDefaultRankSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/SetDefaultRankSubcommand.java
@@ -23,7 +23,8 @@ public class SetDefaultRankSubcommand extends Common implements CommandExecutor
 
         if (args.length == 0)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g setdefaultrank <rank | none>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/SetOwnerSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/SetOwnerSubcommand.java
index 75439fd..0648176 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/SetOwnerSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/SetOwnerSubcommand.java
@@ -18,7 +18,8 @@ public class SetOwnerSubcommand extends Common implements CommandExecutor
     {
         if (args.length == 1 || args.length > 3)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g setowner <guild <player> | player>"));
+            return true;
         }
 
         if (args.length == 3)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/SetRankSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/SetRankSubcommand.java
index 931e116..a38ebc7 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/SetRankSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/SetRankSubcommand.java
@@ -19,7 +19,8 @@ public class SetRankSubcommand extends Common implements CommandExecutor
     {
         if (args.length == 1)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g setrank <player> <rank | none>"));
+            return true;
         }
 
         if (sender instanceof ConsoleCommandSender)
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/SetStateSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/SetStateSubcommand.java
index 4b484ba..42da3cd 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/SetStateSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/SetStateSubcommand.java
@@ -16,6 +16,12 @@ public class SetStateSubcommand extends Common implements CommandExecutor
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
     {
+        if (args.length == 1)
+        {
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g setstate <open | invite | closed>"));
+            return true;
+        }
+
         if (args.length == 3)
         {
             if (!plugin.bridge.isAdmin(sender))
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/TPSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/TPSubcommand.java
index 40ffdb2..b0d7649 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/TPSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/TPSubcommand.java
@@ -23,7 +23,8 @@ public class TPSubcommand extends Common implements CommandExecutor
 
         if (args.length != 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g tp <player>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java
index 4f916b4..ee005e4 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java
@@ -24,7 +24,8 @@ public class TagSubcommand extends Common implements CommandExecutor
 
         if (args.length < 2)
         {
-            return false;
+            sender.sendMessage(tl(PREFIX + "Proper usage: /g tag <set <tag> | clear>"));
+            return true;
         }
 
         Player player = (Player)sender;
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagSubcommand.java
index c4dd91b..8b3990d 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagSubcommand.java
@@ -1,4 +1,4 @@
-/*package me.totalfreedom.tfguilds.command;
+package me.totalfreedom.tfguilds.command;
 
 import me.totalfreedom.tfguilds.Common;
 import me.totalfreedom.tfguilds.guild.Guild;
@@ -42,4 +42,4 @@ public class ToggleTagSubcommand extends Common implements CommandExecutor
         sender.sendMessage(tl(PREFIX + "Enabled personal guild tag."));
         return true;
     }
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagsSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagsSubcommand.java
index 9587eed..16a2982 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagsSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/ToggleTagsSubcommand.java
@@ -1,4 +1,4 @@
-/*package me.totalfreedom.tfguilds.command;
+package me.totalfreedom.tfguilds.command;
 
 import me.totalfreedom.tfguilds.Common;
 import me.totalfreedom.tfguilds.config.ConfigEntry;
@@ -33,4 +33,4 @@ public class ToggleTagsSubcommand extends Common implements CommandExecutor
         }
         return true;
     }
-}*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/tfguilds/listener/ChatListener.java b/src/main/java/me/totalfreedom/tfguilds/listener/ChatListener.java
index c924fcd..b4a433a 100644
--- a/src/main/java/me/totalfreedom/tfguilds/listener/ChatListener.java
+++ b/src/main/java/me/totalfreedom/tfguilds/listener/ChatListener.java
@@ -67,7 +67,10 @@ public class ChatListener implements Listener
 
         if (guild.hasTag())
         {
-            e.setFormat(GUtil.colorize(guild.getTag().replace("%rank%", display)) + ChatColor.RESET + " " + e.getFormat());
+            if (guild.getTag() != null)
+            {
+                e.setFormat(GUtil.colorize(guild.getTag().replace("%rank%", display)) + ChatColor.RESET + " " + e.getFormat());
+            }
         }
 
         if (!ConfigEntry.GUILD_TAGS_ENABLED.getBoolean())
@@ -76,9 +79,14 @@ public class ChatListener implements Listener
             {
                 Guild g = Guild.getGuild(p);
 
-                if (guild.hasTag())
+                if (g.hasTag())
                 {
                     e.setFormat(e.getFormat().substring(g.getTag().length()));
+
+                    if (g.getTag().contains(display))
+                    {
+                        e.setFormat(e.getFormat().substring(display.length()));
+                    }
                 }
             }
         }
@@ -93,6 +101,11 @@ public class ChatListener implements Listener
             if (guild.hasTag())
             {
                 e.setFormat(e.getFormat().substring(guild.getTag().length()));
+
+                if (guild.getTag().contains(display))
+                {
+                    e.setFormat(e.getFormat().substring(display.length()));
+                }
             }
         }
     }