diff --git a/src/resources/datatables/CommandType.java b/src/resources/datatables/CommandType.java
new file mode 100644
index 00000000..f6f7fdef
--- /dev/null
+++ b/src/resources/datatables/CommandType.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package resources.datatables;
+
+public class CommandType {
+	
+	public static final byte Attack = 0;
+	public static final byte Ability = 1;
+	
+}
diff --git a/src/resources/datatables/Elemental.java b/src/resources/datatables/Elemental.java
index 007f04c0..15ba562e 100644
--- a/src/resources/datatables/Elemental.java
+++ b/src/resources/datatables/Elemental.java
@@ -86,6 +86,7 @@ public enum Elemental {
 				return element.toString();
 			}
 		}
+		
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/src/resources/datatables/HitType.java b/src/resources/datatables/HitType.java
index a0736a2e..0952a15d 100644
--- a/src/resources/datatables/HitType.java
+++ b/src/resources/datatables/HitType.java
@@ -22,6 +22,7 @@
 package resources.datatables;
 
 public class HitType {
+	
 	public static final byte MISS = 0;
 	public static final byte DODGE = 1;
 	public static final byte PARRY = 2;
@@ -32,4 +33,12 @@ public class HitType {
 	public static final byte BLOCK = 7;
 	public static final byte EVASION = 8;
 	public static final byte GLANCE = 9;
+	
+	public static final byte ATTACK = -1;
+	public static final byte BUFF = 0;
+	public static final byte DEBUFF = 4;
+	public static final byte HEAL = 5;
+	public static final byte SPLASH = 6;
+	public static final byte REVIVE = 7;
+	
 }
diff --git a/src/resources/datatables/MilkState.java b/src/resources/datatables/MilkState.java
index 002b6e7c..719c9365 100644
--- a/src/resources/datatables/MilkState.java
+++ b/src/resources/datatables/MilkState.java
@@ -22,7 +22,9 @@
 package resources.datatables;
 
 public class MilkState {
+	
 	public static final byte NOTYETMILKED = 0;
 	public static final byte MILKINGINPROGRESS = 1;
 	public static final byte MILKED = 2;
+	
 }
diff --git a/src/resources/datatables/PlayerFlags.java b/src/resources/datatables/PlayerFlags.java
index 309f465e..d35510df 100644
--- a/src/resources/datatables/PlayerFlags.java
+++ b/src/resources/datatables/PlayerFlags.java
@@ -22,6 +22,7 @@
 package resources.datatables;
 
 public class PlayerFlags {
+	
 	public static final int LFG = 0x01;
 	public static final int HELPER = 0x02;
 	public static final int ROLEPLAYER = 0x04;
diff --git a/src/resources/datatables/Posture.java b/src/resources/datatables/Posture.java
index d64cba45..4ce42877 100644
--- a/src/resources/datatables/Posture.java
+++ b/src/resources/datatables/Posture.java
@@ -23,7 +23,6 @@ package resources.datatables;
 
 public class Posture {
 	
-	// Posture.iff
 	public static final byte Invalid = -1;
 	public static final byte Upright = 0;
 	public static final byte Crouched = 1;
diff --git a/src/resources/datatables/StateStatus.java b/src/resources/datatables/StateStatus.java
index e805f7cb..74e73b0c 100644
--- a/src/resources/datatables/StateStatus.java
+++ b/src/resources/datatables/StateStatus.java
@@ -22,7 +22,7 @@
 package resources.datatables;
 
 public class StateStatus {
-	// States.iff
+	
 	public static int Invalid = -1;
 	public static int Cover = 0;
 	public static int Combat = 1;
@@ -65,4 +65,5 @@ public class StateStatus {
 	public static int AcidBurned = 38;
 	public static int EnergyBurned = 39;
 	public static int KineticBurned = 40;
+	
 }
diff --git a/src/resources/datatables/ValidTarget.java b/src/resources/datatables/ValidTarget.java
new file mode 100644
index 00000000..2ee9c423
--- /dev/null
+++ b/src/resources/datatables/ValidTarget.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package resources.datatables;
+
+public class ValidTarget {
+	
+	public static final byte TARGET_NOT_USED = -1;
+	public static final byte ALL = 0;
+	public static final byte TARGET_OUT_OF_COMBAT = 1;
+	public static final byte SELF_OUT_OF_COMBAT = 7;
+	public static final byte ALLY = 8;
+	
+}
diff --git a/src/resources/objects/weapon/WeaponMessageBuilder.java b/src/resources/objects/weapon/WeaponMessageBuilder.java
index 80eec11a..a67444cd 100644
--- a/src/resources/objects/weapon/WeaponMessageBuilder.java
+++ b/src/resources/objects/weapon/WeaponMessageBuilder.java
@@ -98,12 +98,12 @@ public class WeaponMessageBuilder extends TangibleMessageBuilder {
 		buffer.put(getAsciiString(weapon.getDetailFilename()));
 		buffer.putInt(0);
 		buffer.put(getAsciiString(weapon.getDetailName()));
+		buffer.put((byte) 0);
 		buffer.putLong(0);
+		buffer.putInt(0);
 		buffer.putLong(0);
 		buffer.putLong(0); // unks
 		buffer.putLong(0);
-		buffer.putInt(0);
-		buffer.put((byte) 0);
 		buffer.putInt(weapon.getWeaponType());
 
 		int size = buffer.position();