diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
index ed0abd7..0395fb6 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
@@ -424,9 +424,10 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 	}
 	
 	@Override
-	public void initDoorTE(World world, int x, int y, int z)
+	public TileEntity initDoorTE(World world, int x, int y, int z)
 	{
 		TileEntity te = this.createNewTileEntity(world);
 		world.setBlockTileEntity(x, y, z, te);
+		return te;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
index e593915..b3884dc 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
@@ -1,6 +1,7 @@
 package StevenDimDoors.mod_pocketDim.blocks;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
 public interface IDimDoor
@@ -11,5 +12,5 @@ public interface IDimDoor
 	
 	public int getDrops();
 	
-	public void initDoorTE(World world, int x, int y, int z);
+	public TileEntity initDoorTE(World world, int x, int y, int z);
 }
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
index 6eac539..d1b7fd4 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
@@ -120,9 +120,10 @@ public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntit
 	}
 	
 	@Override
-	public void initDoorTE(World world, int x, int y, int z)
+	public TileEntity initDoorTE(World world, int x, int y, int z)
 	{
 		TileEntity te = this.createNewTileEntity(world);
 		world.setBlockTileEntity(x, y, z, te);
+		return te;
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
index 73ccf96..012c537 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
@@ -25,6 +25,7 @@ import net.minecraftforge.common.network.packet.DimensionRegisterPacket;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.blocks.BaseDimDoor;
 import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
 import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;
@@ -598,9 +599,11 @@ public class DDTeleporter
 					return;
 				}
 			}
-			 
+			
 			BaseItemDoor.placeDoorBlock(destWorld, link.destination().getX(), link.destination().getY()-1, link.destination().getZ(),link.getDestinationOrientation(), door);
-			TileEntity doorDestTE = startWorld.getBlockTileEntity(link.destination().getX(), link.destination().getY(), link.destination().getZ());
+
+			TileEntity 	doorDestTE = ((BaseDimDoor)door).initDoorTE(destWorld, link.destination().getX(), link.destination().getY(), link.destination().getZ());
+
 			
 			if(doorDestTE instanceof TileEntityDimDoor)
 			{
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
index 7b0d18a..8ee3d9a 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
@@ -62,7 +62,12 @@ public abstract class DimLink
 	}
 	public int getDestinationOrientation()
 	{
-		return PocketManager.getLink(link.point.getX(), link.point.getY(), link.point.getZ(), link.point.getDimension()).link().orientation;
+		DimLink link = PocketManager.getLink(this.destination().getX(), this.destination().getY(), this.destination().getZ(), this.destination().getDimension());
+		if(link !=null)
+		{
+			return link.orientation();
+		}
+		return (this.orientation()+2)%4;
 	}
 	public boolean hasDestination()
 	{
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
index ee6a62f..9066fd2 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
@@ -48,7 +48,6 @@ public class ItemRiftSignature extends Item
 	@Override
 	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
 	{
-		//TODO- recognize doors and intelligently place rifts on them.
 		// We must use onItemUseFirst() instead of onItemUse() because Minecraft checks
 		// whether the user is in creative mode after calling onItemUse() and undoes any
 		// damage we might set to indicate the rift sig has been activated. Otherwise,
diff --git a/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
index 64b1b59..3d932e5 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
@@ -71,10 +71,10 @@ public class RenderMobObelisk extends RenderLiving
 	            
 			  GL11.glDisable(GL12.GL_RESCALE_NORMAL);
 		  }
-	        catch (Exception exception)
-	        {
-	            exception.printStackTrace();
-	        }
+		  catch (Exception exception)
+		  {
+			  exception.printStackTrace();
+		  }
 
 	        OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
 	        GL11.glEnable(GL11.GL_TEXTURE_2D);