diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java b/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java
index 1705e432..28ddfb0f 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java
@@ -1,19 +1,11 @@
 package com.gamingmesh.jobs.commands.list;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.CMILib.ItemManager.CMIEntityType;
 import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial;
 import com.gamingmesh.jobs.CMILib.ItemReflection;
+import com.gamingmesh.jobs.CMILib.RawMessage;
+import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
+import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.commands.Cmd;
 import com.gamingmesh.jobs.commands.JobCommand;
 import com.gamingmesh.jobs.container.ActionType;
@@ -22,9 +14,16 @@ import com.gamingmesh.jobs.container.Job;
 import com.gamingmesh.jobs.container.JobInfo;
 import com.gamingmesh.jobs.stuff.ChatColor;
 import com.gamingmesh.jobs.stuff.PageInfo;
-import com.gamingmesh.jobs.CMILib.RawMessage;
 import com.gamingmesh.jobs.stuff.Util;
-import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 
 public class editjobs implements Cmd {
 
@@ -485,7 +484,7 @@ public class editjobs implements Cmd {
 			material = CMIMaterial.REDSTONE_ORE;
 		    }
 		    id = material.getId();
-		    type = material.toString();
+		    type = material.getMaterial().toString();
 		} else if (actionT == ActionType.KILL || actionT == ActionType.TAME || actionT == ActionType.BREED || actionT == ActionType.MILK) {
 
 		    // check entities
diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java b/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java
index 5c04621f..0675d610 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java
@@ -401,7 +401,7 @@ public class editquests implements Cmd {
 			    material = CMIMaterial.REDSTONE_ORE;
 			}
 			id = material.getId();
-			type = material.toString();
+			type = material.getMaterial().toString();
 		    } else if (actionT == ActionType.KILL || actionT == ActionType.TAME || actionT == ActionType.BREED || actionT == ActionType.MILK) {
 
 			// check entities
diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
index 06cdcada..bb11bd05 100644
--- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
@@ -18,17 +18,15 @@
 
 package com.gamingmesh.jobs.config;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-
+import com.gamingmesh.jobs.CMILib.CMIEnchantment;
+import com.gamingmesh.jobs.CMILib.ItemManager.CMIEntityType;
+import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial;
+import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
+import com.gamingmesh.jobs.ItemBoostManager;
+import com.gamingmesh.jobs.Jobs;
+import com.gamingmesh.jobs.container.*;
+import com.gamingmesh.jobs.resources.jfep.Parser;
+import com.gamingmesh.jobs.stuff.ChatColor;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -40,27 +38,11 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
-import com.gamingmesh.jobs.ItemBoostManager;
-import com.gamingmesh.jobs.Jobs;
-import com.gamingmesh.jobs.CMILib.CMIEnchantment;
-import com.gamingmesh.jobs.CMILib.ItemManager.CMIEntityType;
-import com.gamingmesh.jobs.CMILib.ItemManager.CMIMaterial;
-import com.gamingmesh.jobs.container.ActionType;
-import com.gamingmesh.jobs.container.BoostMultiplier;
-import com.gamingmesh.jobs.container.CurrencyType;
-import com.gamingmesh.jobs.container.DisplayMethod;
-import com.gamingmesh.jobs.container.Job;
-import com.gamingmesh.jobs.container.JobCommands;
-import com.gamingmesh.jobs.container.JobConditions;
-import com.gamingmesh.jobs.container.JobInfo;
-import com.gamingmesh.jobs.container.JobItems;
-import com.gamingmesh.jobs.container.JobLimitedItems;
-import com.gamingmesh.jobs.container.JobPermission;
-import com.gamingmesh.jobs.container.Quest;
-import com.gamingmesh.jobs.container.QuestObjective;
-import com.gamingmesh.jobs.resources.jfep.Parser;
-import com.gamingmesh.jobs.stuff.ChatColor;
-import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
 
 public class ConfigManager {
 
@@ -303,7 +285,7 @@ public class ConfigManager {
 	    }
 	    // END HACK
 
-	    type = material.toString();
+	    type = material.getMaterial().toString();
 	    id = material.getId();
 	} else if (actionType == ActionType.KILL || actionType == ActionType.TAME || actionType == ActionType.BREED || actionType == ActionType.MILK) {