diff --git a/src/com/massivecraft/factions/ConfServer.java b/src/com/massivecraft/factions/ConfServer.java
index 53570fb2..c5aab9df 100644
--- a/src/com/massivecraft/factions/ConfServer.java
+++ b/src/com/massivecraft/factions/ConfServer.java
@@ -265,8 +265,6 @@ public class ConfServer extends SimpleConfig
 	// TODO: A better solution Would be to have One wilderness faction per world.
 	//public static Set<String> worldsNoWildernessProtection = new LinkedHashSet<String>();
 	
-
-	
 	static
 	{
 		factionFlagDefaults = new LinkedHashMap<FFlag, Boolean>();
diff --git a/src/com/massivecraft/factions/MainListener.java b/src/com/massivecraft/factions/MainListener.java
index f820613a..cfa44687 100644
--- a/src/com/massivecraft/factions/MainListener.java
+++ b/src/com/massivecraft/factions/MainListener.java
@@ -40,6 +40,8 @@ public class MainListener implements Listener
 	// -------------------------------------------- //
 	// TODO: These spout related methods should not be in here.
 	// The spout integration needs to be moved elsewhere.
+	// NOTE: Also the spout integration should not have method calls from within FactionsCore code,
+	// we should instead listen to FactionsCore events. And send client updates upon non-cancelled monitor.
 	
 	// Setup
 	
diff --git a/src/com/massivecraft/factions/cmd/CapeCommand.java b/src/com/massivecraft/factions/cmd/CmdCapeAbstract.java
similarity index 93%
rename from src/com/massivecraft/factions/cmd/CapeCommand.java
rename to src/com/massivecraft/factions/cmd/CmdCapeAbstract.java
index 8597ecfe..2135bcf9 100644
--- a/src/com/massivecraft/factions/cmd/CapeCommand.java
+++ b/src/com/massivecraft/factions/cmd/CmdCapeAbstract.java
@@ -7,12 +7,12 @@ import org.bukkit.command.CommandSender;
 import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 
-public abstract class CapeCommand extends FCommand
+public abstract class CmdCapeAbstract extends FCommand
 {
 	public Faction capeFaction;
 	public String currentCape;
 	
-	public CapeCommand()
+	public CmdCapeAbstract()
 	{
 		this.optionalArgs.put("faction", "your");
 		
diff --git a/src/com/massivecraft/factions/cmd/CmdCapeGet.java b/src/com/massivecraft/factions/cmd/CmdCapeGet.java
index f129c1a0..1bf2f650 100644
--- a/src/com/massivecraft/factions/cmd/CmdCapeGet.java
+++ b/src/com/massivecraft/factions/cmd/CmdCapeGet.java
@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
 
-public class CmdCapeGet extends CapeCommand
+public class CmdCapeGet extends CmdCapeAbstract
 {
 	public CmdCapeGet()
 	{
diff --git a/src/com/massivecraft/factions/cmd/CmdCapeRemove.java b/src/com/massivecraft/factions/cmd/CmdCapeRemove.java
index cfbf636e..2c87fb3c 100644
--- a/src/com/massivecraft/factions/cmd/CmdCapeRemove.java
+++ b/src/com/massivecraft/factions/cmd/CmdCapeRemove.java
@@ -4,7 +4,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.RelationUtil;
 
-public class CmdCapeRemove extends CapeCommand
+public class CmdCapeRemove extends CmdCapeAbstract
 {
 	
 	public CmdCapeRemove()
diff --git a/src/com/massivecraft/factions/cmd/CmdCapeSet.java b/src/com/massivecraft/factions/cmd/CmdCapeSet.java
index 18ef801a..5c6ed66a 100644
--- a/src/com/massivecraft/factions/cmd/CmdCapeSet.java
+++ b/src/com/massivecraft/factions/cmd/CmdCapeSet.java
@@ -6,7 +6,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.RelationUtil;
 
-public class CmdCapeSet extends CapeCommand
+public class CmdCapeSet extends CmdCapeAbstract
 {
 	
 	public CmdCapeSet()