diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs
index e00ab5d32..00ba0a5e8 100644
--- a/Questionable/Controller/QuestController.cs
+++ b/Questionable/Controller/QuestController.cs
@@ -5,7 +5,7 @@ using Dalamud.Game.ClientState.Keys;
 using Dalamud.Plugin.Services;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps;
-using Questionable.Controller.Steps.BaseFactory;
+using Questionable.Controller.Steps.Shared;
 using Questionable.External;
 using Questionable.Model;
 using Questionable.Model.V1;
diff --git a/Questionable/Controller/Steps/BaseTasks/AbstractDelayedTask.cs b/Questionable/Controller/Steps/Common/AbstractDelayedTask.cs
similarity index 93%
rename from Questionable/Controller/Steps/BaseTasks/AbstractDelayedTask.cs
rename to Questionable/Controller/Steps/Common/AbstractDelayedTask.cs
index ed1e8506c..e5a3b1026 100644
--- a/Questionable/Controller/Steps/BaseTasks/AbstractDelayedTask.cs
+++ b/Questionable/Controller/Steps/Common/AbstractDelayedTask.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Questionable.Controller.Steps.BaseTasks;
+namespace Questionable.Controller.Steps.Common;
 
 internal abstract class AbstractDelayedTask : ITask
 {
diff --git a/Questionable/Controller/Steps/BaseTasks/MountTask.cs b/Questionable/Controller/Steps/Common/MountTask.cs
similarity index 98%
rename from Questionable/Controller/Steps/BaseTasks/MountTask.cs
rename to Questionable/Controller/Steps/Common/MountTask.cs
index e600aac98..15585a2f3 100644
--- a/Questionable/Controller/Steps/BaseTasks/MountTask.cs
+++ b/Questionable/Controller/Steps/Common/MountTask.cs
@@ -5,7 +5,7 @@ using Dalamud.Plugin.Services;
 using Microsoft.Extensions.Logging;
 using Questionable.Data;
 
-namespace Questionable.Controller.Steps.BaseTasks;
+namespace Questionable.Controller.Steps.Common;
 
 internal sealed class MountTask(
     GameFunctions gameFunctions,
diff --git a/Questionable/Controller/Steps/BaseTasks/NextQuest.cs b/Questionable/Controller/Steps/Common/NextQuest.cs
similarity index 97%
rename from Questionable/Controller/Steps/BaseTasks/NextQuest.cs
rename to Questionable/Controller/Steps/Common/NextQuest.cs
index c03f5a068..32d0f113a 100644
--- a/Questionable/Controller/Steps/BaseTasks/NextQuest.cs
+++ b/Questionable/Controller/Steps/Common/NextQuest.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseTasks;
+namespace Questionable.Controller.Steps.Common;
 
 internal static class NextQuest
 {
diff --git a/Questionable/Controller/Steps/BaseTasks/UnmountTask.cs b/Questionable/Controller/Steps/Common/UnmountTask.cs
similarity index 96%
rename from Questionable/Controller/Steps/BaseTasks/UnmountTask.cs
rename to Questionable/Controller/Steps/Common/UnmountTask.cs
index 54be937af..ad369585c 100644
--- a/Questionable/Controller/Steps/BaseTasks/UnmountTask.cs
+++ b/Questionable/Controller/Steps/Common/UnmountTask.cs
@@ -3,7 +3,7 @@ using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Plugin.Services;
 using Microsoft.Extensions.Logging;
 
-namespace Questionable.Controller.Steps.BaseTasks;
+namespace Questionable.Controller.Steps.Common;
 
 internal sealed class UnmountTask(ICondition condition, ILogger<UnmountTask> logger, GameFunctions gameFunctions)
     : ITask
diff --git a/Questionable/Controller/Steps/BaseTasks/WaitConditionTask.cs b/Questionable/Controller/Steps/Common/WaitConditionTask.cs
similarity index 91%
rename from Questionable/Controller/Steps/BaseTasks/WaitConditionTask.cs
rename to Questionable/Controller/Steps/Common/WaitConditionTask.cs
index 175654645..762904ffe 100644
--- a/Questionable/Controller/Steps/BaseTasks/WaitConditionTask.cs
+++ b/Questionable/Controller/Steps/Common/WaitConditionTask.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Questionable.Controller.Steps.BaseTasks;
+namespace Questionable.Controller.Steps.Common;
 
 internal sealed class WaitConditionTask(Func<bool> predicate, string description) : ITask
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Action.cs b/Questionable/Controller/Steps/Interactions/Action.cs
similarity index 96%
rename from Questionable/Controller/Steps/InteractionFactory/Action.cs
rename to Questionable/Controller/Steps/Interactions/Action.cs
index a94f70634..75a40b3ee 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Action.cs
+++ b/Questionable/Controller/Steps/Interactions/Action.cs
@@ -5,11 +5,11 @@ using Dalamud.Game.ClientState.Objects.Types;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Action
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/AetherCurrent.cs b/Questionable/Controller/Steps/Interactions/AetherCurrent.cs
similarity index 97%
rename from Questionable/Controller/Steps/InteractionFactory/AetherCurrent.cs
rename to Questionable/Controller/Steps/Interactions/AetherCurrent.cs
index 6be7eb85f..82b13d278 100644
--- a/Questionable/Controller/Steps/InteractionFactory/AetherCurrent.cs
+++ b/Questionable/Controller/Steps/Interactions/AetherCurrent.cs
@@ -6,7 +6,7 @@ using Questionable.Data;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class AetherCurrent
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/AethernetShard.cs b/Questionable/Controller/Steps/Interactions/AethernetShard.cs
similarity index 96%
rename from Questionable/Controller/Steps/InteractionFactory/AethernetShard.cs
rename to Questionable/Controller/Steps/Interactions/AethernetShard.cs
index 189761517..059a2c34b 100644
--- a/Questionable/Controller/Steps/InteractionFactory/AethernetShard.cs
+++ b/Questionable/Controller/Steps/Interactions/AethernetShard.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class AethernetShard
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Aetheryte.cs b/Questionable/Controller/Steps/Interactions/Aetheryte.cs
similarity index 96%
rename from Questionable/Controller/Steps/InteractionFactory/Aetheryte.cs
rename to Questionable/Controller/Steps/Interactions/Aetheryte.cs
index 8f59a3d31..6babf2333 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Aetheryte.cs
+++ b/Questionable/Controller/Steps/Interactions/Aetheryte.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Aetheryte
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Combat.cs b/Questionable/Controller/Steps/Interactions/Combat.cs
similarity index 94%
rename from Questionable/Controller/Steps/InteractionFactory/Combat.cs
rename to Questionable/Controller/Steps/Interactions/Combat.cs
index b9ebcc751..5a868bc94 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Combat.cs
+++ b/Questionable/Controller/Steps/Interactions/Combat.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Combat
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Duty.cs b/Questionable/Controller/Steps/Interactions/Duty.cs
similarity index 96%
rename from Questionable/Controller/Steps/InteractionFactory/Duty.cs
rename to Questionable/Controller/Steps/Interactions/Duty.cs
index 9a57f4f34..a7de058c8 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Duty.cs
+++ b/Questionable/Controller/Steps/Interactions/Duty.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Duty
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Emote.cs b/Questionable/Controller/Steps/Interactions/Emote.cs
similarity index 95%
rename from Questionable/Controller/Steps/InteractionFactory/Emote.cs
rename to Questionable/Controller/Steps/Interactions/Emote.cs
index a8dee7b8e..44478475e 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Emote.cs
+++ b/Questionable/Controller/Steps/Interactions/Emote.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Emote
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/EquipItem.cs b/Questionable/Controller/Steps/Interactions/EquipItem.cs
similarity index 98%
rename from Questionable/Controller/Steps/InteractionFactory/EquipItem.cs
rename to Questionable/Controller/Steps/Interactions/EquipItem.cs
index 22e339eb7..65147b684 100644
--- a/Questionable/Controller/Steps/InteractionFactory/EquipItem.cs
+++ b/Questionable/Controller/Steps/Interactions/EquipItem.cs
@@ -6,11 +6,11 @@ using FFXIVClientStructs.FFXIV.Client.Game;
 using Lumina.Excel.GeneratedSheets;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model.V1;
 using Quest = Questionable.Model.Quest;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class EquipItem
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs
similarity index 97%
rename from Questionable/Controller/Steps/InteractionFactory/Interact.cs
rename to Questionable/Controller/Steps/Interactions/Interact.cs
index ea55513e6..f49394dec 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Interact.cs
+++ b/Questionable/Controller/Steps/Interactions/Interact.cs
@@ -6,11 +6,11 @@ using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Plugin.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Questionable.Controller.Steps.BaseFactory;
+using Questionable.Controller.Steps.Shared;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Interact
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Jump.cs b/Questionable/Controller/Steps/Interactions/Jump.cs
similarity index 96%
rename from Questionable/Controller/Steps/InteractionFactory/Jump.cs
rename to Questionable/Controller/Steps/Interactions/Jump.cs
index da029acd2..8c5c9a8eb 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Jump.cs
+++ b/Questionable/Controller/Steps/Interactions/Jump.cs
@@ -2,11 +2,11 @@
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Microsoft.Extensions.DependencyInjection;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Jump
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/Say.cs b/Questionable/Controller/Steps/Interactions/Say.cs
similarity index 93%
rename from Questionable/Controller/Steps/InteractionFactory/Say.cs
rename to Questionable/Controller/Steps/Interactions/Say.cs
index 377225252..c833badc6 100644
--- a/Questionable/Controller/Steps/InteractionFactory/Say.cs
+++ b/Questionable/Controller/Steps/Interactions/Say.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class Say
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/SinglePlayerDuty.cs b/Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs
similarity index 97%
rename from Questionable/Controller/Steps/InteractionFactory/SinglePlayerDuty.cs
rename to Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs
index d80be1f8e..f7d5172a1 100644
--- a/Questionable/Controller/Steps/InteractionFactory/SinglePlayerDuty.cs
+++ b/Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs
@@ -6,7 +6,7 @@ using Questionable.External;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class SinglePlayerDuty
 {
diff --git a/Questionable/Controller/Steps/InteractionFactory/UseItem.cs b/Questionable/Controller/Steps/Interactions/UseItem.cs
similarity index 98%
rename from Questionable/Controller/Steps/InteractionFactory/UseItem.cs
rename to Questionable/Controller/Steps/Interactions/UseItem.cs
index 2f752b1a4..05dbd72eb 100644
--- a/Questionable/Controller/Steps/InteractionFactory/UseItem.cs
+++ b/Questionable/Controller/Steps/Interactions/UseItem.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.InteractionFactory;
+namespace Questionable.Controller.Steps.Interactions;
 
 internal static class UseItem
 {
diff --git a/Questionable/Controller/Steps/BaseFactory/AethernetShortcut.cs b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
similarity index 99%
rename from Questionable/Controller/Steps/BaseFactory/AethernetShortcut.cs
rename to Questionable/Controller/Steps/Shared/AethernetShortcut.cs
index 5bcd6349e..7e06068f5 100644
--- a/Questionable/Controller/Steps/BaseFactory/AethernetShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
@@ -11,7 +11,7 @@ using Questionable.Model;
 using Questionable.Model.V1;
 using Questionable.Model.V1.Converter;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class AethernetShortcut
 {
diff --git a/Questionable/Controller/Steps/BaseFactory/AetheryteShortcut.cs b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
similarity index 97%
rename from Questionable/Controller/Steps/BaseFactory/AetheryteShortcut.cs
rename to Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
index 3542c888f..e1fb0f203 100644
--- a/Questionable/Controller/Steps/BaseFactory/AetheryteShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
@@ -4,12 +4,12 @@ using System.Numerics;
 using Dalamud.Plugin.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Data;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class AetheryteShortcut
 {
diff --git a/Questionable/Controller/Steps/BaseFactory/Move.cs b/Questionable/Controller/Steps/Shared/Move.cs
similarity index 92%
rename from Questionable/Controller/Steps/BaseFactory/Move.cs
rename to Questionable/Controller/Steps/Shared/Move.cs
index 6633c484a..91812a38a 100644
--- a/Questionable/Controller/Steps/BaseFactory/Move.cs
+++ b/Questionable/Controller/Steps/Shared/Move.cs
@@ -6,12 +6,12 @@ using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Plugin.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Data;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class Move
 {
@@ -82,8 +82,15 @@ internal static class Move
             if (!Step.DisableNavmesh)
             {
                 if (Step.Mount == null)
+                {
+                    MountTask.EMountIf mountIf =
+                        actualDistance > distance && Step.Fly == true &&
+                        gameFunctions.IsFlyingUnlocked(Step.TerritoryId)
+                            ? MountTask.EMountIf.Always
+                            : MountTask.EMountIf.AwayFromPosition;
                     yield return serviceProvider.GetRequiredService<MountTask>()
-                        .With(Step.TerritoryId, MountTask.EMountIf.AwayFromPosition, Destination);
+                        .With(Step.TerritoryId, mountIf, Destination);
+                }
 
                 if (actualDistance > distance)
                 {
diff --git a/Questionable/Controller/Steps/BaseFactory/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs
similarity index 98%
rename from Questionable/Controller/Steps/BaseFactory/SkipCondition.cs
rename to Questionable/Controller/Steps/Shared/SkipCondition.cs
index d31f46e6f..30feca43f 100644
--- a/Questionable/Controller/Steps/BaseFactory/SkipCondition.cs
+++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class SkipCondition
 {
diff --git a/Questionable/Controller/Steps/BaseFactory/StepDisabled.cs b/Questionable/Controller/Steps/Shared/StepDisabled.cs
similarity index 94%
rename from Questionable/Controller/Steps/BaseFactory/StepDisabled.cs
rename to Questionable/Controller/Steps/Shared/StepDisabled.cs
index ecb367b20..16bb83650 100644
--- a/Questionable/Controller/Steps/BaseFactory/StepDisabled.cs
+++ b/Questionable/Controller/Steps/Shared/StepDisabled.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class StepDisabled
 {
diff --git a/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs b/Questionable/Controller/Steps/Shared/WaitAtEnd.cs
similarity index 99%
rename from Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs
rename to Questionable/Controller/Steps/Shared/WaitAtEnd.cs
index 1147458b2..8ac788205 100644
--- a/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs
+++ b/Questionable/Controller/Steps/Shared/WaitAtEnd.cs
@@ -8,12 +8,12 @@ using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Microsoft.Extensions.DependencyInjection;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Data;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class WaitAtEnd
 {
diff --git a/Questionable/Controller/Steps/BaseFactory/WaitAtStart.cs b/Questionable/Controller/Steps/Shared/WaitAtStart.cs
similarity index 90%
rename from Questionable/Controller/Steps/BaseFactory/WaitAtStart.cs
rename to Questionable/Controller/Steps/Shared/WaitAtStart.cs
index 5da57f6b4..4a1f411eb 100644
--- a/Questionable/Controller/Steps/BaseFactory/WaitAtStart.cs
+++ b/Questionable/Controller/Steps/Shared/WaitAtStart.cs
@@ -1,10 +1,10 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
-using Questionable.Controller.Steps.BaseTasks;
+using Questionable.Controller.Steps.Common;
 using Questionable.Model;
 using Questionable.Model.V1;
 
-namespace Questionable.Controller.Steps.BaseFactory;
+namespace Questionable.Controller.Steps.Shared;
 
 internal static class WaitAtStart
 {
diff --git a/Questionable/Questionable.json b/Questionable/Questionable.json
index 6975eaeb7..356c09629 100644
--- a/Questionable/Questionable.json
+++ b/Questionable/Questionable.json
@@ -2,7 +2,7 @@
   "Name": "Questionable",
   "Author": "Liza Carvelli",
   "Punchline": "A tiny quest helper plugin.",
-  "Description": "A tiny quest helper plugin.",
+  "Description": "A tiny little quest helper plugin, which does quests for you automatically where possible. Uses navmesh to automatically walk to all quest waypoints, and tries to automatically complete all steps along the way (excluding dungeons, single player duties and combat).\n\nNot all quests are supported, check the discord or git repository for an up-to-date list.\n\nRequired Plugins: vnavmesh, TextAdvance, Lifestream",
   "Tags": [
     "quests",
     "msq"
diff --git a/Questionable/QuestionablePlugin.cs b/Questionable/QuestionablePlugin.cs
index 2fe468df8..df02a5822 100644
--- a/Questionable/QuestionablePlugin.cs
+++ b/Questionable/QuestionablePlugin.cs
@@ -11,13 +11,13 @@ using Microsoft.Extensions.Logging;
 using Questionable.Controller;
 using Questionable.Controller.NavigationOverrides;
 using Questionable.Controller.Steps;
-using Questionable.Controller.Steps.BaseFactory;
-using Questionable.Controller.Steps.BaseTasks;
-using Questionable.Controller.Steps.InteractionFactory;
+using Questionable.Controller.Steps.Shared;
+using Questionable.Controller.Steps.Common;
+using Questionable.Controller.Steps.Interactions;
 using Questionable.Data;
 using Questionable.External;
 using Questionable.Windows;
-using Action = Questionable.Controller.Steps.InteractionFactory.Action;
+using Action = Questionable.Controller.Steps.Interactions.Action;
 
 namespace Questionable;
 
diff --git a/Questionable/Windows/DebugOverlay.cs b/Questionable/Windows/DebugOverlay.cs
index 902d247a3..e778372d1 100644
--- a/Questionable/Windows/DebugOverlay.cs
+++ b/Questionable/Windows/DebugOverlay.cs
@@ -41,7 +41,11 @@ internal sealed class DebugOverlay : Window
 
     public ushort? HighlightedQuest { get; set; }
 
-    public override bool DrawConditions() => _configuration.Advanced.DebugOverlay;
+    public override bool DrawConditions()
+    {
+        return _configuration.Advanced.DebugOverlay && _clientState is
+            { IsLoggedIn: true, LocalPlayer: not null, IsPvPExcludingDen: false };
+    }
 
     public override void PreDraw()
     {
diff --git a/Questionable/Windows/QuestWindow.cs b/Questionable/Windows/QuestWindow.cs
index 0d868109d..0f72fcabd 100644
--- a/Questionable/Windows/QuestWindow.cs
+++ b/Questionable/Windows/QuestWindow.cs
@@ -19,7 +19,7 @@ using ImGuiNET;
 using LLib.ImGui;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller;
-using Questionable.Controller.Steps.BaseFactory;
+using Questionable.Controller.Steps.Shared;
 using Questionable.Data;
 using Questionable.External;
 using Questionable.Model;
@@ -96,7 +96,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig
 
     public override bool DrawConditions()
     {
-        if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null)
+        if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null || _clientState.IsPvPExcludingDen)
             return false;
 
         if (_configuration.General.HideInAllInstances && _territoryData.IsDutyInstance(_clientState.TerritoryType))