diff --git a/scripts/commands/helper/qatool/details.js b/scripts/commands/helper/qatool/details.js
index 4286e60e0..fe6f24560 100644
--- a/scripts/commands/helper/qatool/details.js
+++ b/scripts/commands/helper/qatool/details.js
@@ -1,15 +1,23 @@
-function sendDetails(player, object) {
+function sendDetails(player, object, args) {
 	if (object == null) {
 		intentFactory.sendSystemMessage(player, "Null target");
 		return;
 	}
+	if (args.length >= 2 && args[1].equalsIgnoreCase("observers")) {
+		intentFactory.sendSystemMessage(player, "Aware: " + object.getObjectsAware());
+		intentFactory.sendSystemMessage(player, "Observers: " + object.getObservers());
+		return;
+	}
 	intentFactory.sendSystemMessage(player, object.getName() + " - " + object.getClass().getSimpleName() + " [" + object.getObjectId() + "]");
 	intentFactory.sendSystemMessage(player, "    STR: " + object.getStringId() + " / " + object.getDetailStringId());
 	intentFactory.sendSystemMessage(player, "    Template: " + object.getTemplate());
 	intentFactory.sendSystemMessage(player, "    GOT: " + object.getGameObjectType());
 	intentFactory.sendSystemMessage(player, "    Classification: " + object.getClassification());
 	intentFactory.sendSystemMessage(player, "    Load Range: " + object.getLoadRange());
-	intentFactory.sendSystemMessage(player, "    Health/Action: " + object.getHealth() + "/" + object.getAction());
-	intentFactory.sendSystemMessage(player, "    Base Health/Action: " + object.getBaseHealth() + "/" + object.getBaseAction());
-	intentFactory.sendSystemMessage(player, "    Max Health/Action: " + object.getMaxHealth() + "/" + object.getMaxAction());
+	if (object instanceof Java.type("resources.objects.creature.CreatureObject")) {
+		intentFactory.sendSystemMessage(player, "    Health/Action: " + object.getHealth() + "/" + object.getAction());
+		intentFactory.sendSystemMessage(player, "    Max Health/Action: " + object.getMaxHealth() + "/" + object.getMaxAction());
+	}
+	if (object instanceof Java.type("resources.objects.tangible.TangibleObject"))
+		intentFactory.sendSystemMessage(player, "    PVP Flags: " + object.getPvpFlags())
 }
diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/resources/commands/callbacks/QaToolCmdCallback.java
index 940c26e23..1213bdea3 100644
--- a/src/resources/commands/callbacks/QaToolCmdCallback.java
+++ b/src/resources/commands/callbacks/QaToolCmdCallback.java
@@ -92,7 +92,7 @@ public class QaToolCmdCallback implements ICmdCallback {
 					recoverPlayer(galacticManager.getObjectManager(), galacticManager.getPlayerManager(), player, args.substring(args.indexOf(' ') + 1));
 					break;
 				case "details":
-					Scripts.invoke("commands/helper/qatool/details", "sendDetails", player, target);
+					Scripts.invoke("commands/helper/qatool/details", "sendDetails", player, target, args.split(" "));
 					break;
 				default:
 					displayMainWindow(player);
diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 39d9df52e..dad85f80c 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -51,7 +51,6 @@ import resources.network.BaselineObject;
 import resources.network.NetBuffer;
 import resources.objects.building.BuildingObject;
 import resources.objects.creature.CreatureObject;
-import resources.objects.tangible.TangibleObject;
 import resources.player.Player;
 import resources.server_info.Log;
 import services.CoreManager;