diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
index b5f83c7..8b93b26 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
@@ -166,7 +166,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 	public static HashMap<String, String> networkPlayers = new HashMap<String, String>();
 	public static ArmorStand cape;
 	public static ItemStack banner;
-	public static boolean capeToggle = true;
+	public static boolean capeToggle = false;
 	private boolean firstRun = true;
 
 	// Vault --------------------------------
diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java
index d241a56..48e1249 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CapeListener.java
@@ -44,7 +44,7 @@ public class CapeListener implements Listener {
 	@EventHandler(priority = EventPriority.LOW)
 	public void onPlayerJoin(PlayerJoinEvent event) {
 		Player p = event.getPlayer();
-		if(!p.getName().equals("Aust1n46")) {
+		if(!p.getName().equals("Aust1n46") || !MineverseChat.capeToggle) {
 			return;
 		}
 		MineverseChat.cape = (ArmorStand) p.getWorld().spawnEntity(p.getLocation(), EntityType.ARMOR_STAND);
diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
index eabfed4..9113d80 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
@@ -490,7 +490,7 @@ public class ChatListener implements Listener {
 			int mutedfor = plugin.getConfig().getConfigurationSection("antispam").getInt("mutetime", 0);
 			
 			int datetime = time/60;
-			if(datetime < spamtime + plugin.getConfig().getConfigurationSection("antispam").getInt("spamtime")) {
+			if(time < spamtime + plugin.getConfig().getConfigurationSection("antispam").getInt("spamtime")) {
 				if(spamcount + 1 >= spamtimeconfig) {
 					mcp.addMute(eventChannel.getName(), datetime + mutedfor);
 					String timedmute = "";