diff --git a/src/main/ProjectSWG.java b/src/main/ProjectSWG.java
index 51c55c63..f67e3da0 100644
--- a/src/main/ProjectSWG.java
+++ b/src/main/ProjectSWG.java
@@ -87,6 +87,8 @@ public class ProjectSWG {
 			loop++;
 			if (loop % 10 == 0 && !manager.isOperational())
 				break;
+//			if (!manager.isOperational())
+//				break;
 		}
 	}
 	
diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index d24c331e..0bc14c45 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -35,6 +35,8 @@ import services.player.PlayerManager;
 
 public class ObjectManager extends Manager {
 	
+	private static final double AWARE_RANGE = 200;
+	
 	private ObjectDatabase<SWGObject> objects;
 	private Map <String, QuadTree <SWGObject>> quadTree;
 	private long maxObjectId;
@@ -91,7 +93,10 @@ public class ObjectManager extends Manager {
 			quadTree.get(oTerrain.getTerrain().getFile()).remove(x, y, obj);
 			x = nTerrain.getX();
 			y = nTerrain.getZ();
-			quadTree.get(nTerrain.getTerrain().getFile()).put(x, y, obj);
+			QuadTree<SWGObject> tree = quadTree.get(nTerrain.getTerrain().getFile());
+			tree.put(x, y, obj);
+			List <Player> updatedAware = new ArrayList<Player>();
+			obj.updateAwareness(tree.getWithinRange(x, y, AWARE_RANGE));
 		} else if (i instanceof GalacticPacketIntent) {
 			GalacticPacketIntent gpi = (GalacticPacketIntent) i;
 			if (gpi.getPacket() instanceof SelectCharacter) {
diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java
index 8b1ab244..cfa0da2b 100644
--- a/src/services/player/LoginService.java
+++ b/src/services/player/LoginService.java
@@ -181,7 +181,7 @@ public class LoginService extends Service {
 			c.setName(set.getString("name"));
 			c.setRaceCrc(Race.getRace(set.getString("race")).getCrc());
 			c.setGalaxyId(set.getInt("galaxyid"));
-			c.setType(0); // 0 = Normal (1 = Jedi, 2 = Spectral)
+			c.setType(1); // 1 = Normal (2 = Jedi, 3 = Spectral)
 			characters.add(c);
 		}
 		return characters.toArray(new SWGCharacter[characters.size()]);
diff --git a/src/services/player/PlayerManager.java b/src/services/player/PlayerManager.java
index a73ce026..b37aef6e 100644
--- a/src/services/player/PlayerManager.java
+++ b/src/services/player/PlayerManager.java
@@ -57,14 +57,6 @@ public class PlayerManager extends Manager {
 			if (type == ServerType.ZONE && packet instanceof ClientIdMsg)
 				transitionLoginToZone(networkId, gpi.getGalaxy().getId(), (ClientIdMsg) packet);
 			player = players.get(networkId);
-			if (player == null)
-				System.out.println("Player: null");
-			else {
-				System.out.println("Player: " + player.getUsername());
-				System.out.println("        " + player.getUserId());
-				System.out.println("        " + player.getGalaxyId());
-			}
-			System.out.println("Player: " + ((player==null)?"null":player.getUsername()));
 			if (player == null && type == ServerType.LOGIN) {
 				player = new Player(this, networkId);
 				players.put(networkId, player);
diff --git a/src/services/player/ZoneService.java b/src/services/player/ZoneService.java
index dc06c497..993ed569 100644
--- a/src/services/player/ZoneService.java
+++ b/src/services/player/ZoneService.java
@@ -116,10 +116,9 @@ public class ZoneService extends Service {
 			try {
 				createCharacter.setLong(1, characterId);
 				createCharacter.setString(2, create.getName());
-				createCharacter.setString(3, create.getRace());
+				createCharacter.setString(3, ((CreatureObject)player.getCreatureObject()).getRace().getFilename());
 				createCharacter.setInt(4, player.getUserId());
 				createCharacter.setInt(5, player.getGalaxyId());
-				System.out.println("Galaxy ID: " + player.getGalaxyId());
 				if (createCharacter.executeUpdate() != 1) {
 					System.err.println("ZoneService: Unable to create character and put into database!");
 					sendPacket(player, new CreateCharacterFailure(NameFailureReason.NAME_RETRY));