diff --git a/.vsconfig b/.vsconfig
index cf3175a..7f5f4b3 100644
--- a/.vsconfig
+++ b/.vsconfig
@@ -1,12 +1,13 @@
-{
+{
   "version": "1.0",
   "components": [
-    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
+    "Microsoft.Net.Component.4.6.2.TargetingPack",
+    "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64",
     "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.Windows10SDK",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
     "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Workload.NativeDesktop",
-    "Microsoft.VisualStudio.Workload.NativeGame",
-    "Microsoft.VisualStudio.Workload.Universal"
+    "Microsoft.VisualStudio.Workload.NativeGame"
   ]
 }
diff --git a/Content/Common/Blueprints/Components/UniverseComponent_BP.uasset b/Content/Common/Blueprints/Components/UniverseComponent_BP.uasset
index 57100d8..855c3aa 100644
Binary files a/Content/Common/Blueprints/Components/UniverseComponent_BP.uasset and b/Content/Common/Blueprints/Components/UniverseComponent_BP.uasset differ
diff --git a/Plugins/MaxQ/Content/Scenery/Earth/BP_Earth.uasset b/Plugins/MaxQ/Content/Scenery/Earth/BP_Earth.uasset
index 41585ed..c8c9055 100644
Binary files a/Plugins/MaxQ/Content/Scenery/Earth/BP_Earth.uasset and b/Plugins/MaxQ/Content/Scenery/Earth/BP_Earth.uasset differ
diff --git a/Plugins/MaxQ/MaxQ.uplugin b/Plugins/MaxQ/MaxQ.uplugin
index 9761c4c..aaec4cb 100644
--- a/Plugins/MaxQ/MaxQ.uplugin
+++ b/Plugins/MaxQ/MaxQ.uplugin
@@ -2,7 +2,7 @@
   "FileVersion": 3,
   "Version": 7,
   "VersionName": "1.0068.0",
-  "EngineVersion": "5.3",
+  "EngineVersion": "5.4",
   "FriendlyName": "MaxQ Spaceflight Toolkit",
   "Description": "MaxQ is powered by the SPICE Toolkit software released by NASA/JPL/NAIF, which is the premier Space Flight toolset for space flight planning and analysis.",
   "Category": "Spaceflight",
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Private/GetTelemetryFromServer.cpp b/Plugins/MaxQ/Source/MaxQCppSamples/Private/GetTelemetryFromServer.cpp
index 1a5d244..1989013 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Private/GetTelemetryFromServer.cpp
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Private/GetTelemetryFromServer.cpp
@@ -96,7 +96,7 @@ void UGetTelemetryFromServer_AsyncExecution::Activate()
                     FString Mistake;
 
                     switch (pRequest->GetStatus()) {
-                    case EHttpRequestStatus::Failed_ConnectionError:
+                    case EHttpRequestStatus::Failed:
                         Mistake = TEXT("Connection failed.");
                     default:
                         Mistake = TEXT("Request failed.");
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample04Actor.cpp b/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample04Actor.cpp
index 877730e..6f61ec2 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample04Actor.cpp
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample04Actor.cpp
@@ -6,6 +6,7 @@
 // GitHub:         https://github.com/Gamergenic1/MaxQ/ 
 
 #include "Sample04Actor.h"
+#include "Engine/Engine.h"
 #include "Spice.h"
 
 using MaxQSamples::Log;
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample05Actor.cpp b/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample05Actor.cpp
index 03035e2..7d75afd 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample05Actor.cpp
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample05Actor.cpp
@@ -11,6 +11,7 @@
 #include "SampleUtilities.h"
 #include "Sample05TelemetryActor.h"
 #include "SpiceOrbits.h"
+#include "Engine/Engine.h"
 #include "GetTelemetryFromServer.h"
 
 using MaxQSamples::Log;
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample06Actor.cpp b/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample06Actor.cpp
index ae68443..218890e 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample06Actor.cpp
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Private/Sample06Actor.cpp
@@ -9,6 +9,7 @@
 #include "Misc/Paths.h"
 #include "HAL/FileManager.h"
 #include "GenericPlatform/GenericPlatformMisc.h"
+#include "Engine/Engine.h"
 #include "Spice.h"
 
 using MaxQSamples::Log;
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Private/SampleUtilities.cpp b/Plugins/MaxQ/Source/MaxQCppSamples/Private/SampleUtilities.cpp
index adcd5a6..9e2c7c3 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Private/SampleUtilities.cpp
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Private/SampleUtilities.cpp
@@ -9,6 +9,11 @@
 #include "HttpModule.h"
 #include "Interfaces/IHttpRequest.h"
 #include "Interfaces/IHttpResponse.h"
+#include "Engine/Engine.h"
+#include "Engine/StaticMesh.h"
+#include "HAL/FileManager.h"
+#include "Misc/Paths.h"
+#include "Components/StaticMeshComponent.h"
 #include "Spice.h"
 
 #if WITH_EDITOR
@@ -646,7 +651,7 @@ void USampleUtilities::GetTelemetryFromServer(FTelemetryCallback Callback, FStri
                     FString Mistake;
 
                     switch (pRequest->GetStatus()) {
-                    case EHttpRequestStatus::Failed_ConnectionError:
+                    case EHttpRequestStatus::Failed:
                         Mistake = TEXT("Connection failed.");
                     default:
                         Mistake = TEXT("Request failed.");
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample04Actor.h b/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample04Actor.h
index 0b540c0..29c1c3e 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample04Actor.h
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample04Actor.h
@@ -12,6 +12,7 @@
 #include "SpiceTypes.h"
 #include "SampleUtilities.h"
 #include "UObject/WeakObjectPtrTemplates.h"
+#include "GameFramework/Actor.h"
 #include "Sample04Actor.generated.h"
 
 class AActor;
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample06Actor.h b/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample06Actor.h
index 9c0a6bf..235cb4d 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample06Actor.h
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Public/Sample06Actor.h
@@ -11,6 +11,7 @@
 #include "SpiceConstants.h"
 #include "SpiceTypes.h"
 #include "SampleUtilities.h"
+#include "GameFramework/Actor.h"
 #include "UObject/WeakObjectPtrTemplates.h"
 #include "Sample06Actor.generated.h"
 
diff --git a/Plugins/MaxQ/Source/MaxQCppSamples/Public/SampleUtilities.h b/Plugins/MaxQ/Source/MaxQCppSamples/Public/SampleUtilities.h
index 46b9b3d..8100031 100644
--- a/Plugins/MaxQ/Source/MaxQCppSamples/Public/SampleUtilities.h
+++ b/Plugins/MaxQ/Source/MaxQCppSamples/Public/SampleUtilities.h
@@ -12,6 +12,7 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Kismet/BlueprintAsyncActionBase.h"
 #include "UObject/WeakObjectPtrTemplates.h"
+#include "GameFramework/Actor.h"
 #include "SampleUtilities.generated.h"
 
 
diff --git a/Plugins/MaxQ/Source/Spice/Public/SpiceConstants.h b/Plugins/MaxQ/Source/Spice/Public/SpiceConstants.h
index 1dde7a6..f57c759 100644
--- a/Plugins/MaxQ/Source/Spice/Public/SpiceConstants.h
+++ b/Plugins/MaxQ/Source/Spice/Public/SpiceConstants.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
+
 #pragma region NaifFNames
 namespace MaxQ::Constants
 {
diff --git a/Plugins/MaxQ/Source/Spice/Public/SpiceData.h b/Plugins/MaxQ/Source/Spice/Public/SpiceData.h
index 4681340..cc25718 100644
--- a/Plugins/MaxQ/Source/Spice/Public/SpiceData.h
+++ b/Plugins/MaxQ/Source/Spice/Public/SpiceData.h
@@ -25,6 +25,8 @@
 #pragma once
 
 #include "SpiceTypes.h"
+#include "Misc/Paths.h"
+#include "HAL/FileManager.h"
 
 namespace MaxQ::Data
 {
diff --git a/Plugins/MaxQ/Source/Spice/Public/SpiceEnums.h b/Plugins/MaxQ/Source/Spice/Public/SpiceEnums.h
index 5adf00e..b591fa8 100644
--- a/Plugins/MaxQ/Source/Spice/Public/SpiceEnums.h
+++ b/Plugins/MaxQ/Source/Spice/Public/SpiceEnums.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
 #include "SpicePlatformDefs.h"
 
 UENUM(BlueprintType)
diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp
index f935dab..da1befc 100644
--- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp
+++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_hat.cpp
@@ -281,18 +281,18 @@ void UK2Node_hat::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegist
 
 FText UK2Node_hat::GetNodeTitle(ENodeTitleType::Type TitleType) const
 {
-    constexpr bool bUseShortNameForTitle{ true };
+    // constexpr bool bUseShortNameForTitle{ true };
 
     switch (TitleType)
     {
     case ENodeTitleType::FullTitle:
         /** The full title, may be multiple lines. */
         return LOCTEXT("ListViewTitle", "vhat");
-        if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
-        {
-            return FText::FromString(FString::Printf(TEXT("vhat %s"), *OperandType.TypeName.ToString()));
-        }
-        break;
+        // if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
+        // {
+        //     return FText::FromString(FString::Printf(TEXT("vhat %s"), *OperandType.TypeName.ToString()));
+        // }
+        // break;
     case ENodeTitleType::MenuTitle:
         /** Menu Title for context menus to be displayed in context menus referencing the node. */
         return LOCTEXT("MenuTitle", "vhat - Unit vector");
diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp
index 722bdd3..184a15b 100644
--- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp
+++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_minus.cpp
@@ -289,18 +289,18 @@ void UK2Node_minus::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegi
 
 FText UK2Node_minus::GetNodeTitle(ENodeTitleType::Type TitleType) const
 {
-    constexpr bool bUseShortNameForTitle{ true };
+    // constexpr bool bUseShortNameForTitle{ true };
 
     switch (TitleType)
     {
     case ENodeTitleType::FullTitle:
         /** The full title, may be multiple lines. */
         return LOCTEXT("ListViewTitle", "vminus");
-        if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
-        {
-            return FText::FromString(FString::Printf(TEXT("vminus %s"), *OperandType.TypeName.ToString()));
-        }
-        break;
+        // if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
+        // {
+        //     return FText::FromString(FString::Printf(TEXT("vminus %s"), *OperandType.TypeName.ToString()));
+        // }
+        // break;
     case ENodeTitleType::MenuTitle:
         /** Menu Title for context menus to be displayed in context menus referencing the node. */
         return LOCTEXT("MenuTitle", "vminus - Negate vector");
diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp
index f536522..0762ec2 100644
--- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp
+++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_pack.cpp
@@ -412,18 +412,18 @@ void UK2Node_pack::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegis
 
 FText UK2Node_pack::GetNodeTitle(ENodeTitleType::Type TitleType) const
 {
-    constexpr bool bUseShortNameForTitle{ true };
+    // constexpr bool bUseShortNameForTitle{ true };
 
     switch (TitleType)
     {
     case ENodeTitleType::FullTitle:
         /** The full title, may be multiple lines. */
         return LOCTEXT("ListViewTitle", "vpack");
-        if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
-        {
-            return FText::FromString(FString::Printf(TEXT("vpack %s"), *OperandType.TypeName.ToString()));
-        }
-        break;
+        // if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
+        // {
+        //     return FText::FromString(FString::Printf(TEXT("vpack %s"), *OperandType.TypeName.ToString()));
+        // }
+        // break;
     case ENodeTitleType::MenuTitle:
         /** Menu Title for context menus to be displayed in context menus referencing the node. */
         return LOCTEXT("MenuTitle", "vpack - Pack/Init MaxQ vector");
diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp
index 69e92c7..d35bbdf 100644
--- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp
+++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_upack.cpp
@@ -395,18 +395,18 @@ void UK2Node_upack::GetMenuActions(FBlueprintActionDatabaseRegistrar& ActionRegi
 
 FText UK2Node_upack::GetNodeTitle(ENodeTitleType::Type TitleType) const
 {
-    constexpr bool bUseShortNameForTitle{ true };
+    // constexpr bool bUseShortNameForTitle{ true };
 
     switch (TitleType)
     {
     case ENodeTitleType::FullTitle:
         /** The full title, may be multiple lines. */
         return LOCTEXT("ListViewTitle", "vupack");
-        if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
-        {
-            return FText::FromString(FString::Printf(TEXT("vupack %s"), *OperandType.TypeName.ToString()));
-        }
-        break;
+        // if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
+        // {
+        //     return FText::FromString(FString::Printf(TEXT("vupack %s"), *OperandType.TypeName.ToString()));
+        // }
+        // break;
     case ENodeTitleType::MenuTitle:
         /** Menu Title for context menus to be displayed in context menus referencing the node. */
         return LOCTEXT("MenuTitle", "vupack - Unpack MaxQ vector");
diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp
index 45ebe5c..66b8585 100644
--- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp
+++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vadd.cpp
@@ -26,18 +26,18 @@ UK2Node_vadd::UK2Node_vadd()
 
 FText UK2Node_vadd::GetNodeTitle(ENodeTitleType::Type TitleType) const
 {
-    constexpr bool bUseShortNameForTitle{ true };
+    // constexpr bool bUseShortNameForTitle{ true };
 
     switch (TitleType)
     {
     case ENodeTitleType::FullTitle:
         /** The full title, may be multiple lines. */
         return LOCTEXT("ListViewTitle", "vadd");
-        if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
-        {
-            return FText::FromString(FString::Printf(TEXT("vadd %s"), *OperandType.TypeName.ToString()));
-        }
-        break;
+        // if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
+        // {
+        //     return FText::FromString(FString::Printf(TEXT("vadd %s"), *OperandType.TypeName.ToString()));
+        // }
+        // break;
     case ENodeTitleType::MenuTitle:
         /** Menu Title for context menus to be displayed in context menus referencing the node. */
         return LOCTEXT("MenuTitle", "vadd - Add MaxQ vectors");
diff --git a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp
index 40904ce..e407f0c 100644
--- a/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp
+++ b/Plugins/MaxQ/Source/SpiceUncooked/Private/K2Node_vsub.cpp
@@ -26,18 +26,18 @@ UK2Node_vsub::UK2Node_vsub()
 
 FText UK2Node_vsub::GetNodeTitle(ENodeTitleType::Type TitleType) const
 {
-    constexpr bool bUseShortNameForTitle{ true };
+    // constexpr bool bUseShortNameForTitle{ true };
 
     switch (TitleType)
     {
     case ENodeTitleType::FullTitle:
         return LOCTEXT("ListViewTitle", "vsub");
-        if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
-        {
-            /** The full title, may be multiple lines. */
-            return FText::FromString(FString::Printf(TEXT("vsub %s"), *OperandType.TypeName.ToString()));
-        }
-        break;
+        // if (!bUseShortNameForTitle && !OperandType.TypeName.IsNone())
+        // {
+        //     /** The full title, may be multiple lines. */
+        //     return FText::FromString(FString::Printf(TEXT("vsub %s"), *OperandType.TypeName.ToString()));
+        // }
+        // break;
     case ENodeTitleType::MenuTitle:
         /** Menu Title for context menus to be displayed in context menus referencing the node. */
         return LOCTEXT("MenuTitle", "vsub - Subtract two MaxQ vectors");
diff --git a/Source/SpiceEditor.Target.cs b/Source/SpiceEditor.Target.cs
index cb503fc..08947f3 100644
--- a/Source/SpiceEditor.Target.cs
+++ b/Source/SpiceEditor.Target.cs
@@ -28,6 +28,7 @@ public SpiceEditorTarget(TargetInfo Target) : base(Target)
         bUseFastPDBLinking = false;
         bPublicSymbolsByDefault = true;  // <- Forced to true on Windows anyways
         WindowsPlatform.bStripUnreferencedSymbols = false;
+        bOverrideBuildEnvironment = true;
 
         ExtraModuleNames.Add("Spice");
         ExtraModuleNames.Add("MaxQMain");
diff --git a/Spice.uproject b/Spice.uproject
index 459216a..3170b56 100644
--- a/Spice.uproject
+++ b/Spice.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "5.3",
+	"EngineAssociation": "5.4",
 	"Category": "",
 	"Description": "",
 	"Modules": [
@@ -16,8 +16,10 @@
 			"Enabled": true,
 			"SupportedTargetPlatforms": [
 				"Win64",
-				"Mac"
-			]
+				"Mac",
+				"Android"
+			],
+			"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/146e96d801ed4d8d930b41bfeca53733"
 		}
 	],
 	"TargetPlatforms": [