diff --git a/Bugs Found.md b/Bugs Found.md
index 1725fa08..9d3bc64b 100644
--- a/Bugs Found.md	
+++ b/Bugs Found.md	
@@ -7,7 +7,6 @@ Inventory systems(cost, blacklisted items, view controlling, and access lists sh
 
 Bugs Found
 ----------
-- NPE - InteractionListener:406
 - Command help takes up too much screen space
 - /tne create not found
 - /tne purge doesn't reflect on reload
diff --git a/plugin.yml b/plugin.yml
index 75276b49..5525e97e 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -21,8 +21,6 @@ commands:
       description: The base command for all credit-related commands.
    pin:
       description: The base command for all pin-related commands.
-   shop:
-      description: The base command for all shop-related commands.
    theneweconomy:
       description: The base command for all The New Economy core commands.
       aliases: tne
diff --git a/src/Release Notes.md b/src/Release Notes.md
index bc10ee35..fd72ae24 100644
--- a/src/Release Notes.md	
+++ b/src/Release Notes.md	
@@ -53,10 +53,8 @@ Needs Tested:
 * Inventory & Command Credits
 * Shops
 * Administrative commands
-* Rewards for above completed features
 * Disabling UUID support
 * Shared economy data for worlds
-* Bank balances for transactions
 * Ability to create accounts via command
 
 
diff --git a/src/com/github/tnerevival/TNE.java b/src/com/github/tnerevival/TNE.java
index 3699fd30..097e59ce 100644
--- a/src/com/github/tnerevival/TNE.java
+++ b/src/com/github/tnerevival/TNE.java
@@ -42,7 +42,7 @@ public class TNE extends JavaPlugin {
 	public TNEAPI api = null;
 	
 	public SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss.S");
-	public static final boolean debugMode = true;
+	public static final boolean debugMode = false;
 	
 	// Files & Custom Configuration Files
 	public File mobs;
diff --git a/src/com/github/tnerevival/core/signs/ShopSign.java b/src/com/github/tnerevival/core/signs/ShopSign.java
index a90b4da7..0bead2dd 100644
--- a/src/com/github/tnerevival/core/signs/ShopSign.java
+++ b/src/com/github/tnerevival/core/signs/ShopSign.java
@@ -3,7 +3,7 @@
 import com.github.tnerevival.TNE;
 import com.github.tnerevival.core.shops.Shop;
 import com.github.tnerevival.core.shops.ShopEntry;
-import com.github.tnerevival.utils.MISCUtils;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 
@@ -16,7 +16,6 @@ public class ShopSign extends TNESign {
 	
 	public ShopSign(UUID owner) {
 		super(owner);
-		this.title = MISCUtils.getPlayer(owner).getDisplayName() + "'s Shop";
 		setType(SignType.SHOP);
 	}
 
@@ -42,7 +41,8 @@ public String getName() {
 
 	public void setName(String name) {
 		if(TNE.instance.manager.shops.containsKey(name)) {
-		  this.shop = TNE.instance.manager.shops.get(name);
+		  this.title = ChatColor.GOLD + "[Shop]" + ChatColor.WHITE + name;
+      this.shop = TNE.instance.manager.shops.get(name);
     }
 	}
 
diff --git a/src/com/github/tnerevival/core/version/Alpha3_0.java b/src/com/github/tnerevival/core/version/Alpha3_0.java
index 318f5a53..c2b6eb05 100644
--- a/src/com/github/tnerevival/core/version/Alpha3_0.java
+++ b/src/com/github/tnerevival/core/version/Alpha3_0.java
@@ -270,6 +270,9 @@ public void saveFlat(File file) {
       info.addData("type", sign.getType().getName());
       info.addData("extra", sign.getMeta());
       info.addData("location", sign.getLocation().toString());
+      a.addEntry(info);
+
+      signs.addArticle(sign.getLocation().toString(), a);
     }
 
     try {
diff --git a/src/com/github/tnerevival/listeners/InteractionListener.java b/src/com/github/tnerevival/listeners/InteractionListener.java
index 748f3f33..34722529 100644
--- a/src/com/github/tnerevival/listeners/InteractionListener.java
+++ b/src/com/github/tnerevival/listeners/InteractionListener.java
@@ -244,7 +244,7 @@ public void onEnchant(EnchantItemEvent event) {
 				return;
 			}
 			
-			List<String> lore = new ArrayList<String>();
+			List<String> lore = new ArrayList<>();
 			lore.add(ChatColor.WHITE + "Enchanting Cost: " + ChatColor.GOLD + cost);
 			
 			ItemMeta meta = result.getItemMeta();
@@ -273,7 +273,7 @@ public void onPreCraft(PrepareItemCraftEvent event) {
 				return;
 			}
 			
-			List<String> lore = new ArrayList<String>();
+			List<String> lore = new ArrayList<>();
 			lore.add(ChatColor.WHITE + "Crafting Cost: " + ChatColor.GOLD + cost);
 			
 			ItemStack result = event.getInventory().getResult();