diff --git a/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs b/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs
index 6a4e50e4b8..3f57dee966 100644
--- a/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs
+++ b/Content.Client/GameObjects/Components/Power/PowerDebugTool.cs
@@ -17,7 +17,10 @@ namespace Content.Client.GameObjects.Components.Power
             switch (message)
             {
                 case OpenDataWindowMsg msg:
-                    var window = new SS14Window();
+                    var window = new SS14Window
+                    {
+                        Title = "Power Debug Tool"
+                    };
                     window.Contents.AddChild(new Label() { Text = msg.Data });
                     window.AddToScreen();
                     window.Open();
diff --git a/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs b/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs
index d205b85693..37946e2511 100644
--- a/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerDebugTool.cs
@@ -19,6 +19,8 @@ namespace Content.Server.GameObjects.Components.Power
 
             var builder = new StringBuilder();
 
+            builder.AppendFormat("Entity: {0} ({1})\n", attacked.Name, attacked.Uid);
+
             if (attacked.TryGetComponent<PowerNodeComponent>(out var node))
             {
                 builder.AppendFormat("Power Node:\n");
@@ -47,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Power
                     foreach (var provider in device.AvailableProviders)
                     {
                         var providerTransform = provider.Owner.GetComponent<IServerTransformComponent>();
-                        builder.AppendFormat("      {0} @ {1}", provider.Name, providerTransform.LocalPosition);
+                        builder.AppendFormat("      {0} ({1}) @ {2}", provider.Owner.Name, provider.Owner.Uid, providerTransform.LocalPosition);
                         if (device.Provider == provider)
                         {
                             builder.Append(" (CURRENT)");
@@ -64,6 +66,13 @@ namespace Content.Server.GameObjects.Components.Power
 ", storage.Capacity, storage.Charge, storage.ChargeRate, storage.DistributionRate, storage.ChargePowernet);
             }
 
+            if (attacked.TryGetComponent<PowerTransferComponent>(out var transfer))
+            {
+                builder.AppendFormat(@"Power Transfer:
+  Powernet: {0}
+", transfer.Parent.Uid);
+            }
+
             OpenDataWindowClientSide(user, builder.ToString());
         }
 
diff --git a/engine b/engine
index 693769cbd4..480a0b4a0a 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 693769cbd4f621b1d50bd8aea8a2bb2707bb629b
+Subproject commit 480a0b4a0abeb233f74ec4c6c6e31c7e6cc3c4fe