diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
index 1c915e9..edbdc83 100644
--- a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
+++ b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
@@ -4,14 +4,10 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.DungeonGenerator;
@@ -19,190 +15,134 @@ import StevenDimDoors.mod_pocketDim.LinkData;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.helpers.jnbt.ByteArrayTag;
 import StevenDimDoors.mod_pocketDim.helpers.jnbt.CompoundTag;
-import StevenDimDoors.mod_pocketDim.helpers.jnbt.IntTag;
 import StevenDimDoors.mod_pocketDim.helpers.jnbt.ListTag;
 import StevenDimDoors.mod_pocketDim.helpers.jnbt.NBTOutputStream;
 import StevenDimDoors.mod_pocketDim.helpers.jnbt.ShortTag;
-import StevenDimDoors.mod_pocketDim.helpers.jnbt.StringTag;
 import StevenDimDoors.mod_pocketDim.helpers.jnbt.Tag;
 
-/**
-
- * @Return
- */
-
-
-
 public class DungeonHelper
 {
-	
-	public DungeonHelper()
-	{
-		if (properties == null)
-			properties = DDProperties.instance();
-	}
-	
 	private static DDProperties properties = null;
-	
+
 	private Random rand = new Random();
-	
-	public  HashMap<Integer, LinkData> customDungeonStatus = new HashMap<Integer, LinkData>();
 
-	public  ArrayList<DungeonGenerator> customDungeons = new ArrayList<DungeonGenerator>();
-	
-	public  ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>();
-	
-	public  ArrayList<DungeonGenerator> weightedDungeonGenList = new ArrayList<DungeonGenerator>();
+	public HashMap<Integer, LinkData> customDungeonStatus = new HashMap<Integer, LinkData>();
 
-	
-	public  ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> customDungeons = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> registeredDungeons = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> weightedDungeonGenList = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> simpleHalls = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> deadEnds = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> hubs = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> mazes = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> pistonTraps = new ArrayList<DungeonGenerator>();
+	public ArrayList<DungeonGenerator> exits = new ArrayList<DungeonGenerator>();
 
-	
-	public  ArrayList<DungeonGenerator> complexHalls = new ArrayList<DungeonGenerator>();
-
-	
-	public  ArrayList<DungeonGenerator> deadEnds = new ArrayList<DungeonGenerator>();
-
-	
-	public  ArrayList<DungeonGenerator> hubs = new ArrayList<DungeonGenerator>();
-
-	
-	public  ArrayList<DungeonGenerator> mazes = new ArrayList<DungeonGenerator>();
-
-	
-	public  ArrayList<DungeonGenerator> pistonTraps = new ArrayList<DungeonGenerator>();
-
-	
-	public  ArrayList<DungeonGenerator> exits = new ArrayList<DungeonGenerator>();
-	
 	public ArrayList<String> tagList = new ArrayList<String>();
 
+	public ArrayList<Integer> metadataFlipList = new ArrayList<Integer>();
+	public ArrayList<Integer> metadataNextList = new ArrayList<Integer>();
+
+	public DungeonGenerator defaultUp = new DungeonGenerator(0, "/schematic/simpleStairsUp.schematic", true);
 
-	
-	public  ArrayList metadataFlipList = new ArrayList();
-	
-	public  ArrayList metadataNextList = new ArrayList();
-	
-	public  DungeonGenerator defaultUp = new DungeonGenerator(0, "/schematic/simpleStairsUp.schematic", true);
-	
 	public void registerCustomDungeon(File schematicFile)
 	{
 		try
-    	{
-
-		if(schematicFile.getName().contains(".schematic"))
 		{
-			String[] name = schematicFile.getName().split("_");
-			
-			if(name.length<4)
+			if(schematicFile.getName().contains(".schematic"))
 			{
-        		System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
-    			this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
-				System.out.println("Imported "+schematicFile.getName());
+				String[] name = schematicFile.getName().split("_");
 
-        
-			}
-			else if(!(name[2].equals("open")||name[2].equals("closed"))||!this.tagList.contains(name[0]))
-			{
-				System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
-    			this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
-				System.out.println("Imported "+schematicFile.getName());
-				
-			}
-			else
-			{
-				int count=0;
-				
-				boolean open= name[2].equals("open");
-	        	
-				int weight = Integer.parseInt(name[3].replace(".schematic", ""));
-				
-				String path = schematicFile.getAbsolutePath();
-	
-				while(count<weight)
+				if(name.length<4)
 				{
-					if(name[0].equals("hub"))
-					{
-						this.hubs.add(new DungeonGenerator(weight,path,open));
-					}
-					else if(name[0].equals("simpleHall"))
-	        		{
-	        			this.simpleHalls.add(new DungeonGenerator(weight,path,open));
-	
-	        		}
-	        		else if(name[0].equals("complexHall"))
-	        		{
-	        			this.complexHalls.add(new DungeonGenerator(weight,path,open));
-	
-	        		}
-	        		else if(name[0].equals("trap"))
-	        		{
-	        			this.pistonTraps.add(new DungeonGenerator(weight,path,open));
-	
-	        		}
-	        		else if(name[0].equals("deadEnd"))
-	        		{
-	        			this.deadEnds.add(new DungeonGenerator(weight,path,open));
-	
-	        		}
-	        		else if(name[0].equals("exit"))
-	        		{
-	        			this.exits.add(new DungeonGenerator(weight,path,open));
-	
-	        		}
-	        		else if(name[0].equals("maze"))
-	        		{
-	        			this.mazes.add(new DungeonGenerator(weight,path,open));
-	        		
-	        		}
-					count++;
-					this.weightedDungeonGenList.add(new DungeonGenerator(weight,path,open));
+					System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
+					this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
+					System.out.println("Imported "+schematicFile.getName());
+
+
+				}
+				else if(!(name[2].equals("open")||name[2].equals("closed"))||!this.tagList.contains(name[0]))
+				{
+					System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
+					this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
+					System.out.println("Imported "+schematicFile.getName());
+
+				}
+				else
+				{
+					int count=0;
+
+					boolean open= name[2].equals("open");
+
+					int weight = Integer.parseInt(name[3].replace(".schematic", ""));
+
+					String path = schematicFile.getAbsolutePath();
+
+					while(count<weight)
+					{
+						if(name[0].equals("hub"))
+						{
+							this.hubs.add(new DungeonGenerator(weight,path,open));
+						}
+						else if(name[0].equals("simpleHall"))
+						{
+							this.simpleHalls.add(new DungeonGenerator(weight,path,open));
+
+						}
+						else if(name[0].equals("complexHall"))
+						{
+							this.complexHalls.add(new DungeonGenerator(weight,path,open));
+
+						}
+						else if(name[0].equals("trap"))
+						{
+							this.pistonTraps.add(new DungeonGenerator(weight,path,open));
+
+						}
+						else if(name[0].equals("deadEnd"))
+						{
+							this.deadEnds.add(new DungeonGenerator(weight,path,open));
+
+						}
+						else if(name[0].equals("exit"))
+						{
+							this.exits.add(new DungeonGenerator(weight,path,open));
+
+						}
+						else if(name[0].equals("maze"))
+						{
+							this.mazes.add(new DungeonGenerator(weight,path,open));
+
+						}
+						count++;
+						this.weightedDungeonGenList.add(new DungeonGenerator(weight,path,open));
+					}
+					this.registeredDungeons.add(new DungeonGenerator(weight,path,open));
+					System.out.println("Imported "+schematicFile.getName());
 				}
-				
-        	
-				this.registeredDungeons.add(new DungeonGenerator(weight,path,open));
-				System.out.println("Imported "+schematicFile.getName());
 			}
-			
-	
-		
 		}
-		
-		
-		
-		
-    	}
-    	catch(Exception e)
-    	{
-    		e.printStackTrace();
-    		System.out.println("Importing custom dungeon failed");
-    	}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+			System.out.println("Importing custom dungeon failed");
+		}
 	}
-	
+
 	public  void importCustomDungeons(String dir)
 	{
 		File file = new File(dir);
 		File[] schematicNames=file.listFiles();
-        
-        if(schematicNames!=null)
-        {
-        
-        
-        		for(File schematicFile: schematicNames)
-        		{
-        			
-        			this.registerCustomDungeon(schematicFile);
-        			
-        			
-        		}
-        	
-        	
-        	
-        }
-        
+
+		if(schematicNames!=null)
+		{
+			for(File schematicFile: schematicNames)
+			{
+				this.registerCustomDungeon(schematicFile);
+			}
+		}
 	}
-	
-	
 
 	public void registerFlipBlocks()
 	{
@@ -220,10 +160,7 @@ public class DungeonHelper
 		this.metadataFlipList.add(Block.doorWood.blockID);
 		this.metadataFlipList.add(Block.pistonBase.blockID);
 		this.metadataFlipList.add(Block.pistonStickyBase.blockID);
-		
 		this.metadataFlipList.add(Block.pistonExtension.blockID);
-		
-		
 		this.metadataFlipList.add(Block.redstoneComparatorIdle.blockID);
 		this.metadataFlipList.add(Block.redstoneComparatorActive.blockID);
 		this.metadataFlipList.add(Block.signPost.blockID);
@@ -235,18 +172,16 @@ public class DungeonHelper
 		this.metadataFlipList.add(Block.chest.blockID);
 		this.metadataFlipList.add(Block.chestTrapped.blockID);
 		this.metadataFlipList.add(Block.hopperBlock.blockID);
-
 		this.metadataFlipList.add(Block.stairsNetherBrick.blockID);
 		this.metadataFlipList.add(Block.stairsCobblestone.blockID);
 		this.metadataFlipList.add(Block.stairsNetherBrick.blockID);
 		this.metadataFlipList.add(Block.stairsNetherQuartz.blockID);
 		this.metadataFlipList.add(Block.stairsSandStone.blockID);
-
-
+		
 		this.metadataNextList.add(Block.redstoneRepeaterIdle.blockID);
 		this.metadataNextList.add(Block.redstoneRepeaterActive.blockID);
-		
 	}
+	
 	public void registerDungeonTypeTags()
 	{
 		tagList.add("hub");
@@ -257,119 +192,104 @@ public class DungeonHelper
 		tagList.add("deadEnd");
 		tagList.add("maze");
 	}
+	
 	public void registerBaseDungeons()
 	{
-			this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/doorTotemRuins.schematic", true));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/hallwayTrapRooms1.schematic", false));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/longDoorHallway.schematic", false));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/smallRotundaWithExit.schematic", false));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/fortRuins.schematic", true));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
-	 		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/doorTotemRuins.schematic", true));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/hallwayTrapRooms1.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/longDoorHallway.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/smallRotundaWithExit.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/fortRuins.schematic", true));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
+		this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false));
 
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/collapsedSingleTunnel1.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/singleStraightHall1.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallBranchWithExit.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleLeft.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleRight.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsUp.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsDown.schematic", false));
+		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleSmallT1.schematic", false));
 
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/collapsedSingleTunnel1.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/singleStraightHall1.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallBranchWithExit.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleLeft.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleRight.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsUp.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsDown.schematic", false));
-	 		this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleSmallT1.schematic", false));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/tntPuzzleTrap.schematic", false));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/brokenPillarsO.schematic", true));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/buggyTopEntry1.schematic", true));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/exitRuinsWithHiddenDoor.schematic", true));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/hallwayHiddenTreasure.schematic", false));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/mediumPillarStairs.schematic", true));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/ruinsO.schematic", true));
+		this.complexHalls.add(new DungeonGenerator(0, "/schematics/pitStairs.schematic", true));
 
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/azersDungeonO.schematic", false));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/diamondTowerTemple1.schematic", true));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/fallingTrapO.schematic", false));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/hiddenStaircaseO.schematic", true));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/lavaTrapO.schematic", true));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/randomTree.schematic", true));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallHiddenTowerO.schematic", true));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallSilverfishRoom.schematic", false));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/tntTrapO.schematic", false));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallDesert.schematic", true));
+		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallPond.schematic", true));
 
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/tntPuzzleTrap.schematic", false));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/brokenPillarsO.schematic", true));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/buggyTopEntry1.schematic", true));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/exitRuinsWithHiddenDoor.schematic", true));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/hallwayHiddenTreasure.schematic", false));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/mediumPillarStairs.schematic", true));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/ruinsO.schematic", true));
-	 		this.complexHalls.add(new DungeonGenerator(0, "/schematics/pitStairs.schematic", true));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fakeTNTTrap.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFallRuins.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonSmasherHall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/simpleDropHall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fallingTNThall.schematic", false));
+		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/lavaPyramid.schematic", true));
 
-	 		
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/azersDungeonO.schematic", false));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/diamondTowerTemple1.schematic", true));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/fallingTrapO.schematic", false));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/hiddenStaircaseO.schematic", true));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/lavaTrapO.schematic", true));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/randomTree.schematic", true));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallHiddenTowerO.schematic", true));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallSilverfishRoom.schematic", false));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/tntTrapO.schematic", false));
-			this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallDesert.schematic", true));
-	 		this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallPond.schematic", true));
-	 		
-	 		
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fakeTNTTrap.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFallRuins.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false));
-	 //		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonHallway.schematic", null));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonSmasherHall.schematic", false));
-	 	//	this.pistonTraps.add(new DungeonGenerator(0, "/schematics/raceTheTNTHall.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/simpleDropHall.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fallingTNThall.schematic", false));
-	 		this.pistonTraps.add(new DungeonGenerator(0, "/schematics/lavaPyramid.schematic", true));
+		this.mazes.add(new DungeonGenerator(0, "/schematics/smallMaze1.schematic", false));
+		this.mazes.add(new DungeonGenerator(0, "/schematics/smallMultilevelMaze.schematic", false));
 
-	 	
+		this.exits.add(new DungeonGenerator(0, "/schematics/exitCube.schematic", true));
+		this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
+		this.exits.add(new DungeonGenerator(0, "/schematics/smallExitPrison.schematic", true));
+		this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
 
-	 		this.mazes.add(new DungeonGenerator(0, "/schematics/smallMaze1.schematic", false));
-	 		this.mazes.add(new DungeonGenerator(0, "/schematics/smallMultilevelMaze.schematic", false));
-	 	
+		this.weightedDungeonGenList.addAll(this.simpleHalls);
+		this.weightedDungeonGenList.addAll(this.exits);
+		this.weightedDungeonGenList.addAll(this.pistonTraps);
+		this.weightedDungeonGenList.addAll(this.mazes);
+		this.weightedDungeonGenList.addAll(this.deadEnds);
+		this.weightedDungeonGenList.addAll(this.complexHalls);
+		this.weightedDungeonGenList.addAll(this.hubs);
 
-	 		this.exits.add(new DungeonGenerator(0, "/schematics/exitCube.schematic", true));
-	 		this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
-	 		this.exits.add(new DungeonGenerator(0, "/schematics/smallExitPrison.schematic", true));
-	 		this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false));
-
-	 		
-	 		
-	 		
-
-	 		this.weightedDungeonGenList.addAll(this.simpleHalls);
-	 	 	this.weightedDungeonGenList.addAll(this.exits);
-	 		this.weightedDungeonGenList.addAll(this.pistonTraps);
-	 		this.weightedDungeonGenList.addAll(this.mazes);
-	 		this.weightedDungeonGenList.addAll(this.deadEnds);
-	 		this.weightedDungeonGenList.addAll(this.complexHalls);
-	 		this.weightedDungeonGenList.addAll(this.hubs);
-	 		
-	 		for(DungeonGenerator data : this.weightedDungeonGenList)
-	 		{
-	 			if(!this.registeredDungeons.contains(data))
-	 			{
-	 				this.registeredDungeons.add(data);
-	 		
-	 			}
-	 		}
-	 		
+		for(DungeonGenerator data : this.weightedDungeonGenList)
+		{
+			if(!this.registeredDungeons.contains(data))
+			{
+				this.registeredDungeons.add(data);
+			}
+		}
 	}
-	
+
 	public  DungeonGenerator exportDungeon(World world, int xI, int yI, int zI, String file)
 	{
-		
 		int xMin;
 		int yMin;
 		int zMin;
-		
+
 		int xMax;
 		int yMax;
 		int zMax;
-		
+
 		xMin=xMax=xI;
 		yMin=yMax=yI;
 		zMin=zMax=zI;
-		
+
 		for(int count=0;count<50;count++)
 		{
-		
+
 			if(world.getBlockId(xMin, yI, zI)!=properties.PermaFabricBlockID)
 			{
 				xMin--;
@@ -395,275 +315,262 @@ public class DungeonHelper
 				zMax++;
 			}
 		}
-		
+
 		short width =(short) (xMax-xMin);
 		short height= (short) (yMax-yMin);
 		short length= (short) (zMax-zMin);
-		
-		 //ArrayList<NBTTagCompound> tileEntities = new ArrayList<NBTTagCompound>();
-		
-	
-		 	ArrayList<Tag> tileEntites= new ArrayList<Tag>();
-		 	byte[] blocks = new byte[width * height * length];
-	        byte[] addBlocks = null;
-	        byte[] blockData = new byte[width * height * length];
 
-	        for (int x = 0; x < width; ++x) 
-	        {
-	            for (int y = 0; y < height; ++y) 
-	            {
-	                for (int z = 0; z < length; ++z) 
-	                {
-	                    int index = y * width * length + z * width + x;
-	                    int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin);
-	                    int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin);
-	                    
-	                    if(blockID==properties.DimensionalDoorID)
-	                    {
-	                    	blockID=Block.doorIron.blockID;
-	                    }
-	                    if(blockID==properties.WarpDoorID)
-	                    {
-	                    	blockID=Block.doorWood.blockID;
+		//ArrayList<NBTTagCompound> tileEntities = new ArrayList<NBTTagCompound>();
+		ArrayList<Tag> tileEntites = new ArrayList<Tag>();
+		byte[] blocks = new byte[width * height * length];
+		byte[] addBlocks = null;
+		byte[] blockData = new byte[width * height * length];
 
-	                    }
-	                   
-	                    // Save 4096 IDs in an AddBlocks section
-	                    if (blockID > 255) 
-	                    {
-	                        if (addBlocks == null) 
-	                        { // Lazily create section
-	                            addBlocks = new byte[(blocks.length >> 1) + 1];
-	                        }
+		for (int x = 0; x < width; ++x) 
+		{
+			for (int y = 0; y < height; ++y) 
+			{
+				for (int z = 0; z < length; ++z) 
+				{
+					int index = y * width * length + z * width + x;
+					int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin);
+					int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin);
 
-	                        addBlocks[index >> 1] = (byte) (((index & 1) == 0) ?
-	                                addBlocks[index >> 1] & 0xF0 | (blockID >> 8) & 0xF
-	                                : addBlocks[index >> 1] & 0xF | ((blockID >> 8) & 0xF) << 4);
-	                    }
+					if(blockID==properties.DimensionalDoorID)
+					{
+						blockID=Block.doorIron.blockID;
+					}
+					if(blockID==properties.WarpDoorID)
+					{
+						blockID=Block.doorWood.blockID;
 
-	                    blocks[index] = (byte) blockID;
-	                    blockData[index] = (byte) meta;
-	                    
-	                    if (Block.blocksList[blockID] instanceof BlockContainer) 
-	                    {
-	                    	//TODO fix this
-	                    	/**
+					}
+
+					// Save 4096 IDs in an AddBlocks section
+					if (blockID > 255) 
+					{
+						if (addBlocks == null) 
+						{ // Lazily create section
+							addBlocks = new byte[(blocks.length >> 1) + 1];
+						}
+
+						addBlocks[index >> 1] = (byte) (((index & 1) == 0) ?
+								addBlocks[index >> 1] & 0xF0 | (blockID >> 8) & 0xF
+								: addBlocks[index >> 1] & 0xF | ((blockID >> 8) & 0xF) << 4);
+					}
+
+					blocks[index] = (byte) blockID;
+					blockData[index] = (byte) meta;
+
+					if (Block.blocksList[blockID] instanceof BlockContainer) 
+					{
+						//TODO fix this
+						/**
 	                        TileEntity tileEntityBlock = world.getBlockTileEntity(x+xMin, y+yMin, z+zMin);
 	                        NBTTagCompound tag = new NBTTagCompound();
 	                        tileEntityBlock.writeToNBT(tag);
-	                        
+
 	                        CompoundTag tagC = new CompoundTag("TileEntity",Map.class.cast(tag.getTags()));
 
-	                        
-	                        
+
+
 	                        // Get the list of key/values from the block
-	                       
+
 	                        if (tagC != null) 
 	                        {
 	                        	tileEntites.add(tagC);
 	                        }
-	                        **/
-	                    }
-
-
-	                }
-	            }
-	        }
-	        /**
-	         *   
-	         *   this.nbtdata.setShort("Width", width);
+						 **/
+					}
+				}
+			}
+		}
+		/**
+		 *   
+		 *   this.nbtdata.setShort("Width", width);
 	        this.nbtdata.setShort("Height", height);
 	        this.nbtdata.setShort("Length", length);
-	        
+
 	    	 this.nbtdata.setByteArray("Blocks", blocks);
         	 this.nbtdata.setByteArray("Data", blockData);
-	         */
-	        
-	        HashMap schematic = new HashMap();
-	        schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
-	        schematic.put("Data", new ByteArrayTag("Data", blockData));
-	        
-	        schematic.put("Width", new ShortTag("Width", (short) width));
-	        schematic.put("Length", new ShortTag("Length", (short) length));
-	        schematic.put("Height", new ShortTag("Height", (short) height));
-	        schematic.put("TileEntites", new ListTag("TileEntities",CompoundTag.class,tileEntites));
-	        if (addBlocks != null) {
-	            schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks));
-	        }
-	      
-	        CompoundTag schematicTag = new CompoundTag("Schematic", schematic);
-	        try
-	        {
-	        	
-	        
-        	 NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(file));
-             stream.writeTag(schematicTag);
-             stream.close();
-	        }
-	        catch(Exception e)
-	        {
-	        	e.printStackTrace();
-	        }
-	    	this.registerCustomDungeon(new File(file));
-	    	
-	        return new DungeonGenerator(0,file,true);
+		 */
+
+		HashMap schematic = new HashMap();
+		schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
+		schematic.put("Data", new ByteArrayTag("Data", blockData));
+
+		schematic.put("Width", new ShortTag("Width", (short) width));
+		schematic.put("Length", new ShortTag("Length", (short) length));
+		schematic.put("Height", new ShortTag("Height", (short) height));
+		schematic.put("TileEntites", new ListTag("TileEntities",CompoundTag.class,tileEntites));
+		if (addBlocks != null) {
+			schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks));
+		}
+
+		CompoundTag schematicTag = new CompoundTag("Schematic", schematic);
+		try
+		{
+
+
+			NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(file));
+			stream.writeTag(schematicTag);
+			stream.close();
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+		}
+		this.registerCustomDungeon(new File(file));
+
+		return new DungeonGenerator(0, file, true);
 	}
-	
-	
-	
+
 	public void generateDungeonlink(LinkData incoming)
 	{
 		//DungeonGenerator dungeon = mod_pocketDim.registeredDungeons.get(new Random().nextInt(mod_pocketDim.registeredDungeons.size()));
 		DungeonGenerator dungeon;
 		int depth = dimHelper.instance.getDimDepth(incoming.locDimID)+2;
-		
+
 		int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2;
-		
+
 		depth=depth-2;
-	//	DungeonGenerator
+		//	DungeonGenerator
 		boolean flag = true;
 		int count=10;
 		try
 		{
-			
 			if(dimHelper.dimList.get(incoming.destDimID)!=null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null)
 			{
 				mod_pocketDim.loader.init(incoming);
 				dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator;
 				return;
 			}
-		if(incoming.destYCoord>15)
-		{
-		do
-		{
-			count--;
-			flag = true;
-			 dungeon = this.weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
-
-			if(depth<=1)
+			if(incoming.destYCoord>15)
 			{
-				if(rand.nextBoolean())
+				do
 				{
-					dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
+					count--;
+					flag = true;
+					dungeon = this.weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
 
-				}
-				else if(rand.nextBoolean())
-				{
-					dungeon = hubs.get(rand.nextInt(hubs.size()));
-
-				}
-				else  if(rand.nextBoolean())
-				{
-					dungeon = hubs.get(rand.nextInt(hubs.size()));
-
-				}
-				else if(deadEnds.contains(dungeon)||exits.contains(dungeon))
+					if(depth<=1)
+					{
+						if(rand.nextBoolean())
 						{
-						flag=false;
+							dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
+
 						}
-				
-		
-				
-			}
-			else if(depth<=3&&(deadEnds.contains(dungeon)||exits.contains(dungeon)||rand.nextBoolean()))
-			{
-				if(rand.nextBoolean())
-				{
-					dungeon = hubs.get(rand.nextInt(hubs.size()));
-					
-				}
-				else if(rand.nextBoolean())
-				{
-					dungeon = mazes.get(rand.nextInt(mazes.size()));
-				}
-				else if(rand.nextBoolean())
-				{
-					dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+						else if(rand.nextBoolean())
+						{
+							dungeon = hubs.get(rand.nextInt(hubs.size()));
 
-				}
-				else
-				{
-					flag=false;
-				}
-			}
-			else if(rand.nextInt(3)==0&&!complexHalls.contains(dungeon))
-			{
-				if(rand.nextInt(3)==0)
-				{
-					dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
-				}
-				else if(rand.nextBoolean())
-				{
-					dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+						}
+						else  if(rand.nextBoolean())
+						{
+							dungeon = hubs.get(rand.nextInt(hubs.size()));
 
-				}
-				else if(depth<4)
-				{
-					dungeon = hubs.get(rand.nextInt(hubs.size()));
-
-				}
-
-			}
-			else if(depthWeight-depthWeight/2>depth-4&&(deadEnds.contains(dungeon)||exits.contains(dungeon)))
-			{
-				if(rand.nextBoolean())
-				{
-					dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
-				}
-				else if(rand.nextBoolean())
-				{
-					dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
-				}
-				else if(rand.nextBoolean())
-				{
-					dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
-
-				}
-				else	
-				{
-					flag=false;
-				}
-			}
-			else if(depthWeight>7&&hubs.contains(dungeon))
-			{
-				if(rand.nextInt(12)+5<depthWeight)
-				{
-					if(rand.nextBoolean())
-					{
-						dungeon = exits.get(rand.nextInt(exits.size()));
+						}
+						else if(deadEnds.contains(dungeon)||exits.contains(dungeon))
+						{
+							flag=false;
+						}
 					}
-					else if(rand.nextBoolean())
+					else if (depth<=3&&(deadEnds.contains(dungeon)||exits.contains(dungeon)||rand.nextBoolean()))
 					{
-						dungeon = deadEnds.get(rand.nextInt(deadEnds.size()));
-					}
-					else
-					{
-						dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+						if(rand.nextBoolean())
+						{
+							dungeon = hubs.get(rand.nextInt(hubs.size()));
 
+						}
+						else if(rand.nextBoolean())
+						{
+							dungeon = mazes.get(rand.nextInt(mazes.size()));
+						}
+						else if(rand.nextBoolean())
+						{
+							dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+
+						}
+						else
+						{
+							flag=false;
+						}
+					}
+					else if(rand.nextInt(3)==0&&!complexHalls.contains(dungeon))
+					{
+						if(rand.nextInt(3)==0)
+						{
+							dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
+						}
+						else if(rand.nextBoolean())
+						{
+							dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+
+						}
+						else if(depth<4)
+						{
+							dungeon = hubs.get(rand.nextInt(hubs.size()));
+
+						}
+					}
+					else if(depthWeight-depthWeight/2>depth-4&&(deadEnds.contains(dungeon)||exits.contains(dungeon)))
+					{
+						if(rand.nextBoolean())
+						{
+							dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size()));
+						}
+						else if(rand.nextBoolean())
+						{
+							dungeon = complexHalls.get(rand.nextInt(complexHalls.size()));
+						}
+						else if(rand.nextBoolean())
+						{
+							dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+
+						}
+						else	
+						{
+							flag=false;
+						}
+					}
+					else if(depthWeight>7&&hubs.contains(dungeon))
+					{
+						if(rand.nextInt(12)+5<depthWeight)
+						{
+							if(rand.nextBoolean())
+							{
+								dungeon = exits.get(rand.nextInt(exits.size()));
+							}
+							else if(rand.nextBoolean())
+							{
+								dungeon = deadEnds.get(rand.nextInt(deadEnds.size()));
+							}
+							else
+							{
+								dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size()));
+
+							}
+						}
+						else
+						{
+							flag = false;
+						}
+					}
+					else if(depth>10&&hubs.contains(dungeon))
+					{
+						flag = false;
 					}
-					
-				}
-				else
-				{
-					flag = false;
 				}
+				while (!flag && count > 0);
 			}
-			else if(depth>10&&hubs.contains(dungeon))
+			else
 			{
-				flag = false;
+				dungeon = defaultUp;
 			}
-			
 		}
-		while(!flag&&count>0);
-		}
-		else
+		catch (Exception e)
 		{
-			dungeon= defaultUp;
-		}
-		}
-		catch(Exception e)
-		{
-			if(weightedDungeonGenList.size()>0)
+			if (weightedDungeonGenList.size() > 0)
 			{
 				dungeon = weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size()));
 			}
@@ -673,22 +580,6 @@ public class DungeonHelper
 				return;
 			}
 		}
-		
-		
-	
-		dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dungeon;
-		//loader.generateSchematic(incoming,0,0,0);
-	
-		
-				
-
-				
-
-			
-		
+		dimHelper.dimList.get(incoming.destDimID).dungeonGenerator = dungeon;
 	}
-	
-	
-	
-	
 }
\ No newline at end of file