diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index fd42fae1..ed08b68b 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -320,7 +320,7 @@ public class PlayerService implements INetworkDispatch {
 		DatatableVisitor experienceTable;
 		PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
 		
-		synchronized(objectMutex) {
+		//synchronized(objectMutex) {
 			try {
 				experienceTable = ClientFileManager.loadFile("datatables/player/player_level.iff", DatatableVisitor.class);
 				
@@ -486,7 +486,7 @@ public class PlayerService implements INetworkDispatch {
 			} catch (InstantiationException | IllegalAccessException e) {
 				e.printStackTrace();
 			}
-		}
+		//}
 	}
 	
 	public void addPlayerTitle(PlayerObject player, String title) {
diff --git a/src/services/TerrainService.java b/src/services/TerrainService.java
index d1786eb0..d6c80695 100644
--- a/src/services/TerrainService.java
+++ b/src/services/TerrainService.java
@@ -90,7 +90,7 @@ public class TerrainService {
 	
 	public Planet getPlanetByName(String name) {
 		for (int i = 0; i < planets.size(); i++) {
-			if (planets.get(i).getName().equals(name)) {
+			if (planets.get(i).getName().equalsIgnoreCase(name)) {
 				return planets.get(i);
 			}
 		}
diff --git a/src/services/WeatherService.java b/src/services/WeatherService.java
index 8fb1cd1c..501cf77b 100644
--- a/src/services/WeatherService.java
+++ b/src/services/WeatherService.java
@@ -21,6 +21,17 @@
  ******************************************************************************/
 package services;
 
+import main.NGECore;
+
 public class WeatherService {
+	
+	private NGECore core;
+
+	public WeatherService(NGECore core) {
+		this.core = core;
+	}
+	
+	
+
 
 }
diff --git a/src/services/travel/TravelService.java b/src/services/travel/TravelService.java
index 1464328a..987f9492 100644
--- a/src/services/travel/TravelService.java
+++ b/src/services/travel/TravelService.java
@@ -377,14 +377,9 @@ public class TravelService implements INetworkDispatch {
 	// TravelPoint = the travelpoint player is going to travel to!
 	public void doTransport(SWGObject actor, TravelPoint tp) {
 		
-		if (tp.getPlanetName().toLowerCase().equals(actor.getPlanet().name)) { 
-			core.simulationService.teleport(actor, tp.getSpawnLocation().getPosition(), tp.getSpawnLocation().getOrientation(), 0); 
-		} 
+		Planet planet = core.terrainService.getPlanetByName(tp.getPlanetName());
+		core.simulationService.transferToPlanet(actor, planet, tp.getSpawnLocation().getPosition(), tp.getSpawnLocation().getOrientation(), null);
 		
-		else {
-			Planet planet = core.terrainService.getPlanetByName(tp.getPlanetName());
-			core.simulationService.transferToPlanet(actor, planet, tp.getSpawnLocation().getPosition(), tp.getSpawnLocation().getOrientation(), null);
-		}
 	}