diff --git a/src/org/mcteam/factions/Conf.java b/src/org/mcteam/factions/Conf.java
index ba0965a7..494a40bb 100644
--- a/src/org/mcteam/factions/Conf.java
+++ b/src/org/mcteam/factions/Conf.java
@@ -90,12 +90,12 @@ public class Conf {
 	public static boolean wildernessBlockTNT = false;
 	public static boolean wildernessPowerLoss = true;
 	
-	public static Set<Material> territoryProtectedMaterials = new HashSet<Material>();
-	public static Set<Material> territoryDenyUseageMaterials = new HashSet<Material>();
-	public static Set<Material> territoryProtectedMaterialsWhenOffline = new HashSet<Material>();
-	public static Set<Material> territoryDenyUseageMaterialsWhenOffline = new HashSet<Material>();
+	public static Set<Material> territoryProtectedMaterials = EnumSet.noneOf(Material.class);
+	public static Set<Material> territoryDenyUseageMaterials = EnumSet.noneOf(Material.class);
+	public static Set<Material> territoryProtectedMaterialsWhenOffline = EnumSet.noneOf(Material.class);
+	public static Set<Material> territoryDenyUseageMaterialsWhenOffline = EnumSet.noneOf(Material.class);
 	
-	public static transient Set<CreatureType> safeZoneNerfedCreatureTypes = new HashSet<CreatureType>();
+	public static transient Set<CreatureType> safeZoneNerfedCreatureTypes = EnumSet.noneOf(CreatureType.class);
 	
 	public static Set<String> worldsNoClaiming = new HashSet<String>();
 	public static Set<String> worldsNoPowerLoss = new HashSet<String>();
diff --git a/src/org/mcteam/factions/util/TextUtil.java b/src/org/mcteam/factions/util/TextUtil.java
index 0f8885e6..20c60ee5 100644
--- a/src/org/mcteam/factions/util/TextUtil.java
+++ b/src/org/mcteam/factions/util/TextUtil.java
@@ -60,7 +60,7 @@ public class TextUtil {
 	}
 	
 	/// TODO create tag whitelist!!
-	public  static ArrayList<String> substanceChars = new ArrayList<String>(Arrays.asList(new String []{
+	public  static HashSet<String> substanceChars = new HashSet<String>(Arrays.asList(new String []{
 			"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", 
 			"I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", 
 			"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r",