diff --git a/Anamnesis/Core/Memory/MemoryService.cs b/Anamnesis/Core/Memory/MemoryService.cs
index 7a5f77e74..a5b6c07e1 100644
--- a/Anamnesis/Core/Memory/MemoryService.cs
+++ b/Anamnesis/Core/Memory/MemoryService.cs
@@ -402,13 +402,16 @@ private async Task GetProcess()
 				await Dispatch.MainThread();
 				App.Current.MainWindow.Close();
 				App.Current.Shutdown();
-
 				return;
 			}
-
-			this.OpenProcess(proc);
-			await AddressService.Scan();
 #endif
+
+			if(proc != null)
+			{
+				this.OpenProcess(proc);
+				await AddressService.Scan();
+			}
+
 			IsProcessAlive = true;
 		}
 
diff --git a/Anamnesis/GameData/Excel/BattleNpc.cs b/Anamnesis/GameData/Excel/BattleNpc.cs
index 3990ace86..6c5f61860 100644
--- a/Anamnesis/GameData/Excel/BattleNpc.cs
+++ b/Anamnesis/GameData/Excel/BattleNpc.cs
@@ -15,7 +15,7 @@ namespace Anamnesis.GameData.Excel
 
 	using ExcelRow = Anamnesis.GameData.Sheets.ExcelRow;
 
-	[Sheet("BNpcBase", 0xdd911c47)]
+	[Sheet("BNpcBase", 0xfd8e0ebb)]
 	public class BattleNpc : ExcelRow, INpcBase
 	{
 		private string? name;
diff --git a/Anamnesis/GameData/Excel/CharaMakeCustomize.cs b/Anamnesis/GameData/Excel/CharaMakeCustomize.cs
index 38342d626..78dc131d2 100644
--- a/Anamnesis/GameData/Excel/CharaMakeCustomize.cs
+++ b/Anamnesis/GameData/Excel/CharaMakeCustomize.cs
@@ -10,7 +10,7 @@ namespace Anamnesis.GameData.Excel
 
 	using ExcelRow = Anamnesis.GameData.Sheets.ExcelRow;
 
-	[Sheet("CharaMakeCustomize", 0x2ba6bf0f)]
+	[Sheet("CharaMakeCustomize", 0xc30e9b73)]
 	public class CharaMakeCustomize : ExcelRow
 	{
 		public string Name { get; set; } = string.Empty;
diff --git a/Anamnesis/GameData/Excel/Mount.cs b/Anamnesis/GameData/Excel/Mount.cs
index 72b1ad0b5..1efc8067c 100644
--- a/Anamnesis/GameData/Excel/Mount.cs
+++ b/Anamnesis/GameData/Excel/Mount.cs
@@ -16,7 +16,7 @@ namespace Anamnesis.GameData.Excel
 
 	using ExcelRow = Anamnesis.GameData.Sheets.ExcelRow;
 
-	[Sheet("Mount", 0x85fb1418)]
+	[Sheet("Mount", 0x8885ae41)]
 	public class Mount : ExcelRow, INpcBase
 	{
 		private string? name;
diff --git a/Anamnesis/GameData/Excel/Ornament.cs b/Anamnesis/GameData/Excel/Ornament.cs
index a286cf835..e0eedf483 100644
--- a/Anamnesis/GameData/Excel/Ornament.cs
+++ b/Anamnesis/GameData/Excel/Ornament.cs
@@ -13,7 +13,7 @@ namespace Anamnesis.GameData.Excel
 
 	using ExcelRow = Anamnesis.GameData.Sheets.ExcelRow;
 
-	[Sheet("Ornament", 0x6768819a)]
+	[Sheet("Ornament", 0x72256cce)]
 	public class Ornament : ExcelRow, INpcBase
 	{
 		private string? name;
@@ -43,8 +43,8 @@ public override void PopulateData(RowParser parser, Lumina.GameData gameData, La
 
 			this.ModelCharaRow = (uint)parser.ReadColumn<ushort>(0);
 			this.AttachPoint = parser.ReadColumn<byte>(1);
-			this.Icon = parser.ReadImageReference<ushort>(5);
-			this.name = parser.ReadString(7);
+			this.Icon = parser.ReadImageReference<ushort>(7);
+			this.name = parser.ReadString(9);
 		}
 
 		public INpcAppearance? GetAppearance()
diff --git a/Anamnesis/Memory/ActorMemory.cs b/Anamnesis/Memory/ActorMemory.cs
index d10e05bc9..abe8e64ad 100644
--- a/Anamnesis/Memory/ActorMemory.cs
+++ b/Anamnesis/Memory/ActorMemory.cs
@@ -38,27 +38,27 @@ public enum CharacterFlagDefs : byte
 		[Bind(0x0B4)] public float Scale { get; set; }
 		[Bind(0x00F0, BindFlags.Pointer)] public ActorModelMemory? ModelObject { get; set; }
 		[Bind(0x01B4, BindFlags.ActorRefresh)] public int ModelType { get; set; }
-		[Bind(0x01E2)] public byte ClassJob { get; set; }
-		[Bind(0x07C4)] public bool IsMotionEnabled { get; set; }
-		[Bind(0x0C30, BindFlags.Pointer)] public ActorMemory? Mount { get; set; }
-		[Bind(0x0C38)] public ushort MountId { get; set; }
-		[Bind(0x0C58, BindFlags.Pointer)] public ActorMemory? Companion { get; set; }
-		[Bind(0x0C78)] public WeaponMemory? MainHand { get; set; }
-		[Bind(0x0CE0)] public WeaponMemory? OffHand { get; set; }
-		[Bind(0x0DB0)] public ActorEquipmentMemory? Equipment { get; set; }
-		[Bind(0x0DD8)] public ActorCustomizeMemory? Customize { get; set; }
-		[Bind(0x0DF6, BindFlags.ActorRefresh)] public CharacterFlagDefs CharacterFlags { get; set; }
-		[Bind(0x0E08, BindFlags.Pointer)] public ActorMemory? Ornament { get; set; }
-		[Bind(0x0F30)] public ushort TargetAnimation { get; set; }
-		[Bind(0x0FA4)] public float BaseAnimationSpeedInternal { get; set; }
-		[Bind(0x0FA8)] public float AnimationSpeedTrigger { get; set; }
-		[Bind(0x0FC0)] public float LipAnimationSpeedInternal { get; set; }
-		[Bind(0x110C)] public ushort BaseAnimationOverride { get; set; }
-		[Bind(0x110E)] public ushort LipAnimationOverride { get; set; }
-		[Bind(0x18B8)] public float Transparency { get; set; }
-		[Bind(0x19C0)] public byte CharacterModeRaw { get; set; }
-		[Bind(0x19C1)] public byte CharacterModeInput { get; set; }
-		[Bind(0x19F4)] public byte AttachmentPoint { get; set; }
+		[Bind(0x01E0)] public byte ClassJob { get; set; }
+		[Bind(0x0650, BindFlags.Pointer)] public ActorMemory? Mount { get; set; }
+		[Bind(0x0658)] public ushort MountId { get; set; }
+		[Bind(0x06B0, BindFlags.Pointer)] public ActorMemory? Companion { get; set; }
+		[Bind(0x06D0)] public WeaponMemory? MainHand { get; set; }
+		[Bind(0x0738)] public WeaponMemory? OffHand { get; set; }
+		[Bind(0x0808)] public ActorEquipmentMemory? Equipment { get; set; }
+		[Bind(0x0830)] public ActorCustomizeMemory? Customize { get; set; }
+		[Bind(0x084E, BindFlags.ActorRefresh)] public CharacterFlagDefs CharacterFlags { get; set; }
+		[Bind(0x0860, BindFlags.Pointer)] public ActorMemory? Ornament { get; set; }
+		[Bind(0x09A0)] public ushort TargetAnimation { get; set; }
+		[Bind(0x0A14)] public float BaseAnimationSpeedInternal { get; set; }
+		[Bind(0x0A18)] public float AnimationSpeedTrigger { get; set; }
+		[Bind(0x0A30)] public float LipAnimationSpeedInternal { get; set; }
+		[Bind(0x0B8C)] public ushort BaseAnimationOverride { get; set; }
+		[Bind(0x0B8E)] public ushort LipAnimationOverride { get; set; }
+		[Bind(0x11E4)] public bool IsMotionEnabled { get; set; }
+		[Bind(0x19E0)] public float Transparency { get; set; }
+		[Bind(0x1ABC)] public byte CharacterModeRaw { get; set; }
+		[Bind(0x1ABD)] public byte CharacterModeInput { get; set; }
+		[Bind(0x1AE4)] public byte AttachmentPoint { get; set; }
 
 		public History History { get; private set; } = new();
 
diff --git a/Anamnesis/Memory/ActorModelMemory.cs b/Anamnesis/Memory/ActorModelMemory.cs
index 5fbc77487..840ee3f87 100644
--- a/Anamnesis/Memory/ActorModelMemory.cs
+++ b/Anamnesis/Memory/ActorModelMemory.cs
@@ -44,7 +44,7 @@ public enum DataPaths : short
 		[Bind(0x050)] public TransformMemory? Transform { get; set; }
 		[Bind(0x0A0, BindFlags.Pointer | BindFlags.OnlyInGPose)] public SkeletonMemory? Skeleton { get; set; }
 		[Bind(0x148, BindFlags.Pointer)] public BustMemory? Bust { get; set; }
-		[Bind(0x240, 0x028, 0x020, BindFlags.Pointer)] public ExtendedAppearanceMemory? ExtendedAppearance { get; set; }
+		[Bind(0x240, 0x040, 0x020, BindFlags.Pointer)] public ExtendedAppearanceMemory? ExtendedAppearance { get; set; }
 		[Bind(0x26C)] public float Height { get; set; }
 		[Bind(0x2B0)] public float Wetness { get; set; }
 		[Bind(0x2BC)] public float Drenched { get; set; }
diff --git a/Anamnesis/VersionInfo.cs b/Anamnesis/VersionInfo.cs
index e5b53b764..651bb0847 100644
--- a/Anamnesis/VersionInfo.cs
+++ b/Anamnesis/VersionInfo.cs
@@ -16,6 +16,6 @@ public static class VersionInfo
 		/// <summary>
 		/// The latest gamve version that the tool has been validated for.
 		/// </summary>
-		public static readonly string ValidatedGameVersion = "2022.03.01.0000.0000";
+		public static readonly string ValidatedGameVersion = "2022.04.07.0000.0000";
 	}
 }