diff --git a/src/me/shock/playervaults/Commands.java b/src/me/shock/playervaults/Commands.java
index da01834..97ce798 100644
--- a/src/me/shock/playervaults/Commands.java
+++ b/src/me/shock/playervaults/Commands.java
@@ -14,7 +14,8 @@ import org.bukkit.entity.Player;
 public class Commands implements CommandExecutor
 {
 
-	VaultManager vm = new VaultManager();
+	private Main plugin;
+	VaultManager vm = new VaultManager(plugin);
 	String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
 			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
 
@@ -23,7 +24,7 @@ public class Commands implements CommandExecutor
 
 	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)
 	{
-		if (cmd.getName().equalsIgnoreCase("vault"))
+		if (cmd.getName().equalsIgnoreCase("pv"))
 		{
 			if (!(sender instanceof Player))
 			{
diff --git a/src/me/shock/playervaults/Listeners.java b/src/me/shock/playervaults/Listeners.java
index 0965925..88bc9d9 100644
--- a/src/me/shock/playervaults/Listeners.java
+++ b/src/me/shock/playervaults/Listeners.java
@@ -31,7 +31,7 @@ public class Listeners implements Listener
 	{
 		this.plugin = instance;
 	}
-	VaultManager vm = new VaultManager();
+	VaultManager vm = new VaultManager(plugin);
 	Commands commands = new Commands();
 
 
@@ -54,7 +54,7 @@ public class Listeners implements Listener
 	public void onJoin(PlayerJoinEvent event)
 	{
 		Player player = event.getPlayer();
-		plugin.playerVaultFile(player);
+		plugin.playerVaultFile(player.getName());
 		if(player.isOp() && Main.update)
 		{
 			player.sendMessage(ChatColor.GREEN + "Version " + Main.name + " of PlayerVaults is up for download!");
diff --git a/src/me/shock/playervaults/Main.java b/src/me/shock/playervaults/Main.java
index 76d9272..10768ce 100644
--- a/src/me/shock/playervaults/Main.java
+++ b/src/me/shock/playervaults/Main.java
@@ -15,7 +15,6 @@ import me.shock.playervaults.util.Updater;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.craftbukkit.libs.jline.internal.Log;
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -141,12 +140,12 @@ public class Main extends JavaPlugin {
 		return lang;
 	}
 	
-	public YamlConfiguration playerVaultFile(Player player) {
+	public YamlConfiguration playerVaultFile(String player) {
 		File folder = new File(getDataFolder() + File.separator + "vaults");
 		if(!folder.exists()) {
 			folder.mkdir();
 		}
-		File file = new File(getDataFolder() + File.separator + "vaults" + File.separator + player.getName().toLowerCase() + ".yml");
+		File file = new File(getDataFolder() + File.separator + "vaults" + File.separator + player.toLowerCase() + ".yml");
 		if(!file.exists()) {
 			try {
 				file.createNewFile();
diff --git a/src/me/shock/playervaults/util/VaultManager.java b/src/me/shock/playervaults/util/VaultManager.java
index 067d232..a15e9fd 100644
--- a/src/me/shock/playervaults/util/VaultManager.java
+++ b/src/me/shock/playervaults/util/VaultManager.java
@@ -17,7 +17,10 @@ import org.bukkit.inventory.Inventory;
 public class VaultManager 
 {
 
-	private Main plugin;
+	public Main plugin;
+	public VaultManager(Main instance) {
+		this.plugin = instance;
+	}
 	String title;
 
 	/**
@@ -33,7 +36,7 @@ public class VaultManager
 		{
 			// Get the player's file and serialize the inventory.
 			String ser = Serialization.toBase64(inv);
-			YamlConfiguration file = plugin.playerVaultFile(player);
+			YamlConfiguration file = plugin.playerVaultFile(player.getName());
 
 			// Prepare to save D:
 			file.set("vault" + number + "", ser);
@@ -52,24 +55,13 @@ public class VaultManager
 	 */
 	public void loadVault(CommandSender sender, String target, int number)
 	{
-		String name = target.toLowerCase();
-		File file = new File(plugin.getDataFolder() + File.separator + "vaults" + name + ".yml");
-		FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file);
-		if(file.exists())
-		{
-			String data = playerFile.getString("vault" + "" + number + "");
-			Inventory inv = Serialization.fromBase64(data);
-			Player player = (Player) sender;
-			player.openInventory(inv);
-			player.sendMessage(title + " Opening " + ChatColor.GREEN + " " + number);
-			return;
-
-		}
-		else
-		{
-			sender.sendMessage(title + " That doesn't exist!");
-			return;
-		}
+		YamlConfiguration playerFile = plugin.playerVaultFile(target);
+		String data = playerFile.getString("vault" + "" + number + "");
+		Inventory inv = Serialization.fromBase64(data);
+		Player player = (Player) sender;
+		player.openInventory(inv);
+		player.sendMessage(title + " Opening " + ChatColor.GREEN + " " + number);
+		return;
 
 	}