diff --git a/lib/Gringotts.jar b/lib/Gringotts.jar
index e0c9f97..f18e3a7 100644
Binary files a/lib/Gringotts.jar and b/lib/Gringotts.jar differ
diff --git a/lib/Starburst.jar b/lib/Starburst.jar
old mode 100755
new mode 100644
diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java
index d640410..5810bab 100644
--- a/src/net/milkbowl/vault/Vault.java
+++ b/src/net/milkbowl/vault/Vault.java
@@ -219,6 +219,9 @@ public class Vault extends JavaPlugin {
         // Try to load CurrencyCore
         hookEconomy("CurrencyCore", Economy_CurrencyCore.class, ServicePriority.Normal, "is.currency.Currency");
 
+        // Try to load Gringotts
+        hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "org.gestern.gringotts.Gringotts");
+        
         // Try to load Essentials Economy
         hookEconomy("Essentials Economy", Economy_Essentials.class, ServicePriority.Low, "com.earth2me.essentials.api.Economy", "com.earth2me.essentials.api.NoLoanPermittedException",  "com.earth2me.essentials.api.UserDoesNotExistException");
 
@@ -237,8 +240,7 @@ public class Vault extends JavaPlugin {
         // Try to load GoldIsMoney
         hookEconomy("GoldIsMoney", Economy_GoldIsMoney.class, ServicePriority.Normal, "com.flobi.GoldIsMoney.GoldIsMoney");
         
-        // Try to load Gringotts
-        hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "net.mcw.gringotts.Gringotts");
+        
     }
 
     /**
diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
index 2b85ddd..26c3bee 100644
--- a/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
+++ b/src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
@@ -19,9 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import net.mcw.gringotts.Account;
-import net.mcw.gringotts.Gringotts;
-import net.mcw.gringotts.PlayerAccountHolder;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
@@ -33,6 +30,9 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.server.PluginDisableEvent;
 import org.bukkit.event.server.PluginEnableEvent;
 import org.bukkit.plugin.Plugin;
+import org.gestern.gringotts.Account;
+import org.gestern.gringotts.Gringotts;
+import org.gestern.gringotts.PlayerAccountHolder;
 
 public class Economy_Gringotts implements Economy {
 
@@ -141,7 +141,7 @@ public class Economy_Gringotts implements Economy {
      * @return name of the currency (plural)
      */
     public String currencyNamePlural(){
-    	return "";
+    	return org.gestern.gringotts.Configuration.config.currencyNamePlural;
     }
 
 
@@ -152,7 +152,7 @@ public class Economy_Gringotts implements Economy {
      * @return name of the currency (singular)
      */
     public String currencyNameSingular(){
-    	return "";
+    	return org.gestern.gringotts.Configuration.config.currencyNameSingular;
     }
 
     /**
@@ -215,9 +215,8 @@ public class Economy_Gringotts implements Economy {
         
         Account account = gringotts.accounting.getAccount( accountHolder );
         
-        if(account.balance() >= amount) {
+        if(account.balance() >= amount && account.remove(amount)) {
             //We has mulah!
-            account.remove(amount);
             return new EconomyResponse(amount, account.balance(), ResponseType.SUCCESS, null);
         } else {
             //Not enough money to withdraw this much.
@@ -244,7 +243,7 @@ public class Economy_Gringotts implements Economy {
         if (account.add(amount))        
         	return new EconomyResponse( amount, account.balance(), ResponseType.SUCCESS, null);
         else
-        	return new EconomyResponse( 0, account.balance(), ResponseType.FAILURE, "Not enough capacity to store that many funds!");
+        	return new EconomyResponse( 0, account.balance(), ResponseType.FAILURE, "Not enough capacity to store that amount!");
         
     }