diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 3577fc3cb..af01279ec 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -380,7 +380,7 @@ public class CreatureObject extends TangibleObject {
 		}
 	}
 	
-	public void createObject(Player target) {
+	protected void createObject(Player target) {
 		sendSceneCreateObject(target);
 		
 		BaselineBuilder bb = null;
@@ -420,7 +420,7 @@ public class CreatureObject extends TangibleObject {
 		target.sendPacket(new SceneEndBaselines(getObjectId()));
 	}
 	
-	public void createChildrenObjects(Player target) {
+	protected void createChildrenObjects(Player target) {
 		target.sendPacket(new UpdatePostureMessage(posture.getId(), getObjectId()));
 		if (target != getOwner()) target.sendPacket(new UpdatePvpStatusMessage(UpdatePvpStatusMessage.PLAYER, 0, getObjectId())); // TODO: Change this when adding non-players
 		super.createChildrenObjects(target);
diff --git a/src/resources/objects/intangible/IntangibleObject.java b/src/resources/objects/intangible/IntangibleObject.java
index 82c18934e..95f52792c 100644
--- a/src/resources/objects/intangible/IntangibleObject.java
+++ b/src/resources/objects/intangible/IntangibleObject.java
@@ -35,7 +35,7 @@ public class IntangibleObject extends SWGObject {
 		super.createBaseline6(target, bb);
 	}
 	
-	public void createObject(Player target) {
+	protected void createObject(Player target) {
 		super.sendSceneCreateObject(target);
 		
 		BaselineBuilder bb = new BaselineBuilder(this, BaselineType.ITNO, 3);
diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java
index 234400d87..a4a8a0173 100644
--- a/src/resources/objects/player/PlayerObject.java
+++ b/src/resources/objects/player/PlayerObject.java
@@ -114,7 +114,7 @@ public class PlayerObject extends IntangibleObject {
 		}
 	}
 	
-	public void createObject(Player target) {
+	protected void createObject(Player target) {
 		super.sendSceneCreateObject(target);
 		
 		BaselineBuilder bb = new BaselineBuilder(this, BaselineType.PLAY, 3);
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index fc5aea46b..8528bf4f0 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -123,7 +123,7 @@ public class TangibleObject extends SWGObject {
 		this.objectEffects = objectEffects;
 	}
 	
-	public void createObject(Player target) {
+	protected void createObject(Player target) {
 		super.sendSceneCreateObject(target);
 		
 		BaselineBuilder bb = new BaselineBuilder(this, BaselineType.TANO, 3);
@@ -148,7 +148,7 @@ public class TangibleObject extends SWGObject {
 		target.sendPacket(new SceneEndBaselines(getObjectId()));
 	}
 	
-	public void createChildrenObjects(Player target) {
+	protected void createChildrenObjects(Player target) {
 		super.createChildrenObjects(target);
 	}
 	
diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java
index 1b0f6e3f5..cd25e7e9e 100644
--- a/src/resources/objects/waypoint/WaypointObject.java
+++ b/src/resources/objects/waypoint/WaypointObject.java
@@ -87,7 +87,7 @@ public class WaypointObject extends IntangibleObject implements Encodable{
 		bb.addBoolean(active);
 	}
 
-	public void createObject(Player target) {
+	protected void createObject(Player target) {
 		// NOTE: Client is never sent a WAYP baseline in NGE, WaypointObject's just go inside the Waypoint List in PLAY.
 		
 		/*super.sendSceneCreateObject(target);
diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java
index 9b70e8015..f70217590 100644
--- a/src/resources/objects/weapon/WeaponObject.java
+++ b/src/resources/objects/weapon/WeaponObject.java
@@ -50,7 +50,7 @@ public class WeaponObject extends TangibleObject implements Encodable{
 	}
 
 
-	public void createObject(Player target) {
+	protected void createObject(Player target) {
 		super.sendSceneCreateObject(target);
 		
 		BaselineBuilder bb = new BaselineBuilder(this, BaselineType.WEAO, 3);
diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java
index 68218fda1..d8538b737 100644
--- a/src/services/commands/CommandService.java
+++ b/src/services/commands/CommandService.java
@@ -101,7 +101,8 @@ public class CommandService extends Service {
 				Command command = new Command((String) baseCommands.getCell(row, 0));
 				command.setCrc(CRC.getCrc(command.getName().toLowerCase()));
 				// Use cppHook if the scriptHook is empty
-				command.setScriptCallback(((String) (((String) baseCommands.getCell(row, 2)).isEmpty() ? baseCommands.getCell(row, 4) : baseCommands.getCell(row, 2))) + ".py");
+				String callback = (String) baseCommands.getCell(row, 2);
+				command.setScriptCallback((callback.isEmpty() ? baseCommands.getCell(row, 4) : callback) + ".py");
 				command.setDefaultTime((float) baseCommands.getCell(row, 6));
 				command.setCharacterAbility((String) baseCommands.getCell(row, 7));
 				
diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 25df3cba4..4f1047e4d 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -62,12 +62,12 @@ public class ObjectManager extends Manager {
 		registerForIntent(SWGObjectEventIntent.TYPE);
 		registerForIntent(GalacticPacketIntent.TYPE);
 		for (Terrain t : Terrain.values()) {
-			quadTree.put(t, new QuadTree<SWGObject>(-5000, -5000, 5000, 5000));
+			quadTree.put(t, new QuadTree<SWGObject>(-8192, -8192, 8192, 8192));
 		}
 		objects.loadToCache();
 		long startLoad = System.nanoTime();
 		System.out.println("ObjectManager: Loading " + objects.size() + " objects from ObjectDatabase...");
-		objects.traverse(new Traverser<SWGObject>() {
+		objects.traverseCache(new Traverser<SWGObject>() {
 			@Override
 			public void process(SWGObject obj) {
 				obj.setOwner(null);
@@ -174,7 +174,7 @@ public class ObjectManager extends Manager {
 		double y = location.getZ();
 		QuadTree<SWGObject> tree = quadTree.get(location.getTerrain());
 		for (SWGObject inRange : tree.getWithinRange(x, y, AWARE_RANGE)) {
-			if (inRange.getOwner() != null && inRange.getObjectId() != obj.getObjectId()) {
+			if (inRange.getOwner() != null) {
 				updatedAware.add(inRange.getOwner());
 			}
 		}
@@ -227,7 +227,6 @@ public class ObjectManager extends Manager {
 //			player.getCreatureObject().createObject(player);
 			CreatureObject creature = (CreatureObject) player.getCreatureObject();
 			player.sendPacket(new UpdatePvpStatusMessage(creature.getPvpType(), creature.getPvpFactionId(), creature.getObjectId()));
-			creature.createObject(player);
 			creature.clearAware();
 			moveObject(null, creature, creature.getLocation(), creature.getLocation());
 			updateAwarenessForObject(creature);