diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 8d6a01c6..69e0ef11 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -23,8 +23,6 @@ package resources.objects.creature;
 
 import java.nio.ByteOrder;
 
-
-
 import org.apache.mina.core.buffer.IoBuffer;
 
 import com.sleepycat.persist.model.Persistent;
@@ -96,6 +94,8 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		}
 
 		buffer.putShort((short) 19);	// Object Count
+		
+		// BaseObject
 		buffer.putFloat(1);
 		buffer.put(getAsciiString(creature.getStfFilename()));
 		buffer.putInt(0);	
@@ -104,6 +104,8 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		buffer.put(getUnicodeString(creature.getCustomName()));
 	//	buffer.putInt(0x000F4240); // volume
 		buffer.putInt(1);
+		
+		// TangibleObject
 		buffer.putInt(CRC.StringtoCRC(creature.getFaction()));
 		
 		buffer.putInt(creature.getFactionStatus());
@@ -126,6 +128,8 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		buffer.putInt(0x3A98);
 		
 		buffer.put((byte) 1);
+		
+		// CreatureObject
 		buffer.put((byte) creature.getPosture());
 		buffer.put((byte) 0);
 
@@ -216,20 +220,21 @@ public class CreatureMessageBuilder extends ObjectMessageBuilder {
 		IoBuffer buffer = bufferPool.allocate(100, false).order(ByteOrder.LITTLE_ENDIAN);
 		buffer.setAutoExpand(true);
 		buffer.putShort((short) 0x23);
+		
+		// BaseObject
 		buffer.putInt(0x43); // serverId
 		
 		buffer.putShort((short) 0); // detaiLStfFilename
 		buffer.putInt(0); // detailStfSpacer
 		buffer.putShort((short) 0); // detailStfName
 		
-		// TANO 6 lists TODO: research
-		
+		// TangibleObject
 		buffer.put(creature.getCombatFlag());
 		
-		buffer.putLong(0); //List<Long> possibly defenders list
+		buffer.putLong(0); //Set<Long> cloakViewers (set of objectIds of who can see a cloaked spy)
 		buffer.putInt(0); //Int
 		buffer.putLong(0); //List<Long>
-		buffer.putLong(0);	//List<Int>
+		buffer.putLong(0); //List<Int>
 		buffer.putLong(0); //List<Unknown>
 		
 		buffer.putShort(creature.getLevel());