diff --git a/scripts/demo.py b/scripts/demo.py
index 2b7889ee..de9a931d 100644
--- a/scripts/demo.py
+++ b/scripts/demo.py
@@ -28,7 +28,7 @@ def CreateStartingCharacter(core, object):
 	object.addSkillMod('display_only_glancing_blow' , 750)
 	object.addSkillMod('display_only_block' , 2000)
 	object.addSkillMod('combat_block_value' , 0)
-
+	
 	inventory = object.getSlottedObject('inventory')
 	if not inventory:
 		return
diff --git a/src/protocol/swg/ObjectMenuSelect.java b/src/protocol/swg/ObjectMenuSelectMessage.java
similarity index 89%
rename from src/protocol/swg/ObjectMenuSelect.java
rename to src/protocol/swg/ObjectMenuSelectMessage.java
index f3bd2f50..c24d00d2 100644
--- a/src/protocol/swg/ObjectMenuSelect.java
+++ b/src/protocol/swg/ObjectMenuSelectMessage.java
@@ -23,9 +23,9 @@ package protocol.swg;
 
 import org.apache.mina.core.buffer.IoBuffer;
 
-public class ObjectMenuSelect extends SWGMessage {
+public class ObjectMenuSelectMessage extends SWGMessage {
 
-	private byte selection;
+	private short selection;
 	private long objectId;
 
 	@Override
@@ -34,7 +34,7 @@ public class ObjectMenuSelect extends SWGMessage {
 		buffer.getShort();
 		buffer.getInt();
 		setObjectId(buffer.getLong());
-		setSelection(buffer.get());
+		setSelection(buffer.getShort());
 		
 	}
 
@@ -44,11 +44,11 @@ public class ObjectMenuSelect extends SWGMessage {
 		return null;
 	}
 
-	public byte getSelection() {
+	public short getSelection() {
 		return selection;
 	}
 
-	public void setSelection(byte selection) {
+	public void setSelection(short selection) {
 		this.selection = selection;
 	}
 
diff --git a/src/resources/common/Opcodes.java b/src/resources/common/Opcodes.java
index 405cd992..670abfde 100644
--- a/src/resources/common/Opcodes.java
+++ b/src/resources/common/Opcodes.java
@@ -42,7 +42,7 @@ public class Opcodes {
 	public static int LagRequest = 0x31805EE0;
 	public static int LoginClientId = 0x41131F96;
 	public static int ObjControllerMessage = 0x80CE5E46;
-	public static int ObjectSelectMenuMessage = 0x7CA18726;
+	public static int ObjectMenuSelectMessage = 0x7CA18726;
 	public static int RequestGalaxyLoopTimes = 0x7D842D68;
 	public static int SelectCharacter = 0xB5098D76;
 	public static int SuiEventNotification = 0x092D3564;
diff --git a/src/services/StaticService.java b/src/services/StaticService.java
index 6d839fb0..0dfd37fc 100644
--- a/src/services/StaticService.java
+++ b/src/services/StaticService.java
@@ -73,8 +73,12 @@ public class StaticService implements INetworkDispatch {
 		System.out.println("Loaded static objs for " + planetObj.getName());
 	}
 	
-	// TODO make sure static objects get unloaded
 	public SWGObject spawnObject(String template, String planetName, long cellId, float x, float y, float z, float qY, float qW) {
+		return spawnObject(template, planetName, cellId, x, y, z, qW, 0, qY, 0);
+	}
+	
+	// TODO make sure static objects get unloaded
+	public SWGObject spawnObject(String template, String planetName, long cellId, float x, float y, float z, float qW, float qX, float qY, float qZ) {
 		
 		Planet planet = core.terrainService.getPlanetByName(planetName);
 		
@@ -85,7 +89,7 @@ public class StaticService implements INetworkDispatch {
 			return null;
 		}
 		
-		SWGObject object = core.objectService.createObject(template, 0, planet, new Point3D(x, y, z), new Quaternion(qW, 0, qY, 0));
+		SWGObject object = core.objectService.createObject(template, 0, planet, new Point3D(x, y, z), new Quaternion(qW, qX, qY, qZ));
 		
 		if(object == null) {
 			System.out.println("Static object is null");
diff --git a/src/services/sui/SUIService.java b/src/services/sui/SUIService.java
index 9722b691..be3c2ecf 100644
--- a/src/services/sui/SUIService.java
+++ b/src/services/sui/SUIService.java
@@ -36,7 +36,7 @@ import org.python.core.Py;
 import org.python.core.PyObject;
 
 import protocol.swg.ObjControllerMessage;
-import protocol.swg.ObjectMenuSelect;
+import protocol.swg.ObjectMenuSelectMessage;
 import protocol.swg.SUICreatePageMessage;
 import protocol.swg.SUIEventNotification;
 import protocol.swg.SUIForceClosePageMessage;
@@ -82,7 +82,6 @@ public class SUIService implements INetworkDispatch {
 				if(target == null || owner == null)
 					return;
 						
-				
 				core.scriptService.callScript("scripts/radial/", getRadialFilename(target), "createRadial", core, owner, target, request.getRadialOptions());
 				if(getRadialFilename(target).equals("default"))
 					return;
@@ -93,7 +92,7 @@ public class SUIService implements INetworkDispatch {
 			
 		});
 		
-		swgOpcodes.put(Opcodes.ObjectSelectMenuMessage, new INetworkRemoteEvent() {
+		swgOpcodes.put(Opcodes.ObjectMenuSelectMessage, new INetworkRemoteEvent() {
 
 			@Override
 			public void handlePacket(IoSession session, IoBuffer data) throws Exception {
@@ -101,7 +100,7 @@ public class SUIService implements INetworkDispatch {
 				data.order(ByteOrder.LITTLE_ENDIAN);
 				data.position(0);
 				
-				ObjectMenuSelect objMenuSelect = new ObjectMenuSelect();
+				ObjectMenuSelectMessage objMenuSelect = new ObjectMenuSelectMessage();
 				objMenuSelect.deserialize(data);
 				
 				Client client = core.getClient((Integer) session.getAttribute("connectionId"));