diff --git a/Directory.Build.targets b/Directory.Build.targets
index c66516018..b6de8ec4f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <Version>2.19</Version>
+        <Version>2.20</Version>
     </PropertyGroup>
 </Project>
diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json
index 2eac6e18a..b1c257276 100644
--- a/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json	
+++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json	
@@ -28,9 +28,9 @@
       "Steps": [
         {
           "Position": {
-            "X": 370.87048,
-            "Y": 73.22009,
-            "Z": 118.791504
+            "X": 385.1642,
+            "Y": 74.01643,
+            "Z": 135.44316
           },
           "TerritoryId": 612,
           "InteractionType": "WaitForManualProgress",
@@ -55,4 +55,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json
index 3cf36eae9..bf7b8e850 100644
--- a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json	
+++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json	
@@ -76,7 +76,8 @@
           "TerritoryId": 621,
           "InteractionType": "WalkTo",
           "DisableNavmesh": true,
-          "Mount": true
+          "Mount": true,
+          "RestartNavigationIfCancelled": false
         },
         {
           "DataId": 1023174,
diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json
index 7599354ff..2874d2b35 100644
--- a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json	
+++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json	
@@ -48,7 +48,8 @@
             "Z": 786.1918
           },
           "TerritoryId": 620,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Mount": true
         },
         {
           "DataId": 1023259,
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json
index f99aa3834..2811433e5 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json	
@@ -86,6 +86,16 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": -364.42896,
+            "Y": 1.2300289,
+            "Z": -363.52563
+          },
+          "TerritoryId": 614,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
         {
           "DataId": 1020247,
           "Position": {
@@ -94,8 +104,7 @@
             "Z": -362.5086
           },
           "TerritoryId": 614,
-          "InteractionType": "Interact",
-          "Fly": true
+          "InteractionType": "Interact"
         }
       ]
     },
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json
index 55f2b8ebf..aeb5fba99 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json	
@@ -103,7 +103,7 @@
             "Y": -7.0001082,
             "Z": 53.81848
           },
-          "StopDistance": 7,
+          "StopDistance": 4,
           "TerritoryId": 628,
           "InteractionType": "CompleteQuest"
         }
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json
index 1312ff5b9..c6d579758 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json	
@@ -31,8 +31,9 @@
           "TerritoryId": 628,
           "InteractionType": "Interact",
           "TargetTerritoryId": 639,
+          "AetheryteShortcut": "Kugane",
           "AethernetShortcut": [
-            "[Kugane] Kogane Dori Markets",
+            "[Kugane] Aetheryte Plaza",
             "[Kugane] The Ruby Bazaar"
           ]
         }
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json
index 0315248c7..ff60e8f06 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json	
@@ -59,6 +59,11 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "TerritoryId": 612,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Fringes - Peering Stones"
+        },
         {
           "DataId": 1020578,
           "Position": {
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json
index 9fa4d564a..1ff762319 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json	
@@ -21,9 +21,15 @@
       "Sequence": 1,
       "Steps": [
         {
+          "DataId": 1020807,
+          "Position": {
+            "X": 433.9818,
+            "Y": 114.48304,
+            "Z": 233.29517
+          },
           "TerritoryId": 612,
-          "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "Fringes - Peering Stones"
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2821
         },
         {
           "DataId": 2007971,
@@ -44,7 +50,8 @@
           },
           "TerritoryId": 612,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "DataId": 1020817,
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json
index ef161cde3..ccc351dfa 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json	
@@ -21,6 +21,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1020821,
+          "Position": {
+            "X": 276.7223,
+            "Y": 76.853935,
+            "Z": -23.51416
+          },
+          "TerritoryId": 612,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2816
+        },
         {
           "DataId": 1020589,
           "Position": {
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2542_With Tired Hands We Toil.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2542_With Tired Hands We Toil.json
index 451ae480f..25b70b6a1 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2542_With Tired Hands We Toil.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2542_With Tired Hands We Toil.json	
@@ -27,6 +27,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1020873,
+          "Position": {
+            "X": -327.96222,
+            "Y": 258.90652,
+            "Z": 757.3815
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2842
+        },
         {
           "DataId": 2009008,
           "Position": {
@@ -120,4 +131,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json
index 659248b9f..426b491ed 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json	
@@ -26,6 +26,48 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": -791.2012,
+            "Y": 46.3994,
+            "Z": -15.904689
+          },
+          "TerritoryId": 621,
+          "InteractionType": "WalkTo",
+          "TargetTerritoryId": 620,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                620
+              ],
+              "QuestsCompleted": [
+                2860
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1023167,
+          "Position": {
+            "X": 313.28296,
+            "Y": 324.51355,
+            "Z": 362.4475
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2851
+        },
+        {
+          "DataId": 1020893,
+          "Position": {
+            "X": 283.77197,
+            "Y": 322.87146,
+            "Z": 752.34607
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2860
+        },
         {
           "DataId": 1021705,
           "Position": {
@@ -35,7 +77,8 @@
           },
           "StopDistance": 7,
           "TerritoryId": 621,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Lochs - Porta Praetoria"
         }
       ]
     },
@@ -49,6 +92,7 @@
             "Y": 45.410225,
             "Z": 766.47595
           },
+          "StopDistance": 5,
           "TerritoryId": 621,
           "InteractionType": "CompleteQuest"
         }
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json
index fe1034c1b..ccda8a091 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json	
@@ -12,6 +12,7 @@
             "Y": 45.410225,
             "Z": 766.47595
           },
+          "StopDistance": 5,
           "TerritoryId": 621,
           "InteractionType": "AcceptQuest"
         }
@@ -99,7 +100,8 @@
           },
           "TerritoryId": 621,
           "InteractionType": "WalkTo",
-          "StopDistance": 0.25
+          "StopDistance": 0.25,
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {
diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json
index edb33ea0b..5c01d8211 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json	
@@ -26,6 +26,50 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1022987,
+          "Position": {
+            "X": -662.13477,
+            "Y": 49.999794,
+            "Z": -48.874695
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2881
+        },
+        {
+          "DataId": 1022992,
+          "Position": {
+            "X": -506.6148,
+            "Y": 8.7,
+            "Z": -40.299072
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2877
+        },
+        {
+          "DataId": 1022990,
+          "Position": {
+            "X": -524.58997,
+            "Y": 8.688546,
+            "Z": -19.424805
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2880
+        },
+        {
+          "DataId": 1022991,
+          "Position": {
+            "X": -539.6353,
+            "Y": 7.6119823,
+            "Z": 52.140015
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2883
+        },
         {
           "DataId": 2007993,
           "Position": {
@@ -102,4 +146,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json
index 6f3c9c7fe..d23fe19c2 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json	
@@ -27,6 +27,18 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1023048,
+          "Position": {
+            "X": 497.76453,
+            "Y": 69.99941,
+            "Z": 583.7339
+          },
+          "TerritoryId": 621,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 621,
+          "Fly": true
+        },
         {
           "DataId": 1024134,
           "Position": {
@@ -100,7 +112,7 @@
             "Y": 70,
             "Z": 576.0128
           },
-          "StopDistance": 5,
+          "StopDistance": 6,
           "TerritoryId": 621,
           "InteractionType": "CompleteQuest"
         }
diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json
index 1241d40fa..ad3f298d5 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json	
@@ -29,7 +29,8 @@
           },
           "TerritoryId": 621,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"
         },
         {
           "DataId": 2009047,
@@ -40,8 +41,7 @@
           },
           "StopDistance": 4,
           "TerritoryId": 621,
-          "InteractionType": "Interact",
-          "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"
+          "InteractionType": "Interact"
         }
       ]
     },
@@ -64,6 +64,22 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "DataId": 1023048,
+          "Position": {
+            "X": 497.76453,
+            "Y": 69.99941,
+            "Z": 583.7339
+          },
+          "TerritoryId": 621,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 621,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "DataId": 1024057,
           "Position": {
diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json
index 125abad66..e71bf895a 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json	
@@ -12,7 +12,7 @@
             "Y": 10.503965,
             "Z": -213.76367
           },
-          "StopDistance": 4,
+          "StopDistance": 5,
           "TerritoryId": 628,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Kugane",
diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json
index 5e94b93a0..480b6717f 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json	
@@ -59,6 +59,16 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": -347.07507,
+            "Y": 1.2300062,
+            "Z": -345.90344
+          },
+          "TerritoryId": 614,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
         {
           "DataId": 1024986,
           "Position": {
@@ -67,8 +77,7 @@
             "Z": -344.13672
           },
           "TerritoryId": 614,
-          "InteractionType": "SinglePlayerDuty",
-          "Fly": true
+          "InteractionType": "SinglePlayerDuty"
         }
       ]
     },
@@ -82,10 +91,11 @@
             "Y": 17.720512,
             "Z": 301.59448
           },
+          "StopDistance": 5,
           "TerritoryId": 614,
           "InteractionType": "CompleteQuest"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json
index b99143fcf..ae2caa3b6 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json	
@@ -12,6 +12,7 @@
             "Y": 17.720512,
             "Z": 301.59448
           },
+          "StopDistance": 5,
           "TerritoryId": 614,
           "InteractionType": "AcceptQuest"
         }
@@ -67,4 +68,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json
index e7a12a161..1a3edd655 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json	
@@ -13,7 +13,10 @@
             "Z": -2.7619019
           },
           "TerritoryId": 744,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "DelaySecondsAtStart": 3,
+          "StopDistance": 1,
+          "$": "This may skip movement as the game thinks we're close enough at the start; unsure if delay helps"
         }
       ]
     },
diff --git a/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json b/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json
index 87faa68af..fdb4747b5 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json	
@@ -34,6 +34,7 @@
           "StopDistance": 7,
           "TerritoryId": 621,
           "InteractionType": "Interact",
+          "TargetTerritoryId": 829,
           "DialogueChoices": [
             {
               "Type": "YesNo",
diff --git a/Questionable/Windows/UiUtils.cs b/Questionable/Windows/UiUtils.cs
index 4e1fb9c3a..e0155816c 100644
--- a/Questionable/Windows/UiUtils.cs
+++ b/Questionable/Windows/UiUtils.cs
@@ -56,6 +56,7 @@ internal sealed class UiUtils
         if (extraPadding > 0)
             ImGui.SetCursorPosX(ImGui.GetCursorPosX() + extraPadding);
         ImGui.TextUnformatted(text);
+        hover |= ImGui.IsItemHovered();
         return hover;
     }