diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md
index 6f6a3078..e6c22c65 100644
--- a/3d-generation-pipeline/README.md
+++ b/3d-generation-pipeline/README.md
@@ -9,6 +9,7 @@
 * npc character:
 	* klaas on näha temast eespool
 	* voicelines: list listidest, mille hulgast saab valida
+* Unity crash after stopping the game - most likely due to FMOD trying to do something with invalid audio instances
 
 Can't/Won't Do:
 * glTF loading: vahetada ära shader Universal render pipeline Lit, mitte panna buildi kaasa glTf oma - **ei saa, objekt on siis ilma tekstuurita, lihtsalt hall**
diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity
index d630c8e7..560702f6 100644
--- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity
+++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3911b0a1f70724389de630cd89e90ef1a7d06711515620db94ffd99ec7fdf2ff
-size 68527712
+oid sha256:0571f8f4665533a77d4edee84b7137eaf67f4002b5142e385d7b69b0afb8d70b
+size 68528325
diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs
index c476e070..5c9a0241 100644
--- a/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs
+++ b/Assets/_PROJECT/Scripts/ModeGeneration/NPCs/ShapeDetectionNPC.cs
@@ -58,8 +58,8 @@ public class ShapeDetectionNPC : NPCController
         {
             state = 1;
             await CallPlayer();
-            await Task.Delay(2500);
-            questMarker.MoveTo(radio.transform);
+            await Task.Delay(2000);
+            questMarker.MoveTo(radio.transform, true);
         }
     }
 
@@ -137,7 +137,7 @@ public class ShapeDetectionNPC : NPCController
         {
             SpeakVoiceLine(5, radio.gameObject, radioAmount);
             state = 5;
-            questMarker.MoveTo(shapeScanner.transform);
+            questMarker.MoveTo(shapeScanner.transform, true);
         }
 
         string encodedTexture = Convert.ToBase64String(GeneratedTexture.EncodeToJPG());
diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs b/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs
index 33af8c78..43c453dd 100644
--- a/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs
+++ b/Assets/_PROJECT/Scripts/ModeGeneration/QuestMarker.cs
@@ -7,10 +7,11 @@ public class QuestMarker : MonoBehaviour
     public Transform movingPart;
     public float amplitude = 0.1f;      // How far up/down it moves
     public float frequency = 1.5f;      // Speed of oscillation
-    public float heightAboveTarget = 1f;
+    public float heightAboveTarget = 0.75f;
 
     private Vector3 startPos;
     private Transform playerTransform;
+    private Transform hoverAboveTransform;
 
     // Start is called before the first frame update
     void Start()
@@ -31,6 +32,13 @@ public class QuestMarker : MonoBehaviour
             Vector3 lookTargetPos = new Vector3(playerTransform.position.x, transform.position.y, playerTransform.position.z);
             transform.LookAt(lookTargetPos);
         }
+
+        if (hoverAboveTransform != null)
+        {
+            Debug.Log("pos before floating: " + transform.position);
+            transform.position = hoverAboveTransform.position + new Vector3(0f, heightAboveTarget, 0f);
+            Debug.Log("pos after floating: " + transform.position);
+        }
     }
 
     private void OnTriggerEnter(Collider other)
@@ -49,8 +57,15 @@ public class QuestMarker : MonoBehaviour
         }
     }
 
-    public void MoveTo(Transform target)
+    public void MoveTo(Transform target, bool attach = false)
     {
         transform.position = target.position + new Vector3(0, heightAboveTarget, 0);
+        if (attach)
+        {
+            hoverAboveTransform = target;
+        } else
+        {
+            hoverAboveTransform = null;
+        }
     }
 }