diff --git a/Project Undercover/Assets/Resources/NPC.prefab b/Project Undercover/Assets/Resources/NPC.prefab
index 5272584..0eff9d5 100644
--- a/Project Undercover/Assets/Resources/NPC.prefab	
+++ b/Project Undercover/Assets/Resources/NPC.prefab	
@@ -2150,6 +2150,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _queuedInteractorId: -1
+  _isInteracting: 0
   interactions:
   - {fileID: 11400000, guid: 218e2ddac8223e349a855bdae23819ab, type: 2}
   spyInteractions: []
@@ -2228,9 +2230,9 @@ MonoBehaviour:
     DrawErrorGizmo: 1
   m_RotationModel:
     SynchronizeEnabled: 1
-    InterpolateOption: 1
-    InterpolateRotateTowardsSpeed: 180
-    InterpolateLerpSpeed: 5
+    InterpolateOption: 2
+    InterpolateRotateTowardsSpeed: 300
+    InterpolateLerpSpeed: 15
   m_ScaleModel:
     SynchronizeEnabled: 0
     InterpolateOption: 0
diff --git a/Project Undercover/Assets/Resources/Spy.prefab b/Project Undercover/Assets/Resources/Spy.prefab
index f280a80..87ab7aa 100644
--- a/Project Undercover/Assets/Resources/Spy.prefab	
+++ b/Project Undercover/Assets/Resources/Spy.prefab	
@@ -2149,6 +2149,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eaa73f69e18e25947894aebb6dc9932f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _queuedInteractorId: -1
+  _isInteracting: 0
   interactions: []
   spyInteractions: []
   currentState: {fileID: 11400000, guid: 1c694dfd46dd4e44b94f7853724fa1c0, type: 2}
@@ -2213,9 +2215,9 @@ MonoBehaviour:
     DrawErrorGizmo: 1
   m_RotationModel:
     SynchronizeEnabled: 1
-    InterpolateOption: 1
-    InterpolateRotateTowardsSpeed: 180
-    InterpolateLerpSpeed: 5
+    InterpolateOption: 2
+    InterpolateRotateTowardsSpeed: 300
+    InterpolateLerpSpeed: 15
   m_ScaleModel:
     SynchronizeEnabled: 0
     InterpolateOption: 0
diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs
index e9444b6..af1407b 100644
--- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs	
+++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/IdleClickAction.cs	
@@ -23,7 +23,7 @@ public class IdleClickAction : Action
             SelectableObject selectableObject;
             if (RaycastForSelectableObject(controller, ray, out selectableObject))
             {
-                Debug.Log("Selected object set to " + selectableObject.name);
+                // Debug.Log("Selected object set to " + selectableObject.name);
                 controller.SelectedObject = selectableObject;
                 controller.Destination = selectableObject.gameObject.transform.position;
                 return;
@@ -32,7 +32,6 @@ public class IdleClickAction : Action
             // At this point, the player didn't click on a selectable object,
             // so the player is probably issuing a move command.
             controller.SelectedObject = null;
-            Debug.Log("Moving Spy");
             RaycastToMoveController(controller, ray);
         }
     }
diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/RoamAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/RoamAction.cs
index b35b1c8..2711fdb 100644
--- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/RoamAction.cs	
+++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/RoamAction.cs	
@@ -7,7 +7,7 @@ public class RoamAction : Action
 {
     public override void StartAct(StateController controller)
     {
-        Debug.Log("Started Roaming");
+        // Debug.Log("Started Roaming");
         controller.StartRoaming();
     }
 
@@ -15,14 +15,14 @@ public class RoamAction : Action
     {
         if (controller.Interactor != null && !controller.IsInteracting)
         {
-            Debug.Log("Accepting incomming interaction!");
+            // Debug.Log("Accepting incomming interaction!");
             controller.AcceptInteraction();
         }
     }
 
     public override void EndAct(StateController controller)
     {
-        Debug.Log("Stopping coroutine");
+        // Debug.Log("Stopping coroutine");
         controller.StopRoaming();
     }
 }
diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/SpyInteractAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/SpyInteractAction.cs
index 2809e2c..6703903 100644
--- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/SpyInteractAction.cs	
+++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/SpyInteractAction.cs	
@@ -13,13 +13,16 @@ public class SpyInteractAction : Action
     public override void Act(StateController controller)
     {
         AnimatorStateInfo info = controller.animator.GetCurrentAnimatorStateInfo(0);
-        float progress = info.normalizedTime;
-        ProgressPanelController.ActivePanel.Progress = progress;
+        if (info.IsName(CharacterAnimator.GetParamName(controller.SelectedInteraction.characterInteraction)))
+        {
+            float progress = info.normalizedTime;
+            ProgressPanelController.ActivePanel.Progress = progress;
+        }
     }
 
     public override void EndAct(StateController controller)
     {
-        Debug.Log("Ending SpyInteract");
+        // Debug.Log("Ending SpyInteract");
         ProgressPanelController.ActivePanel.Hide();
         controller.FinishInteraction();
     }
diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitInPlaceAction.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitInPlaceAction.cs
index debf3ba..20403e4 100644
--- a/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitInPlaceAction.cs	
+++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/ActionScripts/WaitInPlaceAction.cs	
@@ -7,14 +7,14 @@ public class WaitInPlaceAction : Action {
 
     public override void StartAct(StateController controller)
     {
-        Debug.Log("Waiting in place!");
+        // Debug.Log("Waiting in place!");
         controller.FaceInteractor();
         controller.Destination = controller.transform.position;
     }
 
     public override void EndAct(StateController controller)
     {
-        Debug.Log("Done waiting in place!");
+        // Debug.Log("Done waiting in place!");
     }
 
 }
diff --git a/Project Undercover/Assets/Scripts/CharacterStateMachine/StateController.cs b/Project Undercover/Assets/Scripts/CharacterStateMachine/StateController.cs
index 8eb0d1d..cba7dc1 100644
--- a/Project Undercover/Assets/Scripts/CharacterStateMachine/StateController.cs	
+++ b/Project Undercover/Assets/Scripts/CharacterStateMachine/StateController.cs	
@@ -94,7 +94,7 @@ public class StateController : SelectableObject
         if (SelectedObject.IsInteracting)
             Debug.Log(SelectedObject.name + " is busy and cannot interact with " + name);
 
-        Debug.Log("Sending interaction request...");
+        // Debug.Log("Sending interaction request...");
         IsInteracting = true;
         SelectedObject.Interactor = this;
     }
@@ -113,7 +113,7 @@ public class StateController : SelectableObject
             if (_selectedObject != null)
             {
                 _selectedObject.Selected();
-                navMeshAgent.stoppingDistance = INTERACT_RANGE;
+                navMeshAgent.stoppingDistance = INTERACT_RANGE * 0.8f;
             }
             else
             {
diff --git a/Project Undercover/Assets/Scripts/UI/ProgressPanelController.cs b/Project Undercover/Assets/Scripts/UI/ProgressPanelController.cs
index c4830d6..cedb385 100644
--- a/Project Undercover/Assets/Scripts/UI/ProgressPanelController.cs	
+++ b/Project Undercover/Assets/Scripts/UI/ProgressPanelController.cs	
@@ -54,7 +54,8 @@ public class ProgressPanelController : MonoBehaviour {
 
     }
 
-    public static ProgressPanelController ActivePanel {
+    public static ProgressPanelController ActivePanel
+    {
         get
         {
             if (activePanel)