diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs
index c38b1627..50698b42 100644
--- a/Questionable/Controller/QuestController.cs
+++ b/Questionable/Controller/QuestController.cs
@@ -141,7 +141,6 @@ internal sealed class QuestController
 
     public void Update()
     {
-        Comment = null;
         DebugState = null;
 
         (ushort currentQuestId, byte currentSequence) = _gameFunctions.GetCurrentQuest();
@@ -161,6 +160,7 @@ internal sealed class QuestController
         if (CurrentQuest == null)
         {
             DebugState = "No quest active";
+            Comment = null;
             return;
         }
 
@@ -193,18 +193,21 @@ internal sealed class QuestController
         if (sequence == null)
         {
             DebugState = "Sequence not found";
+            Comment = null;
             return;
         }
 
         if (CurrentQuest.Step == 255)
         {
             DebugState = "Step completed";
+            Comment = null;
             return;
         }
 
         if (CurrentQuest.Step >= sequence.Steps.Count)
         {
             DebugState = "Step not found";
+            Comment = null;
             return;
         }
 
@@ -373,10 +376,12 @@ internal sealed class QuestController
             if (!step.DisableNavmesh)
             {
                 if (step.Mount != false && actualDistance > 30f && !_condition[ConditionFlag.Mounted] &&
-                    _territoryData.CanUseMount(_clientState.TerritoryType))
+                    _territoryData.CanUseMount(_clientState.TerritoryType) &&
+                    !_gameFunctions.HasStatusPreventingSprintOrMount())
                 {
                     if (ActionManager.Instance()->GetActionStatus(ActionType.Mount, 71) == 0)
                         ActionManager.Instance()->UseAction(ActionType.Mount, 71);
+
                     return;
                 }
 
diff --git a/Questionable/GameFunctions.cs b/Questionable/GameFunctions.cs
index 14499a72..31670dc9 100644
--- a/Questionable/GameFunctions.cs
+++ b/Questionable/GameFunctions.cs
@@ -393,7 +393,7 @@ internal sealed unsafe class GameFunctions
         {
             var battleChara = (BattleChara*)gameObject;
             StatusManager* statusManager = battleChara->GetStatusManager;
-            return statusManager->HasStatus(565);
+            return statusManager->HasStatus(565) || statusManager->HasStatus(404);
         }
 
         return false;
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4288_You and the Ailouros.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4288_You and the Ailouros.json
new file mode 100644
index 00000000..a65d79bc
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4288_You and the Ailouros.json	
@@ -0,0 +1,96 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1037969,
+          "Position": {
+            "X": -611.90204,
+            "Y": -22.39482,
+            "Z": 510.42944
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1041141,
+          "Position": {
+            "X": -614.313,
+            "Y": -22.39482,
+            "Z": 509.72766
+          },
+          "TerritoryId": 961,
+          "InteractionType": "ManualAction",
+          "Comment": "Follow"
+        },
+        {
+          "Position": {
+            "X": -838.7837,
+            "Y": -39.605896,
+            "Z": 518.9479
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo",
+          "Comment": "Unsure if this is sequence 1"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -838.7837,
+            "Y": -39.605896,
+            "Z": 518.9479
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [
+            14064,
+            14065
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1041137,
+          "Position": {
+            "X": -819.6994,
+            "Y": -38.65795,
+            "Z": 506.43152
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1037969,
+          "Position": {
+            "X": -611.90204,
+            "Y": -22.39482,
+            "Z": 510.42944
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4313_The Perks of Being a Lost Flower.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4313_The Perks of Being a Lost Flower.json
new file mode 100644
index 00000000..6eff55ff
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4313_The Perks of Being a Lost Flower.json	
@@ -0,0 +1,68 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1041847,
+          "Position": {
+            "X": -484.2146,
+            "Y": 141.86789,
+            "Z": -97.21527
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1041848,
+          "Position": {
+            "X": 258.35046,
+            "Y": -10.140662,
+            "Z": -95.71985
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Elpis - Anagnorisis"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1041848,
+          "Position": {
+            "X": -175.03741,
+            "Y": 12.098856,
+            "Z": 6.8771067
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1041847,
+          "Position": {
+            "X": -484.2146,
+            "Y": 141.86789,
+            "Z": -97.21527
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Elpis - Poieten Oikos"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4507_Touring Anagnorisis Part 1.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4507_Touring Anagnorisis Part 1.json
new file mode 100644
index 00000000..43874793
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4507_Touring Anagnorisis Part 1.json	
@@ -0,0 +1,108 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1041328,
+          "Position": {
+            "X": 166.39954,
+            "Y": 9.457411,
+            "Z": 236.34692
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1041329,
+          "Position": {
+            "X": 233.99707,
+            "Y": 8.289929,
+            "Z": 270.71033
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1041329,
+          "Position": {
+            "X": 233.99707,
+            "Y": 8.289929,
+            "Z": 270.71033
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1037947,
+          "Position": {
+            "X": 115.28186,
+            "Y": 7.385857,
+            "Z": 306.11108
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "$.0": "[1]",
+          "$.1": "QuestVariables if done first: 17 0 0 0 0 64"
+        },
+        {
+          "DataId": 1037945,
+          "Position": {
+            "X": 144.79285,
+            "Y": 8.025643,
+            "Z": 202.47192
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "$.0": "[2]",
+          "$.2": "QuestVariables if done after [1]: 33 16 0 0 0 96",
+          "$.3": "QuestVariables if done after [3]: 32 17 0 0 0 160"
+        },
+        {
+          "DataId": 1037962,
+          "Position": {
+            "X": 180.8346,
+            "Y": 10.385859,
+            "Z": 113.35925
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "$.0": 3,
+          "$.1": "QuestVariables if done first: 16 1 0 0 0 128"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1041328,
+          "Position": {
+            "X": 166.39954,
+            "Y": 9.457411,
+            "Z": 236.34692
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4511_An Expected Guest.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4511_An Expected Guest.json
new file mode 100644
index 00000000..bc3a4f1e
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4511_An Expected Guest.json	
@@ -0,0 +1,71 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1041369,
+          "Position": {
+            "X": -639.85657,
+            "Y": 162.30406,
+            "Z": -189.47137
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -318.20203,
+            "Y": 147.32677,
+            "Z": -31.146088
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [
+            14070
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1040888,
+          "Position": {
+            "X": -320.0885,
+            "Y": 147.4287,
+            "Z": -30.594421
+          },
+          "StopDistance": 5,
+          "TerritoryId": 961,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1041369,
+          "Position": {
+            "X": -639.85657,
+            "Y": 162.30406,
+            "Z": -189.47137
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Elpis - Poieten Oikos"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4216_Best Delivered Cold.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4216_Best Delivered Cold.json
new file mode 100644
index 00000000..1f2d90fe
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4216_Best Delivered Cold.json	
@@ -0,0 +1,67 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1040898,
+          "Position": {
+            "X": -433.12738,
+            "Y": 22.221891,
+            "Z": 460.80713
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1040899,
+          "Position": {
+            "X": -233.44781,
+            "Y": 22.17031,
+            "Z": 443.71704
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1040899,
+          "Position": {
+            "X": 156.03712,
+            "Y": -19.711596,
+            "Z": 562.5593
+          },
+          "StopDistance": 1,
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1041122,
+          "Position": {
+            "X": 134.844,
+            "Y": -13.286316,
+            "Z": 649.8054
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json
new file mode 100644
index 00000000..4d3c6d48
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json	
@@ -0,0 +1,108 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1041753,
+          "Position": {
+            "X": -321.49237,
+            "Y": 22.009079,
+            "Z": 424.00232
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1041754,
+          "Position": {
+            "X": -340.84082,
+            "Y": 22,
+            "Z": 500.57214
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1041754,
+          "Position": {
+            "X": -340.84082,
+            "Y": 22,
+            "Z": 500.57214
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2012616,
+          "Position": {
+            "X": -332.3263,
+            "Y": 22.354431,
+            "Z": 457.7859
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact",
+          "$.0": "[1]",
+          "$.1": "QuestVariables if done first: 16 1 0 0 0 128"
+        },
+        {
+          "DataId": 2012618,
+          "Position": {
+            "X": -338.03314,
+            "Y": 23.727722,
+            "Z": 394.88806
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact",
+          "$.0": "[2]",
+          "$.1": "QuestVariables if done first: 16 16 0 0 0 32",
+          "$.2": "QuestVariables if done after [1]: 32 17 0 0 0 160"
+        },
+        {
+          "DataId": 2012617,
+          "Position": {
+            "X": -434.8974,
+            "Y": 22.262878,
+            "Z": 425.58936
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact",
+          "$.0": "[3]",
+          "$.1": "QuestVariables if done first: 17 0 0 0 0 64"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1041755,
+          "Position": {
+            "X": -340.35254,
+            "Y": 22,
+            "Z": 502.037
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4502_Stranded at the Station.json b/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4502_Stranded at the Station.json
new file mode 100644
index 00000000..0f535400
--- /dev/null
+++ b/Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4502_Stranded at the Station.json	
@@ -0,0 +1,52 @@
+{
+  "Version": 1,
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1041765,
+          "Position": {
+            "X": -323.4455,
+            "Y": 22,
+            "Z": 487.81555
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1041766,
+          "Position": {
+            "X": 513.6339,
+            "Y": -19.82022,
+            "Z": -309.1936
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Garlemald - Tertium"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1041767,
+          "Position": {
+            "X": 541.03906,
+            "Y": -36.65,
+            "Z": -132.46362
+          },
+          "TerritoryId": 958,
+          "InteractionType": "Interact"
+        }
+      ]
+    }
+  ]
+}
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4429_Travelers at the Crossroads.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4429_Travelers at the Crossroads.json
index 7d19f42f..afb984db 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4429_Travelers at the Crossroads.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4429_Travelers at the Crossroads.json	
@@ -58,6 +58,7 @@
             "Y": 161.78714,
             "Z": 26.108154
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4430_A Past Not Yet Come to Pass.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4430_A Past Not Yet Come to Pass.json
index e87afc72..be205917 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4430_A Past Not Yet Come to Pass.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4430_A Past Not Yet Come to Pass.json	
@@ -27,6 +27,7 @@
             "Y": 161.24207,
             "Z": -222.2782
           },
+          "StopDistance": 7,
           "TerritoryId": 961,
           "InteractionType": "AttuneAetheryte"
         },
@@ -106,6 +107,15 @@
     {
       "Sequence": 6,
       "Steps": [
+        {
+          "Position": {
+            "X": -585.33386,
+            "Y": 159.16429,
+            "Z": -197.54811
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1040117,
           "Position": {
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4431_Witness to the Spectacle.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4431_Witness to the Spectacle.json
index 2fcb9fdc..d33ae5e4 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4431_Witness to the Spectacle.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4431_Witness to the Spectacle.json	
@@ -43,7 +43,8 @@
             "Z": -108.99524
           },
           "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818382
         },
         {
           "DataId": 1040121,
@@ -112,6 +113,7 @@
             "Y": 178.07872,
             "Z": -334.5846
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json
index f1c95840..05ebba34 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json	
@@ -12,6 +12,7 @@
             "Y": 178.07872,
             "Z": -334.5846
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
@@ -29,7 +30,16 @@
           },
           "TerritoryId": 961,
           "InteractionType": "AttuneAetherCurrent",
-          "Comment": "Might be faster when initially entering the Island"
+          "AetherCurrentId": 2818383
+        },
+        {
+          "Position": {
+            "X": -297.88638,
+            "Y": 146.9291,
+            "Z": 84.30863
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo"
         },
         {
           "DataId": 2012149,
@@ -69,6 +79,7 @@
             "Y": 138.676,
             "Z": 62.302612
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4433_A Flower upon Your Return.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4433_A Flower upon Your Return.json
index 5c722fd0..b170af58 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4433_A Flower upon Your Return.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4433_A Flower upon Your Return.json	
@@ -12,6 +12,7 @@
             "Y": 138.676,
             "Z": 62.302612
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
@@ -20,6 +21,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 2012026,
+          "Position": {
+            "X": -555.6268,
+            "Y": 158.09863,
+            "Z": 172.41162
+          },
+          "TerritoryId": 961,
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818380
+        },
         {
           "DataId": 1040132,
           "Position": {
@@ -50,16 +62,6 @@
     {
       "Sequence": 3,
       "Steps": [
-        {
-          "DataId": 2012026,
-          "Position": {
-            "X": -555.6268,
-            "Y": 158.09863,
-            "Z": 172.41162
-          },
-          "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent"
-        },
         {
           "DataId": 2012027,
           "Position": {
@@ -68,7 +70,9 @@
             "Z": -293.59882
           },
           "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818381,
+          "AetheryteShortcut": "Elpis - Poieten Oikos"
         },
         {
           "DataId": 2012151,
@@ -92,6 +96,7 @@
             "Y": 294.93375,
             "Z": -559.62463
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
@@ -108,7 +113,8 @@
             "Z": -691.3405
           },
           "TerritoryId": 961,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818379
         },
         {
           "DataId": 1040135,
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4434_Hunger in the Garden.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4434_Hunger in the Garden.json
index 23da242d..6928b2f8 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4434_Hunger in the Garden.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4434_Hunger in the Garden.json	
@@ -12,6 +12,7 @@
             "Y": 329.81177,
             "Z": -760.1892
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4435_Words without Sound.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4435_Words without Sound.json
index 561c1a16..6ab08d04 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4435_Words without Sound.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4435_Words without Sound.json	
@@ -87,6 +87,7 @@
             "Y": 148.76953,
             "Z": -417.34955
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4436_Follow Wander Stumble Listen.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4436_Follow Wander Stumble Listen.json
index bbfa4834..d5d0a8ba 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4436_Follow Wander Stumble Listen.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4436_Follow Wander Stumble Listen.json	
@@ -12,6 +12,7 @@
             "Y": 148.81448,
             "Z": -418.53973
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
@@ -35,6 +36,16 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": 463.18567,
+            "Y": 138.58543,
+            "Z": -273.41803
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 2012169,
           "Position": {
@@ -50,6 +61,15 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": 726.4087,
+            "Y": 139.19812,
+            "Z": -131.47159
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 2012170,
           "Position": {
@@ -87,6 +107,7 @@
             "Y": 151.56888,
             "Z": -303.88342
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json
index 6555aa92..a9b5edd7 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json	
@@ -15,6 +15,7 @@
             "Y": 151.51599,
             "Z": -303.39514
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
@@ -45,6 +46,7 @@
             "Y": 329.9458,
             "Z": -765.80457
           },
+          "StopDistance": 4,
           "TerritoryId": 961,
           "InteractionType": "ManualAction",
           "Comment": "Duty - Ktisis Hyperborea"
@@ -61,6 +63,7 @@
             "Y": -17.131165,
             "Z": 49.66809
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4438_Thou Must Live Die and Know.json b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4438_Thou Must Live Die and Know.json
index 2eee0a25..2729997b 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4438_Thou Must Live Die and Know.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4438_Thou Must Live Die and Know.json	
@@ -12,6 +12,7 @@
             "Y": -17.131165,
             "Z": 49.66809
           },
+          "StopDistance": 5,
           "TerritoryId": 961,
           "InteractionType": "Interact"
         }
@@ -28,7 +29,8 @@
             "Z": 790.70715
           },
           "TerritoryId": 961,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
@@ -59,6 +61,7 @@
           },
           "TerritoryId": 962,
           "InteractionType": "Interact",
+          "AetheryteShortcut": "Old Sharlayan",
           "AethernetShortcut": [
             "[Old Sharlayan] Aetheryte Plaza",
             "[Old Sharlayan] The Baldesion Annex"
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json
index 287461ea..79b56e00 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json	
@@ -29,6 +29,7 @@
           },
           "TerritoryId": 958,
           "InteractionType": "ManualAction",
+          "AetheryteShortcut": "Garlemald - Camp Broken Glass",
           "Comment": "Duty - As the Heavens Burn"
         }
       ]
@@ -43,6 +44,7 @@
             "Y": 21.999998,
             "Z": 416.3423
           },
+          "StopDistance": 6,
           "TerritoryId": 958,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4440_Outside Help.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4440_Outside Help.json
index 010038ce..1f68f627 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4440_Outside Help.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4440_Outside Help.json	
@@ -12,6 +12,7 @@
             "Y": 22.030764,
             "Z": 419.94336
           },
+          "StopDistance": 5,
           "TerritoryId": 958,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4441_Going Underground.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4441_Going Underground.json
index f05f28ac..9654a723 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4441_Going Underground.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4441_Going Underground.json	
@@ -12,6 +12,7 @@
             "Y": 40.2,
             "Z": -234.21082
           },
+          "StopDistance": 5,
           "TerritoryId": 962,
           "InteractionType": "Interact"
         }
@@ -28,7 +29,8 @@
             "Z": -453.42188
           },
           "TerritoryId": 956,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Labyrinthos - Archeion"
         }
       ]
     },
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4442_No Job Too Small.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4442_No Job Too Small.json
index a7cc4daa..f0bfbd39 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4442_No Job Too Small.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4442_No Job Too Small.json	
@@ -12,6 +12,7 @@
             "Y": -30.155542,
             "Z": 638.7273
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -20,6 +21,26 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": -102.94707,
+            "Y": -29.933468,
+            "Z": 674.6727
+          },
+          "TerritoryId": 956,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": -118.62926,
+            "Y": -22.071072,
+            "Z": 681.35846
+          },
+          "TerritoryId": 956,
+          "InteractionType": "ManualAction",
+          "DisableNavmesh": true,
+          "Comment": "Navmesh can't jump"
+        },
         {
           "DataId": 2011986,
           "Position": {
@@ -28,8 +49,27 @@
             "Z": 676.7223
           },
           "TerritoryId": 956,
-          "InteractionType": "ManualAction",
-          "Comment": "Attune to Aether Current #4"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818317
+        },
+        {
+          "Position": {
+            "X": -114.01625,
+            "Y": -30.313616,
+            "Z": 670.05585
+          },
+          "TerritoryId": 956,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
+        {
+          "Position": {
+            "X": 79.66557,
+            "Y": -29.904594,
+            "Z": 457.04776
+          },
+          "TerritoryId": 956,
+          "InteractionType": "WalkTo"
         },
         {
           "DataId": 2011989,
@@ -39,7 +79,8 @@
             "Z": 178.85095
           },
           "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818323
         },
         {
           "DataId": 1039750,
@@ -56,16 +97,6 @@
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "DataId": 1037253,
-          "Position": {
-            "X": 34.74475,
-            "Y": -28.549177,
-            "Z": 45.548096
-          },
-          "TerritoryId": 956,
-          "InteractionType": "Interact"
-        },
         {
           "DataId": 1037271,
           "Position": {
@@ -74,7 +105,21 @@
             "Z": 31.021484
           },
           "TerritoryId": 956,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "$.0": "[1] Navmesh navigates here first, even if you feed it [2]",
+          "$.1": "QuestVariables if done first: 1 0 0 0 0 64"
+        },
+        {
+          "DataId": 1037253,
+          "Position": {
+            "X": 34.74475,
+            "Y": -28.549177,
+            "Z": 45.548096
+          },
+          "TerritoryId": 956,
+          "InteractionType": "Interact",
+          "$.0": "[2]",
+          "$.1": "QuestVariables after: 2 0 0 0 0 192"
         },
         {
           "DataId": 1037275,
@@ -98,6 +143,7 @@
             "Y": -27.542603,
             "Z": -46.67737
           },
+          "StopDistance": 7,
           "TerritoryId": 956,
           "InteractionType": "AttuneAetheryte"
         },
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json
index f3379298..f129fce7 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json	
@@ -12,6 +12,7 @@
             "Y": -31.53043,
             "Z": -78.324646
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -42,6 +43,7 @@
             "Y": -17.532654,
             "Z": -77.073364
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "ManualAction",
           "Comment": "Find Points of Interest"
@@ -60,6 +62,7 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             13983
           ]
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4444_Agriculture Shock.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4444_Agriculture Shock.json
index b5bb49f8..4b0a5aad 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4444_Agriculture Shock.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4444_Agriculture Shock.json	
@@ -12,6 +12,7 @@
             "Y": 79.691376,
             "Z": 299.8855
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -53,10 +54,11 @@
         {
           "DataId": 1040402,
           "Position": {
-            "X": 423.0226,
-            "Y": 65.26492,
-            "Z": -119.98032
+            "X": 422.61563,
+            "Y": 65.31176,
+            "Z": -121.74779
           },
+          "StopDistance": 0.25,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -68,10 +70,11 @@
         {
           "DataId": 1040402,
           "Position": {
-            "X": 409.65042,
+            "X": 407.89633,
             "Y": 65.16199,
-            "Z": -119.04752
+            "Z": -119.62697
           },
+          "StopDistance": 0.25,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -83,10 +86,11 @@
         {
           "DataId": 1040402,
           "Position": {
-            "X": 462.06644,
+            "X": 463.33115,
             "Y": 65.16199,
-            "Z": -67.42904
+            "Z": -66.60645
           },
+          "StopDistance": 0.25,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -98,10 +102,11 @@
         {
           "DataId": 1040402,
           "Position": {
-            "X": 485.29535,
+            "X": 485.30798,
             "Y": 65.16199,
-            "Z": -96.03572
+            "Z": -96.01148
           },
+          "StopDistance": 0.25,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4445_Sage Council.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4445_Sage Council.json
index 059b841f..0ebd791c 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4445_Sage Council.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4445_Sage Council.json	
@@ -20,6 +20,16 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": 5.4520116,
+            "Y": -28.723352,
+            "Z": -42.992764
+          },
+          "TerritoryId": 956,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Labyrinthos - Sharlayan Hamlet"
+        },
         {
           "DataId": 1039687,
           "Position": {
@@ -59,7 +69,8 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Distracted Researcher"
+          "Comment": "Distracted Researcher",
+          "$.1": "QuestVariables if done first: 1 0 0 0 2 0"
         },
         {
           "DataId": 1040416,
@@ -70,7 +81,8 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Hyperventilating Engineer"
+          "Comment": "Hyperventilating Engineer",
+          "$.1": "QuestVariables if done after [1]: 2 0 0 0 130 0"
         },
         {
           "DataId": 1040420,
@@ -81,7 +93,8 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Harried Aetherologist"
+          "Comment": "Harried Aetherologist",
+          "$.1": "QuestVariables if done after [2]: 3 0 0 0 138 0"
         },
         {
           "DataId": 1040421,
@@ -92,7 +105,8 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Grimacing Naturalist"
+          "Comment": "Grimacing Naturalist",
+          "$.1": "QuestVariables if done after [3]: 4 0 0 0 142 0"
         },
         {
           "DataId": 1040417,
@@ -103,7 +117,8 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Ponderous Mathematician"
+          "Comment": "Ponderous Mathematician",
+          "$.1": "QuestVariables if done after [4]: 5 0 0 0 206 0"
         },
         {
           "DataId": 1040418,
@@ -114,7 +129,9 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Despondent Engineer"
+          "Comment": "Despondent Engineer",
+          "Mount": true,
+          "$.1": "QuestVariables if done after [5]: 6 0 0 0 238 0"
         },
         {
           "DataId": 1040423,
@@ -125,7 +142,8 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "Comment": "Skeptical Researcher"
+          "Comment": "Skeptical Researcher",
+          "$.1": "QuestVariables if done after [6]: 7 0 0 0 239 0"
         },
         {
           "DataId": 1040419,
@@ -165,6 +183,7 @@
             "Y": -29.58728,
             "Z": -53.23877
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -180,6 +199,7 @@
             "Y": -29.53,
             "Z": -58.854065
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4446_Hither and Yarns.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4446_Hither and Yarns.json
index c0532b5d..618c5c3e 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4446_Hither and Yarns.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4446_Hither and Yarns.json	
@@ -12,6 +12,7 @@
             "Y": -29.53,
             "Z": -58.854065
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -28,7 +29,18 @@
             "Z": -242.26752
           },
           "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818321
+        },
+        {
+          "Position": {
+            "X": -198.16975,
+            "Y": -19.32426,
+            "Z": -238.2704
+          },
+          "TerritoryId": 956,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
         },
         {
           "DataId": 2011988,
@@ -38,7 +50,8 @@
             "Z": -122.60626
           },
           "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818322
         },
         {
           "DataId": 1040444,
@@ -92,6 +105,7 @@
             "Y": -27.634155,
             "Z": 302.1438
           },
+          "StopDistance": 6,
           "TerritoryId": 956,
           "InteractionType": "AttuneAetheryte"
         },
diff --git a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4447_Once Forged.json b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4447_Once Forged.json
index 33b3edb8..f4f01da3 100644
--- a/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4447_Once Forged.json	
+++ b/Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4447_Once Forged.json	
@@ -12,6 +12,7 @@
             "Y": -31.53043,
             "Z": 321.46167
           },
+          "StopDistance": 5,
           "TerritoryId": 956,
           "InteractionType": "Interact"
         }
@@ -44,6 +45,7 @@
           },
           "TerritoryId": 956,
           "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             13982,
             13981,
@@ -78,7 +80,8 @@
             "Z": 661.86
           },
           "TerritoryId": 956,
-          "InteractionType": "AttuneAetherCurrent"
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818316
         },
         {
           "DataId": 1040455,
diff --git a/Questionable/Windows/DebugWindow.cs b/Questionable/Windows/DebugWindow.cs
index 96bfcef0..61c843bc 100644
--- a/Questionable/Windows/DebugWindow.cs
+++ b/Questionable/Windows/DebugWindow.cs
@@ -1,10 +1,12 @@
 using System.Globalization;
 using System.Linq;
 using System.Numerics;
+using System.Runtime.InteropServices;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Interface;
 using Dalamud.Interface.Components;
 using Dalamud.Interface.Windowing;
+using Dalamud.Memory;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Control;
@@ -110,6 +112,7 @@ internal sealed class DebugWindow : Window
         var questManager = QuestManager.Instance();
         if (questManager != null)
         {
+            // unsure how these are sorted
             for (int i = 0; i < 1 /*questManager->TrackedQuestsSpan.Length*/; ++i)
             {
                 var trackedQuest = questManager->TrackedQuestsSpan[i];