diff --git a/HugMod/Assets/hug_bundle b/HugMod/Assets/hug_bundle
index 08589db..fb42e62 100644
Binary files a/HugMod/Assets/hug_bundle and b/HugMod/Assets/hug_bundle differ
diff --git a/HugMod/Assets/hug_bundle.manifest b/HugMod/Assets/hug_bundle.manifest
index c0dd6e4..9a82fb4 100644
--- a/HugMod/Assets/hug_bundle.manifest
+++ b/HugMod/Assets/hug_bundle.manifest
@@ -1,9 +1,9 @@
 ManifestFileVersion: 0
-CRC: 2035962915
+CRC: 4286573153
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: 6b4888750e29bc0c2f383a16efc70007
+    Hash: 56a78e3700c5c2ce3fbf9650e89543d0
   TypeTreeHash:
     serializedVersion: 2
     Hash: 81be94c203cbc62109b6f5f6fe206615
diff --git a/HugMod/HugComponent.cs b/HugMod/HugComponent.cs
index ef661ec..76f2238 100644
--- a/HugMod/HugComponent.cs
+++ b/HugMod/HugComponent.cs
@@ -22,7 +22,7 @@ public class HugComponent : MonoBehaviour
 
         //tabled
         private ScreenPrompt hugPrompt = new(InputLibrary.interactSecondary, "<CMD> " + "Hug");
-        private Vector3 focusPoint = new(0, 0.1f, 0);
+        private Vector3 focusPoint = new(0, 0, 0);
         private string hugTrigger = "react_None";
         private bool fullbodyReact = true, keepFootAnimRight = false, keepFootAnimLeft = false, keepHandAnimRight = false, keepHandAnimLeft = false;
 
@@ -52,8 +52,13 @@ public class HugComponent : MonoBehaviour
         public event Action OnDestroyEvent;
 
 
+        private void Awake() { SetHugEnabled(false); }
+
         public void Initialise()
         {
+            var flag = gameObject.activeInHierarchy;
+            gameObject.SetActive(true);
+
             HugReceiver = gameObject.GetComponentInChildren<InteractReceiver>();
             if (HugReceiver == null)
             {
@@ -61,7 +66,7 @@ public void Initialise()
                 if (receiverCollider == null)
                 {
                     HugModInstance.ModHelper.Console.WriteLine($"Couldn't find OWCollider in children of object \"{gameObject.name}\". HugComponent will be disabled.", MessageType.Error);
-                    enabled = false;
+                    SetHugEnabled(false);
                     return;
                 }
                 if (receiverCollider.gameObject.layer == LayerMask.NameToLayer("Ignore Raycast")) receiverCollider.gameObject.layer = LayerMask.NameToLayer("Default");
@@ -83,7 +88,7 @@ public void Initialise()
             }
             else
             {
-                HugAnimator = gameObject.GetComponentInChildren<Animator>(true);
+                HugAnimator = gameObject.GetComponentInChildren<Animator>();
                 lookSpring = new(50, 14, 1);
             }
 
@@ -96,13 +101,15 @@ public void Initialise()
             }
 
             hugOverrider.runtimeAnimatorController = AltRuntimeController;
+            SetHugEnabled(true);
+            gameObject.SetActive(flag);
         }
 
         private bool AddTriggerCollider(Collider compareCollider)
         {
             if (compareCollider == null) return false;
 
-            var triggerObj = compareCollider.gameObject.transform.CreateChild("Hug_TriggerCollider");
+            var triggerObj = compareCollider.gameObject.CreateChild("Hug_TriggerCollider");
             triggerObj.layer = LayerMask.NameToLayer("Ignore Raycast");
 
             hugTriggerCollider = triggerObj.AddComponent<HugTriggerCollider>();
@@ -115,11 +122,10 @@ private bool AddTriggerCollider(Collider compareCollider)
             else
             {
                 hugTriggerCollider.Remove();
-                HugModInstance.ModHelper.Console.WriteLine($"Collider type associated with object \"{gameObject.name}\" is not supported. HugComponent will be disabled.", MessageType.Error);
-                enabled = false;
+                HugModInstance.ModHelper.Console.WriteLine($"Collider type is not supported. HugComponent associated with object \"{gameObject.name}\" will be disabled.", MessageType.Error);
+                SetHugEnabled(false);
                 return false;
             }
-
             return true;
         }
 
@@ -169,7 +175,7 @@ public void SetHugEnabled(bool enable)
         public void SetLookAtPlayerEnabled(bool enable) 
         {
             if (hugIK != null) hugIK.enabled = enable; 
-            else HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugIK Component on object \"{HugAnimator.gameObject.name}\".", MessageType.Error);
+            else HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugIK Component associated with object \"{gameObject.name}\".", MessageType.Error);
         }
         public void ForceLookAtPlayer(bool enable) { forceLookAtPlayer = enable; }
         public void SetPrompt(string name) { hugPrompt = new(InputLibrary.interactSecondary, "<CMD> " + "Hug " + name); }
@@ -207,8 +213,8 @@ public void GetUnderlayTransitionData(out float transitionTime, out int transiti
             transitionClip = this.transitionClip; 
         }
 
-        public bool IsSequenceInProgress() { return sequenceInProgress; }
-        public bool IsAnimatorControllerSwapped() { return HugAnimator.runtimeAnimatorController == hugOverrider; }
+        public bool IsSequenceInProgress() => sequenceInProgress;
+        public bool IsAnimatorControllerSwapped() => (HugAnimator != null) && (HugAnimator.runtimeAnimatorController == hugOverrider);
 
         public void ChangeInteractReceiver(InteractReceiver newReceiver, bool resetTriggerCollider = false)
         {
@@ -218,6 +224,7 @@ public void ChangeInteractReceiver(InteractReceiver newReceiver, bool resetTrigg
                 HugReceiver.OnLoseFocus -= DisableHug;
             }
             HugReceiver = newReceiver;
+            if (newReceiver == null) return;
             newReceiver.OnGainFocus += EnableHug;
             newReceiver.OnLoseFocus += DisableHug;
 
@@ -226,26 +233,26 @@ public void ChangeInteractReceiver(InteractReceiver newReceiver, bool resetTrigg
         }
         public void ChangeTriggerCollider(Collider newCompareCollider)
         {
-            if (hugTriggerCollider != null) hugTriggerCollider.Remove();
+            hugTriggerCollider.Exists()?.Remove();
             AddTriggerCollider(newCompareCollider);
         }
-        public void ChangePrimaryAnimator(Animator newAnimator, RuntimeAnimatorController newAnimatorController)
+        public void ChangePrimaryAnimator(Animator newAnimator, bool resetAnimatorController = true)
         {
             HugAnimator = newAnimator;
-            initialRuntimeController = newAnimatorController;
             isAnimated = newAnimator != null && newAnimator.avatar.isHuman;
+            if (resetAnimatorController && isAnimated) initialRuntimeController = newAnimator.runtimeAnimatorController;
 
             if ((hugIK == null && !isAnimated) || (hugIK != null && isAnimated && hugIK.gameObject == newAnimator.gameObject)) return;
-            if (hugIK != null) hugIK.Remove();
-            if (newAnimator == null) return;
-            hugIK = newAnimator.gameObject.AddComponent<HugIK>();
-            hugIK.SetHugComponent(this);
+            hugIK.Exists()?.Remove();
+            hugIK = newAnimator.Exists()?.gameObject.AddComponent<HugIK>();
+            hugIK.Exists()?.SetHugComponent(this);
         }
+        public void ChangeAnimatorController(RuntimeAnimatorController newAnimatorController) { initialRuntimeController = newAnimatorController; }
         public void ChangeSecondaryAnimator(Animator newAnimator) { SecondaryAnimator = newAnimator; }
-        public void ChangeCharacterAnimController(CharacterAnimController newAnimController)
+        public void ChangeCharacterAnimController(CharacterAnimController newCharacterAnimController)
         {
-            characterAnimController = newAnimController;
-            lookSpring = newAnimController.lookSpring;
+            characterAnimController = newCharacterAnimController;
+            lookSpring = newCharacterAnimController.Exists()?.lookSpring ?? new(50, 14, 1);
         }
 
 
@@ -253,7 +260,7 @@ public void ChangeCharacterAnimController(CharacterAnimController newAnimControl
         private void EnableHug()
         {
             if (!enabled) return;
-            Locator.GetPromptManager().AddScreenPrompt(hugPrompt, PromptPosition.Center, true);
+            Locator.GetPromptManager().AddScreenPrompt(hugPrompt, PromptPosition.Center, OWInput.IsInputMode(InputMode.Character));
             canHug = true;
         }
 
@@ -280,10 +287,9 @@ public void OnAnimatorIK()
 
         private void Update()
         {
-            if (OWInput.GetInputMode() == InputMode.Character) hugPrompt.SetVisibility(true);
-            else hugPrompt.SetVisibility(false);
+            hugPrompt.SetVisibility(OWInput.IsInputMode(InputMode.Character));
 
-            if (OWInput.IsNewlyPressed(InputLibrary.interactSecondary) && canHug && OWInput.GetInputMode() == InputMode.Character) BeginHugSequence();
+            if (OWInput.IsNewlyPressed(InputLibrary.interactSecondary, InputMode.Character) && canHug) BeginHugSequence();
         }
 
 
@@ -320,7 +326,7 @@ private IEnumerator HugSequenceMain()
         {
             CommenceHug();
             yield return null;
-            if (isAnimated && HugAnimator.enabled && hugTrigger != "react_None")
+            if (isAnimated && hugTrigger != "react_None" && HugAnimator.enabled)
             {
                 var wasHugging = IsAnimatorControllerSwapped();
                 while (HugAnimator.GetCurrentAnimatorClipInfo(0).Length == 0) yield return null;
@@ -373,7 +379,7 @@ private void PlayHugAnimation(bool wasHugging)
                 HugAnimator.SetLayerWeight(HugAnimator.GetLayerIndex("Keep Right Hand Pose"), keepHandAnimRight ? 1 : 0);
                 HugAnimator.SetLayerWeight(HugAnimator.GetLayerIndex("Keep Left Hand Pose"), keepHandAnimLeft ? 1 : 0);
             }
-            SecondaryAnimator?.Play(SecondaryAnimator.GetCurrentAnimatorStateInfo(0).shortNameHash, 0, time);
+            SecondaryAnimator.Exists()?.Play(SecondaryAnimator.GetCurrentAnimatorStateInfo(0).shortNameHash, 0, time);
             HugAnimator.SetTrigger(hugTrigger);
         }
 
@@ -411,7 +417,7 @@ private IEnumerator ResetAnimator(float delay)
                 HugAnimator.Play(stateHash, 0, time);
                 if (HugAnimator.layerCount > 1 && HugAnimator.GetCurrentAnimatorStateInfo(1).shortNameHash == stateHash) HugAnimator.Play(stateHash, 1, time);
             }
-            SecondaryAnimator?.Play(SecondaryAnimator.GetCurrentAnimatorStateInfo(0).shortNameHash, 0, time);
+            SecondaryAnimator.Exists()?.Play(SecondaryAnimator.GetCurrentAnimatorStateInfo(0).shortNameHash, 0, time);
             OnHugFinish?.Invoke();
             sequenceInProgress = false;
         }
@@ -456,6 +462,15 @@ private void CancelPending()
         }
 
 
-        private void OnDestroy() { OnDestroyEvent?.Invoke(); }
+        private void OnDestroy() 
+        {
+            SetHugEnabled(false);
+            if (HugReceiver != null)
+            {
+                HugReceiver.OnGainFocus -= EnableHug;
+                HugReceiver.OnLoseFocus -= DisableHug;
+            }
+            OnDestroyEvent?.Invoke(); 
+        }
     }
 }
diff --git a/HugMod/HugMod.cs b/HugMod/HugMod.cs
index 7917b9d..a96307e 100644
--- a/HugMod/HugMod.cs
+++ b/HugMod/HugMod.cs
@@ -11,6 +11,7 @@ public class HugMod : ModBehaviour
     {
         public static HugMod HugModInstance;
         public static Harmony HarmonyInstance;
+        public static HugModSettings Settings = new();
         public static RuntimeAnimatorController AltRuntimeController;
         public static bool PlayerHasDLC;
 
@@ -21,7 +22,6 @@ private void Awake()
         {
             HugModInstance = this;
             HarmonyInstance = new Harmony("VioVayo.HugMod");
-            HugPatches.Apply();
         }
 
         private bool MurderCheck()
@@ -37,9 +37,11 @@ private void Start()
             {
                 ModHelper.Console.WriteLine("Murder is bad >:C", MessageType.Error);
                 this.enabled = false;
-                return; 
+                return;
             }
 
+            var settings = HugModInstance.ModHelper.Storage.Load<HugModSettings>("settings.json");
+            if (settings != null) Settings = settings;
             var hugBundle = ModHelper.Assets.LoadBundle("Assets/hug_bundle");
             AltRuntimeController = hugBundle.LoadAsset<GameObject>("Assets/HugModAssets/HugAnims.prefab").GetComponent<Animator>().runtimeAnimatorController;
 
@@ -57,7 +59,16 @@ private void Start()
                 TargetManager.SetUpHugTargets(loadScene);
             };
 
+            HugPatches.Apply();
             ModHelper.Console.WriteLine($"{nameof(HugMod)} is loaded! " + (PlayerHasDLC ? HuggableFrightsMain.HFEnabledMessage(false) : ""), MessageType.Success);
         }
+
+        public static void UpdateSettings() { HugModInstance.ModHelper.Storage.Save(Settings, "settings.json"); }
+
+        public class HugModSettings
+        {
+            public bool FriendmakerModeEnabled = false;
+            public bool SillyGhostNames = false;
+        }
     }
 }
\ No newline at end of file
diff --git a/HugMod/HugModApi.cs b/HugMod/HugModApi.cs
index 7498863..a22d903 100644
--- a/HugMod/HugModApi.cs
+++ b/HugMod/HugModApi.cs
@@ -72,21 +72,21 @@ public void SetAnimationMasks(GameObject hugObject, bool fullbodyReact, bool kee
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
 
-        public void SetUnderlayTransition(GameObject hugObject, string transitionClipName, int transitionHash, float transitionTime)
+        public void SetUnderlayTransition(GameObject hugObject, AnimationClip transitionClip, int transitionHash, float transitionTime)
         {
-            if (hugObject.TryGetComponent(out HugComponent hug)) hug.SetUnderlayTransition(transitionClipName, transitionHash, transitionTime);
+            if (hugObject.TryGetComponent(out HugComponent hug)) hug.SetUnderlayTransition(transitionClip, transitionHash, transitionTime);
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
 
-        public void SetUnderlayTransition(GameObject hugObject, AnimationClip transitionClip, int transitionHash, float transitionTime)
+        public void SetUnderlayTransition(GameObject hugObject, string transitionClipName, int transitionHash, float transitionTime)
         {
-            if (hugObject.TryGetComponent(out HugComponent hug)) hug.SetUnderlayTransition(transitionClip, transitionHash, transitionTime);
+            if (hugObject.TryGetComponent(out HugComponent hug)) hug.SetUnderlayTransition(transitionClipName, transitionHash, transitionTime);
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
 
 
         //-----Get stuff-----
-        public InteractReceiver GetHugReceiver(GameObject hugObject)
+        public InteractReceiver GetInteractReceiver(GameObject hugObject)
         {
             if (hugObject.TryGetComponent(out HugComponent hug)) return hug.HugReceiver;
             else
@@ -96,7 +96,7 @@ public InteractReceiver GetHugReceiver(GameObject hugObject)
             }
         }
 
-        public Animator GetHugAnimator(GameObject hugObject) 
+        public Animator GetPrimaryAnimator(GameObject hugObject) 
         {
             if (hugObject.TryGetComponent(out HugComponent hug)) return hug.HugAnimator;
             else
@@ -204,9 +204,15 @@ public void ChangeTriggerCollider(GameObject hugObject, Collider newCompareColli
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
 
-        public void ChangePrimaryAnimator(GameObject hugObject, Animator newAnimator, RuntimeAnimatorController newAnimatorController)
+        public void ChangePrimaryAnimator(GameObject hugObject, Animator newAnimator, bool resetAnimatorController)
+        {
+            if (hugObject.TryGetComponent(out HugComponent hug)) hug.ChangePrimaryAnimator(newAnimator, resetAnimatorController);
+            else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
+        }
+
+        public void ChangeAnimatorController(GameObject hugObject, RuntimeAnimatorController newAnimatorController)
         {
-            if (hugObject.TryGetComponent(out HugComponent hug)) hug.ChangePrimaryAnimator(newAnimator, newAnimatorController);
+            if (hugObject.TryGetComponent(out HugComponent hug)) hug.ChangeAnimatorController(newAnimatorController);
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
 
@@ -216,9 +222,9 @@ public void ChangeSecondaryAnimator(GameObject hugObject, Animator newAnimator)
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
 
-        public void ChangeCharacterAnimController(GameObject hugObject, CharacterAnimController newAnimController)
+        public void ChangeCharacterAnimController(GameObject hugObject, CharacterAnimController newCharacterAnimController)
         {
-            if (hugObject.TryGetComponent(out HugComponent hug)) hug.ChangeCharacterAnimController(newAnimController);
+            if (hugObject.TryGetComponent(out HugComponent hug)) hug.ChangeCharacterAnimController(newCharacterAnimController);
             else HugMod.HugModInstance.ModHelper.Console.WriteLine($"Couldn't find HugComponent on \"{hugObject.name}\".", MessageType.Error);
         }
     }
diff --git a/HugMod/HugModUtilities.cs b/HugMod/HugModUtilities.cs
index 24d1802..b9d0892 100644
--- a/HugMod/HugModUtilities.cs
+++ b/HugMod/HugModUtilities.cs
@@ -5,7 +5,7 @@ namespace HugMod
 {
     public static class HugModUtilities
     {
-        public static T[] AddToArray<T>(T[] array, params T[] toAdd)
+        public static T[] AddToArray<T>(this T[] array, params T[] toAdd)
         {
             var list = array.ToList();
             foreach (var addition in toAdd) list.Add(addition);
@@ -13,10 +13,17 @@ public static T[] AddToArray<T>(T[] array, params T[] toAdd)
         }
 
         public static Transform FindInDescendants(this GameObject gameObject, string name, bool includeInactive = true)
+            => gameObject.GetComponentsInChildren<Transform>(includeInactive).FirstOrDefault(obj => obj.gameObject.name == name);
+
+        public static bool TryGetComponentInChildren<T>(this GameObject gameObject, out T component) where T : Component
         {
-            return gameObject.GetComponentsInChildren<Transform>(includeInactive).Where(obj => obj.gameObject.name == name).First();
+            component = gameObject.GetComponentInChildren<T>();
+            return component != null;
         }
 
+        public static GameObject CreateChild(this GameObject parentObject, string name, Vector3 localPosition = default, Vector3 localEulerAngles = default, float scaleMultiplier = 1)
+            => parentObject.transform.CreateChild(name, localPosition, localEulerAngles, scaleMultiplier);
+
         public static GameObject CreateChild(this Transform parentTransform, string name, Vector3 localPosition = default, Vector3 localEulerAngles = default, float scaleMultiplier = 1)
         {
             var childObj = new GameObject(name);
@@ -26,5 +33,8 @@ public static GameObject CreateChild(this Transform parentTransform, string name
             childObj.transform.localScale = scaleMultiplier * Vector3.one;
             return childObj;
         }
+
+        public static T Exists<T>(this T obj) where T : Object 
+            => (obj != null) ? obj : null; //Enable use of null conditional operators with destroyed Unity objects
     }
 }
diff --git a/HugMod/HugPatches.cs b/HugMod/HugPatches.cs
index 3a1d278..aa99284 100644
--- a/HugMod/HugPatches.cs
+++ b/HugMod/HugPatches.cs
@@ -20,7 +20,7 @@ public class HugPatches
         public static IEnumerable<CodeInstruction> PlayerCharacterController_UpdateMovement_Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             var matcher = new CodeMatcher(instructions).MatchForward(false, 
-                new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(OWInput), "OWInput.GetAxisValue", new Type[] { typeof(IInputCommands), typeof(InputMode) })),
+                new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(OWInput), nameof(OWInput.GetAxisValue), new Type[] { typeof(IInputCommands), typeof(InputMode) })),
                 new CodeMatch(OpCodes.Stloc_0)
             ).Advance(2);
 
@@ -45,14 +45,5 @@ public static bool UnityLogger_OnLogMessageReceived(string message)
             // Filter out goofy error that doesn't actually break anything
             return !message.EndsWith(") is out of bounds (size=0)");
         }
-
-
-        //ONLY FOR DEBUG
-        [HarmonyPrefix]
-        [HarmonyPatch(typeof(ShipLogManager), nameof(ShipLogManager.CheckForCompletionAchievement))]
-        public static bool ShipLogManager_CheckForCompletionAchievement_Prefix()
-        {
-            return false;
-        }
     }
 }
diff --git a/HugMod/HuggableFrights/GhostNavigation.cs b/HugMod/HuggableFrights/GhostNavigation.cs
index f717d73..c8d26a0 100644
--- a/HugMod/HuggableFrights/GhostNavigation.cs
+++ b/HugMod/HuggableFrights/GhostNavigation.cs
@@ -11,6 +11,8 @@ public class GhostNavigation : MonoBehaviour
         private List<Vector3> localWaypoints = new();
         private int maxCapacity = 5;
 
+        private bool isInBounds = false, wasInBounds = false;
+
 
         public void Start() { ghostController = gameObject.GetComponent<GhostController>(); }
 
@@ -30,6 +32,16 @@ public void UpdateNavigationToTarget(Vector3 localTarget, MoveType moveType)
             if (Physics.Raycast(gameObject.transform.position + gameObject.transform.up.normalized, -gameObject.transform.up, out RaycastHit hit, 1.25f, OWLayerMask.physicalMask)) 
                 gameObject.transform.position = hit.point;
 
+            //use existing navigation code while within bounds
+            wasInBounds = isInBounds;
+            isInBounds = ghostController.GetNodeMap().CheckLocalPointInBounds(gameObject.transform.localPosition);
+            if (isInBounds)
+            {
+                if (!ghostController.IsMoving()) ghostController.PathfindToLocalPosition(localTarget, moveType);
+                return;
+            }
+            else if (wasInBounds) AddLocalWaypoint(gameObject.transform.localPosition);
+
             //continuously projects target onto plane going through _transform.position
             var globalTarget = ghostController.LocalToWorldPosition(localTarget);
             var projection = Vector3.ProjectOnPlane(globalTarget - gameObject.transform.position, gameObject.transform.up) + gameObject.transform.position;
diff --git a/HugMod/HuggableFrights/HuggableFrightsMain.cs b/HugMod/HuggableFrights/HuggableFrightsMain.cs
index b4241d6..6fb1dc5 100644
--- a/HugMod/HuggableFrights/HuggableFrightsMain.cs
+++ b/HugMod/HuggableFrights/HuggableFrightsMain.cs
@@ -6,14 +6,11 @@
 using UnityEngine;
 using UnityEngine.UI;
 using static HugMod.HugMod;
-using static HugMod.HugModUtilities;
 
 namespace HugMod.HuggableFrights
 {
     public class HuggableFrightsMain
     {
-        public static bool IsHuggableFrightsEnabled { get; private set; } = false;
-
         public static List<GhostBrain> OwlBrains { get; private set; } = new();
 
         public static GhostAction.Name HuggedActionName { get; private set; }
@@ -36,7 +33,6 @@ public static void HFSetup()
         {
             if (HugModInstance.ModHelper.Interaction.ModExists("Leadpogrommer.PeacefulGhosts")) return;
 
-            IsHuggableFrightsEnabled = HugModInstance.ModHelper.Storage.Load<bool>("settings.json");
             HuggedActionName = EnumUtils.Create<GhostAction.Name>("Hugged");
             WitnessedHugActionName = EnumUtils.Create<GhostAction.Name>("WitnessedHug");
             ReturnActionName = EnumUtils.Create<GhostAction.Name>("Return");
@@ -57,11 +53,11 @@ public static void HFOwlSetup(HugComponent hugComponent)
             if (!setupComplete) return;
 
             var brain = hugComponent.gameObject.GetComponent<GhostBrain>();
-            brain._actions = AddToArray(brain._actions, HuggedActionName, WitnessedHugActionName, ReturnActionName);
+            brain._actions = brain._actions.AddToArray(HuggedActionName, WitnessedHugActionName, ReturnActionName);
             brain._effects.OnGrabComplete += () => { hugComponent.SetHugEnabled(false); };
 
             hugComponent.gameObject.AddComponent<GhostNavigation>();
-            hugComponent.HugReceiver._interactRange = owlReceiverRange;
+            hugComponent.HugReceiver.SetInteractRange(owlReceiverRange);
             hugComponent.OnHugStart += () => { brain.ChangeAction(HuggedActionName); };
             hugComponent.OnHugFinish += () => { if (brain._currentAction.GetName() == HuggedActionName) brain._currentAction._enterTime = Time.time; };
 
@@ -70,7 +66,7 @@ public static void HFOwlSetup(HugComponent hugComponent)
 
         public static string HFEnabledMessage(bool wasChanged)
         {
-            return setupComplete ? $"{optionText} is" + (wasChanged ? " now: " : ": ") + (IsHuggableFrightsEnabled ? "Enabled" : "Disabled") : "";
+            return setupComplete ? $"{optionText} is" + (wasChanged ? " now: " : ": ") + (Settings.FriendmakerModeEnabled ? "Enabled" : "Disabled") : "";
         }
 
 
@@ -87,21 +83,21 @@ private static void AddHuggableFrightsOption()
             GameObject.Destroy(settingsOptionObj.GetComponentInChildren<ReducedFrightsPopup>());
 
             var toggleElement = settingsOptionObj.GetComponent<ToggleElement>();
-            toggleElement.Initialize(IsHuggableFrightsEnabled);
+            toggleElement.Initialize(Settings.FriendmakerModeEnabled);
             toggleElement.SetDisplayText(optionText);
             toggleElement.SetTooltipText(UITextType.None);
             toggleElement._overrideTooltipText = optionTooltipText;
 
             //make keyboard-selectable
             var menu = menuObj.GetComponentInChildren<Menu>();
-            menu._menuOptions = AddToArray(menu._menuOptions, toggleElement);
+            menu._menuOptions = menu._menuOptions.AddToArray(toggleElement);
             Menu.SetVerticalNavigation(menu, menu._menuOptions);
 
             //toggle
             var toggleButton = settingsOptionObj.GetComponent<Button>();
             toggleButton.onClick.AddListener(() =>
             {
-                if (toggleElement._value != 1) return;
+                if (toggleElement._value != 1) return; //the value is changed before this action is called so this checks for what it's toggled *to*
                 var popup = HugModInstance.ModHelper.Menus.PopupManager.CreateMessagePopup(popupText, true, popupConfirmText, popupCancelText);
                 popup.OnCancel += toggleElement.Toggle;
             });
@@ -115,16 +111,16 @@ private static void AddHuggableFrightsOption()
 
         private static void HuggableFrightsToggle(bool enable)
         {
-            if (enable == IsHuggableFrightsEnabled) return;
-            IsHuggableFrightsEnabled = enable;
-            HugModInstance.ModHelper.Storage.Save(IsHuggableFrightsEnabled, "settings.json");
+            if (enable == Settings.FriendmakerModeEnabled) return;
+            Settings.FriendmakerModeEnabled = enable;
             OnHuggableFrightsToggle?.Invoke(enable);
             HugModInstance.ModHelper.Console.WriteLine(HFEnabledMessage(true), MessageType.Success);
+            UpdateSettings();
         }
 
         private static void EnableOwlToggle(HugComponent hugComponent)
         {
-            if (!IsHuggableFrightsEnabled) hugComponent.SetHugEnabled(false);
+            if (!Settings.FriendmakerModeEnabled) hugComponent.SetHugEnabled(false);
             OnHuggableFrightsToggle += hugComponent.SetHugEnabled;
             hugComponent.OnDestroyEvent += () => { OnHuggableFrightsToggle -= hugComponent.SetHugEnabled; };
         }
diff --git a/HugMod/HuggableFrights/HuggableFrightsPatches.cs b/HugMod/HuggableFrights/HuggableFrightsPatches.cs
index a047383..dfd1e8c 100644
--- a/HugMod/HuggableFrights/HuggableFrightsPatches.cs
+++ b/HugMod/HuggableFrights/HuggableFrightsPatches.cs
@@ -27,14 +27,14 @@ public static bool GhostAction_CreateAction_Prefix(GhostAction.Name name, ref Gh
         [HarmonyPatch(typeof(GhostGrabController), nameof(GhostGrabController.OnSnapPlayerNeck))]
         public static void GhostGrabController_OnSnapPlayerNeck_Postfix(GhostGrabController __instance)
         {
-            if (IsHuggableFrightsEnabled) __instance._origParent.gameObject.GetComponent<HugComponent>().SetHugEnabled(true);
+            if (Settings.FriendmakerModeEnabled) __instance._origParent.gameObject.GetComponent<HugComponent>().SetHugEnabled(true);
         }
 
         [HarmonyPostfix]
         [HarmonyPatch(typeof(GhostGrabController), nameof(GhostGrabController.CompleteExtinguish))]
         public static void GhostGrabController_CompleteExtinguish_Postfix(GhostGrabController __instance)
         {
-            if (IsHuggableFrightsEnabled) __instance._origParent.gameObject.GetComponent<HugComponent>().SetHugEnabled(true);
+            if (Settings.FriendmakerModeEnabled) __instance._origParent.gameObject.GetComponent<HugComponent>().SetHugEnabled(true);
         }
     }
 }
diff --git a/HugMod/HuggableFrights/HuggedAction.cs b/HugMod/HuggableFrights/HuggedAction.cs
index 807d7c1..d7deb43 100644
--- a/HugMod/HuggableFrights/HuggedAction.cs
+++ b/HugMod/HuggableFrights/HuggedAction.cs
@@ -21,7 +21,7 @@ public class HuggedAction : GhostAction
         private float hugStunTime = 30;
         private float focusDelay = 0.4f;
         private float followDistance = 7;
-        private float followLimit = 15;
+        private float followLimit = 20;
         private float maxPositionOffset = 3.5f;
 
         private int chanceToStopWhileMoving = 1;
diff --git a/HugMod/IHugModApi.cs b/HugMod/IHugModApi.cs
index f010c8a..be8b5d8 100644
--- a/HugMod/IHugModApi.cs
+++ b/HugMod/IHugModApi.cs
@@ -15,13 +15,14 @@ public interface IHugModApi
         void AddHugComponent(GameObject hugObject, bool initialiseImmediately = true);
 
         /// <summary>
-        /// Initialises the hug script attached to a given GameObject
+        /// Initialises the hug script attached to a given GameObject by searching for required components in its children and adding new components if needed
         /// </summary>
         /// <param name="hugObject">The huggable GameObject, requires an OWCollider component on it or one of its children</param>
         void InitialiseHugComponent(GameObject hugObject);
 
         /// <summary>
-        /// Destroys a given GameObject's attached hug script along with all of the hug script's proxy components
+        /// Destroys a given GameObject's attached hug script, along with all proxy components added by it<br/>
+        /// Does not affect InteractReceivers even if they were added by the hug script
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         void RemoveHugComponent(GameObject hugObject);
@@ -30,61 +31,74 @@ public interface IHugModApi
         //-----Set stuff-----
 
         /// <summary>
-        /// Toggles huggability of a huggable GameObject, enabled by default
+        /// Toggles huggability of a huggable GameObject<br/>
+        /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="enable">False to disable hug script, true to reenable</param>
         void SetHugEnabled(GameObject hugObject, bool enable);
 
         /// <summary>
-        /// Toggles a humanoid target looking towards the player during a hug on and off, enabled by default<br/><br/>
+        /// Toggles whether a target looks at the player during a hug<br/>
+        /// Requires the target to be animated and humanoid<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <param name="enable">False to disable LookIK script, true to reenable</param>
+        /// <param name="enable">False to disable Look IK script, true to reenable</param>
         void SetLookAtPlayerEnabled(GameObject hugObject, bool enable);
 
         /// <summary>
-        /// Forces a humanoid target to look towards the player even outside of a hug sequence
+        /// Forces a target to look at the player even outside of a hug sequence<br/>
+        /// Requires the target to be animated and humanoid<br/>
+        /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <param name="enable">If true, Look IK has maximum weight regardless of whether a sequence is ongoing or not</param>
+        /// <param name="enable">If true, Look IK has maximum weight regardless of whether a sequence is ongoing or not<br/>
+        /// False to reset</param>
         void ForceLookAtPlayer(GameObject hugObject, bool enable);
 
         /// <summary>
-        /// Makes the interact prompt display the right name
+        /// Sets the name displayed in the hug interact prompt
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="name">The name to be featured in the prompt</param>
         void SetPrompt(GameObject hugObject, string name);
 
         /// <summary>
-        /// Makes the player lean in towards the right place during a hug
+        /// Sets what point the player camera should focus on during a hug<br/>
+        /// This point's position in relation to the player also decides whether a target is out of reach, and what animation is used for the player
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <param name="focusPoint">The point to look at relative to the GameObject's Transform</param>
+        /// <param name="focusPoint">The point relative to the huggable GameObject's Transform</param>
         void SetFocusPoint(GameObject hugObject, Vector3 focusPoint);
 
         /// <summary>
-        /// Change what kind of animation is played in response to a hug
+        /// Sets what reaction animation is played when the target is hugged<br/>
+        /// Requires the target to be animated and humanoid<br/><br/>
+        /// If you have an animated but nonhumanoid target with custom animations you want to use,<br/>
+        /// use the events provided by the hug sequence to trigger your animations instead
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <param name="hugTrigger">Best set as (int)HugTrigger</param>
+        /// <param name="hugTrigger">Best set as (int)HugTrigger, using the enum included in the IHugModApi.cs file<br/><br/>
+        /// If you have an animated humanoid target with its own custom animations you want to use,<br/>
+        /// leave the trigger as None and use the events provided by the hug sequence to trigger your animations</param>
         void SetAnimationTrigger(GameObject hugObject, int hugTrigger);
 
         /// <summary>
-        /// Decides how much of the original animation to override and which parts to keep during a hug
+        /// Decides how much of the original animation to override and which parts to keep during a hug<br/>
+        /// Requires the target to be animated and humanoid
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <param name="fullbodyReact">If false, limits the animation override to the torso</param>
-        /// <param name="keepRightFootPosition">If true, keeps the original animation on right foot</param>
-        /// <param name="keepLeftFootPosition">If true, keeps the original animation on left foot</param>
-        /// <param name="keepRightHandPose">If true, keeps the original animation on right fingers</param>
-        /// <param name="keepLeftHandPose">If true, keeps the original animation on left fingers</param>
+        /// <param name="fullbodyReact">If false, limits the animation override to the upper body while leaving hips and legs untouched</param>
+        /// <param name="keepRightFootPosition">If true, keeps the original animation on the right foot</param>
+        /// <param name="keepLeftFootPosition">If true, keeps the original animation on the left foot</param>
+        /// <param name="keepRightHandPose">If true, keeps the original animation on the right hand fingers</param>
+        /// <param name="keepLeftHandPose">If true, keeps the original animation on the left hand fingers</param>
         void SetAnimationMasks(GameObject hugObject, bool fullbodyReact = true, bool keepRightFootPosition = false, bool keepLeftFootPosition = false, bool keepRightHandPose = false, bool keepLeftHandPose = false);
 
         /// <summary>
-        /// (optional) Makes it so a transition happens during a hug sequence, causing it to always exit into a specific AnimatorState
+        /// Makes it so an animation transition happens during a hug sequence, causing it to always exit into a specific AnimatorState<br/>
+        /// Requires the target to be animated and humanoid, and doesn't work if HugTrigger is set to None
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="transitionClip">An AnimationClip associated with the new AnimatorState</param>
@@ -93,7 +107,8 @@ public interface IHugModApi
         void SetUnderlayTransition(GameObject hugObject, AnimationClip transitionClip, int transitionHash, float transitionTime = 0.5f);
 
         /// <summary>
-        /// (optional) Makes it so a transition happens during a hug sequence, causing it to always exit into a specific AnimatorState<br/><br/>
+        /// Makes it so an animation transition happens during a hug sequence, causing it to always exit into a specific AnimatorState<br/>
+        /// Requires the target to be animated and humanoid, and doesn't work if HugTrigger is set to None<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
@@ -106,23 +121,23 @@ public interface IHugModApi
         //-----Get stuff-----
 
         /// <summary>
-        /// Returns the InteractReceiver associated with the hug script<br/><br/>
+        /// Returns the InteractReceiver associated with the hug script<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <returns>The currently set Interactreceiver</returns>
-        InteractReceiver GetHugReceiver(GameObject hugObject);
+        /// <returns>The currently set InteractReceiver</returns>
+        InteractReceiver GetInteractReceiver(GameObject hugObject);
 
         /// <summary>
-        /// Returns the primary Animator used by the hug script<br/><br/>
+        /// Returns the primary Animator used by the hug script<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <returns>The currently set primary Animator</returns>
-        Animator GetHugAnimator(GameObject hugObject);
+        Animator GetPrimaryAnimator(GameObject hugObject);
 
         /// <summary>
-        /// Returns the secondary Animator used by the hug script<br/><br/>
+        /// Returns the secondary Animator used by the hug script<br/>
         /// Requires hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
@@ -146,52 +161,55 @@ public interface IHugModApi
         bool IsSequenceInProgress(GameObject hugObject);
 
         /// <summary>
-        /// Checks if animations are currently being altered by HugMod
+        /// Checks if animations are currently being altered by HugMod<br/>
+        /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <returns>If true, the RuntimeAnimatorController has been replaced with HugMod's AnimatorOverrideController</returns>
+        /// <returns>If true, the Animator's RuntimeAnimatorController has been temporarily set to HugMod's AnimatorOverrideController</returns>
         bool IsAnimatorControllerSwapped(GameObject hugObject);
 
         /// <summary>
         /// Returns a method to cut an ongoing hug sequence involving a given GameObject short
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <returns>The method that stops the sequence</returns>
+        /// <returns>The method that stops the sequence for that GameObject, can be called by itself or subscribed to an event</returns>
         Action CancelHugSequence(GameObject hugObject);
 
 
         //-----Event subs-----
 
         /// <summary>
-        /// Subscribes to an event that fires at the start of a hug sequence
+        /// Subscribes to an event that fires at the start of a hug sequence involving a given GameObject
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="action">The method to call</param>
         void OnHugStart(GameObject hugObject, Action action);
 
         /// <summary>
-        /// Subscribes to an event that fires before an underlay transition, only if transitionHash and transitionClip are both defined
+        /// Subscribes to an event that fires before an underlay transition, only if transitionHash and transitionClip are both defined<br/>
+        /// Requires the target to be animated and humanoid, and doesn't work if HugTrigger is set to None
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="action">The method to call</param>
         void OnUnderlayTransitionStart(GameObject hugObject, Action action);
 
         /// <summary>
-        /// Subscribes to an event that fires at the start of the transition out of the hug, animated targets only
+        /// Subscribes to an event that fires at the start of the transition out of the hug<br/>
+        /// Requires the target to be animated and humanoid
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="action">The method to call</param>
         void OnConcludingHug(GameObject hugObject, Action action);
 
         /// <summary>
-        /// Subscribes to an event that fires at the end of a hug sequence
+        /// Subscribes to an event that fires at the end of a hug sequence involving a given GameObject
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="action">The method to call</param>
         void OnHugFinish(GameObject hugObject, Action action);
 
         /// <summary>
-        /// Subscribes to an event that fires when the HugComponent is destroyed
+        /// Subscribes to an event that fires when the hug script attached to a given GameObject is destroyed
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="action">The method to call</param>
@@ -201,7 +219,7 @@ public interface IHugModApi
         //-----Change yoinkables-----
 
         /// <summary>
-        /// Sets or changes the associated InteractReceiver<br/><br/>
+        /// Sets or changes the associated InteractReceiver<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
@@ -210,7 +228,7 @@ public interface IHugModApi
         void ChangeInteractReceiver(GameObject hugObject, InteractReceiver newReceiver, bool resetTriggerCollider = false);
 
         /// <summary>
-        /// Creates a new trigger Collider of the same type and position as a given Collider, but with slightly increased scale<br/><br/>
+        /// Creates a new trigger Collider of the same type and position as a given Collider, but with slightly increased scale<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
@@ -218,16 +236,25 @@ public interface IHugModApi
         void ChangeTriggerCollider(GameObject hugObject, Collider newCompareCollider);
 
         /// <summary>
-        /// Sets or changes the associated primary Animator and related RuntimeAnimatorController<br/><br/>
+        /// Sets or changes the associated primary Animator<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="newAnimator">The new Animator</param>
+        /// <param name="resetAnimatorController">If true, automatically sets RuntimeAnimatorController to the one associated with the new Animator</param>
+        void ChangePrimaryAnimator(GameObject hugObject, Animator newAnimator, bool resetAnimatorController = true);
+
+        /// <summary>
+        /// Sets or changes the RuntimeAnimatorController used when resetting animations after a hug sequence<br/>
+        /// Requires the target to be animated and humanoid, and doesn't work if HugTrigger is set to None<br/>
+        /// Requires the hug script to be initialised
+        /// </summary>
+        /// <param name="hugObject">The huggable GameObject</param>
         /// <param name="newAnimatorController">The new RuntimeAnimatorController</param>
-        void ChangePrimaryAnimator(GameObject hugObject, Animator newAnimator, RuntimeAnimatorController newAnimatorController);
+        void ChangeAnimatorController(GameObject hugObject, RuntimeAnimatorController newAnimatorController);
 
         /// <summary>
-        /// Sets or changes the associated secondary Animator<br/><br/>
+        /// Sets or changes the associated secondary Animator<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
@@ -235,12 +262,12 @@ public interface IHugModApi
         void ChangeSecondaryAnimator(GameObject hugObject, Animator newAnimator);
 
         /// <summary>
-        /// Sets or changes the associated CharacterAnimController<br/><br/>
+        /// Sets or changes the CharacterAnimController the Look IK script coordinates with<br/>
         /// Requires the hug script to be initialised
         /// </summary>
         /// <param name="hugObject">The huggable GameObject</param>
-        /// <param name="newAnimController">The new CharacterAnimController</param>
-        void ChangeCharacterAnimController(GameObject hugObject, CharacterAnimController newAnimController);
+        /// <param name="newCharacterAnimController">The new CharacterAnimController</param>
+        void ChangeCharacterAnimController(GameObject hugObject, CharacterAnimController newCharacterAnimController);
     }
 
     public enum HugTrigger
diff --git a/HugMod/Targets/Friends.json b/HugMod/Targets/Friends.json
index 702c1f1..106b4f4 100644
--- a/HugMod/Targets/Friends.json
+++ b/HugMod/Targets/Friends.json
@@ -18,6 +18,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Prisoner": {
@@ -39,9 +40,10 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
-  "Eye_Solanum": {
+  "Solanum_Eye": {
     "name": "Solanum",
     "objectName": "Solanum",
     "hugTrigger": 9,
@@ -60,9 +62,10 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   },
-  "Eye_Prisoner_1": {
+  "Prisoner_Eye_1": {
     "name": "the Prisoner",
     "objectName": "Prisoner_Choice",
     "hugTrigger": 10,
@@ -81,9 +84,10 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   },
-  "Eye_Prisoner_2": {
+  "Prisoner_Eye_2": {
     "name": "the Prisoner",
     "objectName": "Prisoner_Campfire",
     "hugTrigger": 10,
@@ -102,6 +106,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   }
 }
\ No newline at end of file
diff --git a/HugMod/Targets/Ghosts.json b/HugMod/Targets/Ghosts.json
index a8e0825..76afc39 100644
--- a/HugMod/Targets/Ghosts.json
+++ b/HugMod/Targets/Ghosts.json
@@ -18,6 +18,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Charles": {
@@ -39,6 +40,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "John": {
@@ -60,6 +62,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Josh": {
@@ -81,6 +84,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Chuck": {
@@ -102,6 +106,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Greg": {
@@ -123,6 +128,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Tom": {
@@ -144,6 +150,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Will": {
@@ -165,6 +172,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Jean": {
@@ -186,6 +194,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Mike": {
@@ -207,6 +216,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Richard": {
@@ -228,6 +238,29 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
+    "isAtEye": false
+  },
+  "Ben": {
+    "name": "Ben",
+    "objectName": "Prefab_IP_GhostBird_TheCollector",
+    "hugTrigger": 10,
+    "focusPoint": {
+      "Item1": 0.0,
+      "Item2": 2.1,
+      "Item3": 0.35
+    },
+    "fullbodyReact": true,
+    "keepFootAnimRight": false,
+    "keepFootAnimLeft": false,
+    "keepHandAnimRight": false,
+    "keepHandAnimLeft": false,
+    "transitionTime": 0.5,
+    "transitionHash": 640249298,
+    "transitionClipName": "Ghostbird_Idle_Unaware",
+    "isTraveller": false,
+    "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Bob": {
@@ -249,6 +282,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Dan": {
@@ -270,6 +304,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "George": {
@@ -291,6 +326,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Steve": {
@@ -312,6 +348,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Frank": {
@@ -333,6 +370,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Carl": {
@@ -354,6 +392,7 @@
     "transitionClipName": "Ghostbird_Idle_Unaware",
     "isTraveller": false,
     "isOwl": true,
+    "isPartyOwl": false,
     "isAtEye": false
   }
 }
\ No newline at end of file
diff --git a/HugMod/Targets/Partyghosts.json b/HugMod/Targets/Partyghosts.json
index defb675..052b335 100644
--- a/HugMod/Targets/Partyghosts.json
+++ b/HugMod/Targets/Partyghosts.json
@@ -17,7 +17,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy2": {
@@ -38,7 +39,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy3": {
@@ -59,7 +61,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy4": {
@@ -80,7 +83,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy5": {
@@ -101,7 +105,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy6": {
@@ -122,7 +127,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy7": {
@@ -143,7 +149,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy8": {
@@ -164,7 +171,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy9": {
@@ -185,7 +193,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy10": {
@@ -206,7 +215,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy11": {
@@ -227,7 +237,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   },
   "OwlProxy12": {
@@ -248,7 +259,8 @@
     "transitionHash": 0,
     "transitionClipName": "",
     "isTraveller": false,
-    "isOwl": true,
+    "isOwl": false,
+    "isPartyOwl": true,
     "isAtEye": false
   }
 }
\ No newline at end of file
diff --git a/HugMod/Targets/Target.cs b/HugMod/Targets/Target.cs
index b1053ae..01f44de 100644
--- a/HugMod/Targets/Target.cs
+++ b/HugMod/Targets/Target.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using System.Linq;
+using UnityEngine;
 
 namespace HugMod.Targets
 {
@@ -6,17 +7,23 @@ public class Target
     {
         public string name = "", objectName = "";
         public HugTrigger hugTrigger = HugTrigger.None;
-        public (float, float, float) focusPoint = (0, 0.1f, 0);
+        public (float, float, float) focusPoint = (0, 0, 0);
         public bool fullbodyReact = true, keepFootAnimRight = false, keepFootAnimLeft = false, keepHandAnimRight = false, keepHandAnimLeft = false;
         public float transitionTime = 0.5f;
         public int transitionHash = 0;
         public string transitionClipName = "";
-        public bool isTraveller = false, isOwl = false, isAtEye = false;
+        public bool isTraveller = false, isOwl = false, isPartyOwl = false, isAtEye = false;
 
 
-        public GameObject GetTargetObject() { return GameObject.Find(objectName); }
+        public GameObject GetTargetObject() 
+        { 
+            var objNames = objectName.Split('/');
+            var obj = Resources.FindObjectsOfTypeAll<GameObject>().FirstOrDefault(obj => obj.name == objNames[0]);
+            if (obj != null && objNames.Length > 1) for (int n = 1; n < objNames.Length; ++n) obj = obj.transform.Find(objNames[n]).gameObject;
+            return obj;
+        }
 
-        public HugComponent GetHugComponent() { return GameObject.Find(objectName).GetComponent<HugComponent>(); }
+        public HugComponent GetHugComponent() { return GetTargetObject().GetComponent<HugComponent>(); }
 
         public Vector3 GetFocusPoint() { return new(focusPoint.Item1, focusPoint.Item2, focusPoint.Item3); }
     }
diff --git a/HugMod/Targets/TargetManager.cs b/HugMod/Targets/TargetManager.cs
index 88c440c..e5c3805 100644
--- a/HugMod/Targets/TargetManager.cs
+++ b/HugMod/Targets/TargetManager.cs
@@ -12,11 +12,11 @@ public class TargetManager
 
         private static Dictionary<string, Target> travellers, villagers, friends, owls, partyOwls;
 
-        private static GameObject owlColliderObj;
-        private static GameObject proxyColliderObj; //every target runs through all of AddHugComponent as part of the foreach so proxyColliderObj is the same pre- and post-initialisation
-
         private static OWScene currentScene;
 
+        private static GameObject owlColliderObj;
+        private static GameObject proxyOwlColliderObj;
+
 
         public static void ApplyTargetPatches()
         {
@@ -43,10 +43,10 @@ public static void SetUpHugTargets(OWScene loadScene)
 
             if (currentScene == OWScene.EyeOfTheUniverse)
             {
-                if (PlayerData.GetPersistentCondition("MET_SOLANUM")) AddHugComponent(friends["Eye_Solanum"]);
+                if (PlayerData.GetPersistentCondition("MET_SOLANUM")) AddHugComponent(friends["Solanum_Eye"]);
                 if (!PlayerHasDLC || !PlayerData.GetPersistentCondition("MET_PRISONER")) return;
-                AddHugComponent(friends["Eye_Prisoner_1"]);
-                AddHugComponent(friends["Eye_Prisoner_2"]);
+                AddHugComponent(friends["Prisoner_Eye_1"]);
+                AddHugComponent(friends["Prisoner_Eye_2"]);
                 return;
             }
 
@@ -61,7 +61,6 @@ public static void SetUpHugTargets(OWScene loadScene)
             var prisonerEvent = GameObject.Find("Prefab_IP_GhostBird_Prisoner/Ghostbird_IP_ANIM").GetComponent<PrisonerEffects>();
             if (prisonerEvent != null) prisonerEvent.OnReactToVisionAnimationComplete += () => { HugReenable(friends["Prisoner"]); };
 
-            owlColliderObj = GameObject.Find("Prefab_IP_GhostBird_Micolash/Collider_Ghost");
             foreach (var entry in partyOwls) AddHugComponent(entry.Value);
             foreach (var entry in owls) AddHugComponent(entry.Value);
         }
@@ -76,7 +75,7 @@ private static HugComponent AddHugComponent(Target target)
                 return null;
             }
             var hugComponent = targetObj.AddComponent<HugComponent>();
-            PreInitIndividualise(target, hugComponent);
+            Individualise_PreInit(target, hugComponent);
             hugComponent.Initialise();
             hugComponent.SetPrompt(target.name);
             hugComponent.SetFocusPoint(target.GetFocusPoint());
@@ -98,74 +97,80 @@ private static void HugReenable(Target target) //prevent loss of huggability aft
         }
 
 
-        private static void PreInitIndividualise(Target target, HugComponent hugComponent)
+        private static void Individualise_PreInit(Target target, HugComponent hugComponent)
         {
-            if (target.isOwl && partyOwls.ContainsValue(target))
-            {
-                if (owlColliderObj != null) proxyColliderObj = GameObject.Instantiate(owlColliderObj, hugComponent.gameObject.transform);
-            }
+            if (target.isAtEye && currentScene == OWScene.EyeOfTheUniverse) return;
+            if (target == travellers["Gabbro"]) GabbroHug = hugComponent;
+            if (target == friends["Solanum"]) SolanumHug = hugComponent;
             if (target == friends["Prisoner"])
             {
-                var receiverTransform = hugComponent.transform.Find("InteractReceiver");
-                var receiverCollider = receiverTransform.gameObject.GetComponent<CapsuleCollider>();
-                var lookTarget = receiverTransform.Find("ConversationLookTarget");
-                var prisonerColliderTransform = hugComponent.gameObject.FindInDescendants("Collider_Prisoner", false);
-                var prisonerCollider = prisonerColliderTransform.gameObject.GetComponent<CapsuleCollider>();
-
-                lookTarget.SetParent(receiverTransform.parent, true);
-
-                receiverTransform.SetParent(prisonerColliderTransform.parent);
-                receiverTransform.localPosition = prisonerColliderTransform.localPosition;
-                receiverTransform.localRotation = prisonerColliderTransform.localRotation;
-                receiverTransform.localScale = prisonerColliderTransform.localScale;
-
-                receiverCollider.center = prisonerCollider.center;
-                receiverCollider.radius = prisonerCollider.radius;
-                receiverCollider.height = prisonerCollider.height;
-                receiverCollider.direction = prisonerCollider.direction;
+                PrisonerHug = hugComponent;
+                Individualise_Prisoner_PreInit(target, hugComponent);
             }
+            if (target.isPartyOwl) Individualise_PartyOwls_PreInit(target, hugComponent);
         }
-
-
         private static void Individualise(Target target, HugComponent hugComponent)
         {
-            if (target == travellers["Riebeck"])
-            {
-                var collider = hugComponent.gameObject.transform.Find("CapsuleCollider")?.gameObject.GetComponent<Collider>();
-                hugComponent.ChangeTriggerCollider(collider);
-            }
             if (target.isAtEye && currentScene == OWScene.EyeOfTheUniverse)
             {
-                AnimationClip nullClip = null;
-                hugComponent.SetUnderlayTransition(nullClip, 0);
-
-                if (target == travellers["Gabbro"]) hugComponent.SetFocusPoint(new(0.06f, 0.75f, -1.1f));
-                if (target == friends["Eye_Solanum"])
-                {
-                    var collider = hugComponent.gameObject.transform.Find("Collider (2)")?.gameObject.GetComponent<Collider>();
-                    hugComponent.ChangeTriggerCollider(collider); 
-                }
-                if (target == friends["Eye_Prisoner_1"]) 
-                {
-                    var prisonerEvent = hugComponent.gameObject.GetComponentInChildren<CharacterDialogueTree>();
-                    if (prisonerEvent != null) prisonerEvent.OnEndConversation += () => { HugReenable(target); }; 
-                }
+                Individualise_AtEye(target, hugComponent);
                 return;
             }
-            if (target.isTraveller)
+            if (target.isTraveller) Individualise_Travellers(target, hugComponent);
+            if (target == travellers["Riebeck"]) Individualise_Riebeck(target, hugComponent);
+            if (target == travellers["Chert"]) Individualise_Chert(target, hugComponent);
+            if (target == travellers["Gabbro"]) Individualise_Gabbro(target, hugComponent);
+            if (target == travellers["Esker"]) Individualise_Esker(target, hugComponent);
+            if (target == villagers["Hal_1"]) Individualise_Hal_1(target, hugComponent);
+            if (target == villagers["Gneiss"]) Individualise_Gneiss(target, hugComponent);
+            if (target == villagers["Spinel"]) Individualise_Spinel(target, hugComponent);
+            if (target == villagers["Tuff"]) Individualise_Tuff(target, hugComponent);
+            if (target == villagers["Tektite"]) Individualise_Tektite(target, hugComponent);
+            if (target == villagers["Arkose"]) Individualise_Arkose(target, hugComponent);
+            if (target == friends["Solanum"]) Individualise_Solanum(target, hugComponent);
+            if (target.isOwl) Individualise_Owls(target, hugComponent);
+            if (target.isPartyOwl) Individualise_PartyOwls(target, hugComponent);
+        }
+
+        private static void Individualise_AtEye(Target target, HugComponent hugComponent)
+        {
+            AnimationClip nullClip = null;
+            hugComponent.SetUnderlayTransition(nullClip, 0);
+
+            if (target == travellers["Riebeck"]) Individualise_Riebeck(target, hugComponent);
+            if (target == travellers["Chert"]) Individualise_Chert_Eye(target, hugComponent);
+            if (target == travellers["Gabbro"]) Individualise_Gabbro_Eye(target, hugComponent);
+            if (target == travellers["Esker"]) Individualise_Esker_Eye(target, hugComponent);
+            if (target == friends["Solanum_Eye"]) Individualise_Solanum_Eye(target, hugComponent);
+            if (target == friends["Prisoner_Eye_1"]) Individualise_Prisoner_Eye_1(target, hugComponent);
+            if (target == friends["Prisoner_Eye_2"]) Individualise_Prisoner_Eye_2(target, hugComponent);
+        }
+        private static void Individualise_Travellers(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.TryGetComponentInChildren(out TravelerController controller))
             {
-                var controller = hugComponent.gameObject.GetComponentInChildren<TravelerController>();
                 hugComponent.OnHugStart += controller.StartConversation;
                 hugComponent.OnHugFinish += () =>
                 {
-                    controller._animator?.SetTrigger("Playing"); //Esker's Animator isn't assigned to their TravelerController
+                    controller._animator.Exists()?.SetTrigger("Playing"); //Esker's Animator isn't assigned to their TravelerController
                     Locator.GetTravelerAudioManager().PlayAllTravelerAudio(target == travellers["Riebeck"] || target == travellers["Chert"] ? 0 : controller._delayToRestartAudio);
                 };
             }
-            if (target == travellers["Chert"])
+        }
+        private static void Individualise_Riebeck(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.transform.Find("CapsuleCollider")?.gameObject.TryGetComponent(out CapsuleCollider collider) ?? false)
+            {
+                collider.radius += 0.17f;
+                hugComponent.ChangeTriggerCollider(collider);
+            }
+        }
+        private static void Individualise_Chert(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.TryGetComponentInChildren(out ChertTravelerController controller))
             {
-                var controller = hugComponent.gameObject.GetComponentInChildren<ChertTravelerController>();
                 var moodMemory = controller._mood;
+
                 hugComponent.OnHugStart += () =>
                 {
                     if (hugComponent.IsAnimatorControllerSwapped()) return;
@@ -180,12 +185,22 @@ private static void Individualise(Target target, HugComponent hugComponent)
                     controller._animator.SetFloat("Mood", weight);
                 };
             }
-            if (target == travellers["Gabbro"])
+        }
+        private static void Individualise_Chert_Eye(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.transform.Find("Collider")?.gameObject.TryGetComponent(out Collider collider) ?? false) hugComponent.ChangeTriggerCollider(collider);
+        }
+        private static void Individualise_Gabbro(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.HugReceiver.Exists()?.gameObject.transform.Find("Hug_TriggerCollider")?.TryGetComponent(out SphereCollider collider) ?? false)
             {
-                GabbroHug = hugComponent;
-                var controller = hugComponent.gameObject.GetComponentInChildren<GabbroTravelerController>();
+                collider.center = collider.gameObject.transform.InverseTransformPoint(hugComponent.gameObject.transform.TransformPoint(target.GetFocusPoint()));
+                collider.radius = 1;
+            }
 
-                hugComponent.ChangePrimaryAnimator(controller._animator, controller._animator.runtimeAnimatorController);
+            if (hugComponent.gameObject.TryGetComponentInChildren(out GabbroTravelerController controller))
+            {
+                hugComponent.ChangePrimaryAnimator(controller._animator);
                 hugComponent.ChangeSecondaryAnimator(controller._hammockAnimator);
 
                 hugComponent.OnHugStart += () => { controller._hammockAnimator.ResetTrigger("Playing"); };
@@ -196,97 +211,122 @@ private static void Individualise(Target target, HugComponent hugComponent)
                 };
                 hugComponent.OnHugFinish += () => { controller._hammockAnimator.SetTrigger("Playing"); };
             }
-            if (target == travellers["Esker"])
+        }
+        private static void Individualise_Gabbro_Eye(Target target, HugComponent hugComponent)
+        {
+            hugComponent.SetFocusPoint(new(0.06f, 0.75f, -1.1f));
+            if (hugComponent.transform.parent.Find("Collider (1)")?.gameObject.TryGetComponent(out Collider collider) ?? false) hugComponent.ChangeTriggerCollider(collider);
+        }
+        private static void Individualise_Esker(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.TryGetComponentInChildren(out EskerAnimController controller))
             {
-                var controller = hugComponent.gameObject.GetComponentInChildren<EskerAnimController>();
                 hugComponent.OnHugStart += () => { controller._isWhistling = false; };
                 hugComponent.OnHugFinish += () => { controller._isWhistling = true; };
             }
-            if (target == villagers["Hal_1"])
+        }
+        private static void Individualise_Esker_Eye(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.transform.parent.Find("Collider (1)")?.gameObject.TryGetComponent(out Collider collider) ?? false) hugComponent.ChangeTriggerCollider(collider);
+        }
+        private static void Individualise_Hal_1(Target target, HugComponent hugComponent)
+        {
+            var effects = hugComponent.gameObject.transform.Find("Effects_HEA_HalCarving")?.gameObject;
+            var audio = hugComponent.gameObject.transform.Find("AudioSource_HalCarving")?.gameObject;
+            hugComponent.OnHugStart += () =>
             {
-                var effects = hugComponent.gameObject.transform.Find("Effects_HEA_HalCarving")?.gameObject;
-                var audio = hugComponent.gameObject.transform.Find("AudioSource_HalCarving")?.gameObject;
-                hugComponent.OnHugStart += () =>
-                {
-                    effects.SetActive(false);
-                    audio.SetActive(false);
-                };
-                hugComponent.OnHugFinish += () =>
-                {
-                    effects.SetActive(true);
-                    audio.SetActive(true);
-                };
+                effects.Exists()?.SetActive(false);
+                audio.Exists()?.SetActive(false);
+            };
+            hugComponent.OnHugFinish += () =>
+            {
+                effects.Exists()?.SetActive(true);
+                audio.Exists()?.SetActive(true);
+            };
 
-                var dialogue = hugComponent.gameObject.GetComponentInChildren<CharacterDialogueTree>();
+            if (hugComponent.gameObject.TryGetComponentInChildren(out CharacterDialogueTree dialogue))
+            {
                 dialogue.OnEndConversation += Enable;
                 hugComponent.SetHugEnabled(false);
-
-                void Enable()
-                {
-                    dialogue.OnEndConversation -= Enable;
-                    hugComponent.SetHugEnabled(true);
-                }
             }
-            if (target == villagers["Gneiss"])
+
+            void Enable()
             {
-                var audio = hugComponent.gameObject.FindInDescendants("AudioSource_BanjoTuning")?.gameObject;
-                hugComponent.OnHugStart += () => { audio.SetActive(false); };
-                hugComponent.OnHugFinish += () => { audio.SetActive(true); };
+                dialogue.OnEndConversation -= Enable;
+                hugComponent.SetHugEnabled(true);
             }
-            if (target == villagers["Spinel"])
+        }
+        private static void Individualise_Gneiss(Target target, HugComponent hugComponent)
+        {
+            var audio = hugComponent.gameObject.FindInDescendants("AudioSource_BanjoTuning")?.gameObject;
+
+            hugComponent.OnHugStart += () => { audio.Exists()?.SetActive(false); };
+            hugComponent.OnHugFinish += () => { audio.Exists()?.SetActive(true); };
+        }
+        private static void Individualise_Spinel(Target target, HugComponent hugComponent)
+        {
+            var rodObj = hugComponent.gameObject.transform.Find("Villager_HEA_Spinel_ANIM_Fishing/Villager_HEA_Spinel_ANIM_Fishing_ROD");
+            var rodParent = rodObj?.parent;
+            var rodAttach = hugComponent.gameObject.FindInDescendants("Spinel_Skin:Short_Rig_V01:LF_Arm_Wrist_Jnt")?.CreateChild("FishingRod_Attach");
+            var rodAnimator = hugComponent.SecondaryAnimator;
+            if (rodParent == null || rodAttach == null || rodAnimator == null) return;
+
+            hugComponent.OnHugStart += () =>
             {
-                var rodObj = hugComponent.gameObject.transform.Find("Villager_HEA_Spinel_ANIM_Fishing/Villager_HEA_Spinel_ANIM_Fishing_ROD");
-                var rodParent = rodObj?.parent;
-                var rodAttach = hugComponent.gameObject.FindInDescendants("Spinel_Skin:Short_Rig_V01:LF_Arm_Wrist_Jnt")?.CreateChild("FishingRod_Attach");
-                hugComponent.OnHugStart += () =>
-                {
-                    if (hugComponent.IsAnimatorControllerSwapped()) return;
-                    hugComponent.SecondaryAnimator.enabled = false;
-                    rodAttach.transform.position = rodParent.position;
-                    rodAttach.transform.rotation = rodParent.rotation;
-                    rodObj.SetParent(rodAttach.transform, false);
-                };
-                hugComponent.OnHugFinish += () =>
-                {
-                    rodObj.SetParent(rodParent, false);
-                    hugComponent.SecondaryAnimator.enabled = true;
-                };
-            }
-            if (target == villagers["Tuff"])
+                if (hugComponent.IsAnimatorControllerSwapped()) return;
+                rodAnimator.enabled = false;
+                rodAttach.transform.position = rodParent.position;
+                rodAttach.transform.rotation = rodParent.rotation;
+                rodObj.SetParent(rodAttach.transform, false);
+            };
+            hugComponent.OnHugFinish += () =>
             {
-                hugComponent.OnHugStart += () => { hugComponent.HugAnimator.SetTrigger("Talking"); };
-                hugComponent.OnHugFinish += () => { hugComponent.HugAnimator.SetTrigger("Idle"); };
-            }
-            if (target == villagers["Tektite"])
+                rodObj.SetParent(rodParent, false);
+                rodAnimator.enabled = true;
+            };
+        }
+        private static void Individualise_Tuff(Target target, HugComponent hugComponent)
+        {
+            var animator = hugComponent.HugAnimator;
+
+            hugComponent.OnHugStart += () => { animator.Exists()?.SetTrigger("Talking"); };
+            hugComponent.OnHugFinish += () => { animator.Exists()?.SetTrigger("Idle"); };
+        }
+        private static void Individualise_Tektite(Target target, HugComponent hugComponent)
+        {
+            var pickObj = hugComponent.gameObject.FindInDescendants("Props_HEA_Pickaxe");
+            var pickParent = pickObj?.parent;
+            var pickAttach = hugComponent.gameObject.CreateChild("Pickaxe_Attach");
+            if (pickParent == null || pickAttach == null) return;
+
+            hugComponent.OnHugStart += () =>
             {
-                var pickObj = hugComponent.gameObject.FindInDescendants("Props_HEA_Pickaxe");
-                var pickParent = pickObj.parent;
-                var pickAttach = hugComponent.gameObject.transform.CreateChild("Pickaxe_Attach");
-                hugComponent.OnHugStart += () =>
-                {
-                    if (hugComponent.IsAnimatorControllerSwapped()) return;
-                    pickAttach.transform.position = pickParent.position;
-                    pickAttach.transform.rotation = pickParent.rotation;
-                    pickObj.SetParent(pickAttach.transform, false);
-                };
-                hugComponent.OnHugFinish += () => { pickObj.SetParent(pickParent, false); };
-            }
-            if (target == villagers["Arkose"])
+                if (hugComponent.IsAnimatorControllerSwapped()) return;
+                pickAttach.transform.position = pickParent.position;
+                pickAttach.transform.rotation = pickParent.rotation;
+                pickObj.SetParent(pickAttach.transform, false);
+            };
+            hugComponent.OnHugFinish += () => { pickObj.SetParent(pickParent, false); };
+        }
+        private static void Individualise_Arkose(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.TryGetComponentInChildren(out KidRockController controller))
             {
-                var controller = hugComponent.gameObject.GetComponentInChildren<KidRockController>();
                 hugComponent.OnHugStart += () => { controller._throwingRock = true; };
                 hugComponent.OnHugFinish += () => { controller._throwingRock = false; };
             }
-            if (target == friends["Solanum"])
-            {
-                SolanumHug = hugComponent;
-                hugComponent.SetLookAtPlayerEnabled(false);
+        }
+        private static void Individualise_Solanum(Target target, HugComponent hugComponent)
+        {
+            hugComponent.SetLookAtPlayerEnabled(false);
 
-                var controller = hugComponent.gameObject.GetComponentInChildren<SolanumAnimController>();
+            if (hugComponent.gameObject.TryGetComponentInChildren(out SolanumAnimController controller))
+            {
                 var parameter1 = false;
                 var parameter2 = false;
                 var parameter3 = false;
                 var parameter4 = false;
+
                 hugComponent.OnHugStart += () =>
                 {
                     parameter1 = controller._animator.GetBool("WatchingPlayer");
@@ -302,25 +342,70 @@ void Enable()
                     controller._animator.SetBool("GestureOnFinishWriting", parameter4);
                 };
             }
-            if (target.isOwl)
+        }
+        private static void Individualise_Solanum_Eye(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.transform.Find("Collider (2)")?.gameObject.TryGetComponent(out Collider collider) ?? false) hugComponent.ChangeTriggerCollider(collider);
+        }
+        private static void Individualise_Prisoner_PreInit(Target target, HugComponent hugComponent)
+        {
+            var prisonerColliderTransform = hugComponent.gameObject.FindInDescendants("Collider_Prisoner", false);
+            var prisonerCollider = prisonerColliderTransform?.gameObject.GetComponent<CapsuleCollider>();
+            var receiverTransform = hugComponent.transform.Find("InteractReceiver");
+            var receiverCollider = receiverTransform?.gameObject.GetComponent<CapsuleCollider>();
+
+            if (prisonerCollider == null || receiverCollider == null) return; 
+            var lookTarget = receiverTransform.Find("ConversationLookTarget");
+            lookTarget?.SetParent(receiverTransform.parent, true);
+
+            receiverTransform.SetParent(prisonerColliderTransform.parent);
+            receiverTransform.localPosition = prisonerColliderTransform.localPosition;
+            receiverTransform.localRotation = prisonerColliderTransform.localRotation;
+            receiverTransform.localScale = prisonerColliderTransform.localScale;
+
+            receiverCollider.center = prisonerCollider.center;
+            receiverCollider.radius = prisonerCollider.radius;
+            receiverCollider.height = prisonerCollider.height;
+            receiverCollider.direction = prisonerCollider.direction;
+        }
+        private static void Individualise_Prisoner_Eye_1(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.TryGetComponentInChildren(out CharacterDialogueTree prisonerEvent)) prisonerEvent.OnEndConversation += () => { HugReenable(target); };
+        }
+        private static void Individualise_Prisoner_Eye_2(Target target, HugComponent hugComponent)
+        {
+            var colliderObj = hugComponent.transform.Find("Collider (2)");
+            if (colliderObj != null && colliderObj.gameObject.TryGetComponent(out CapsuleCollider collider))
             {
-                if (partyOwls.ContainsValue(target))
-                {
-                    proxyColliderObj?.transform.SetParent(proxyColliderObj.transform.parent.Find("Ghostbird_IP_ANIM"), true);
-                    return;
-                }
+                colliderObj.localPosition = Vector3.zero;
+                collider.center = new(0, 1.5f, 0);
+                collider.height = 3;
+                collider.radius = 0.8f;
 
-                var controller = hugComponent.gameObject.GetComponentInChildren<GhostController>();
+                hugComponent.ChangeTriggerCollider(collider);
+            }
+        }
+        private static void Individualise_Owls(Target target, HugComponent hugComponent)
+        {
+            if (hugComponent.gameObject.TryGetComponentInChildren(out GhostController controller))
+            {
                 hugComponent.OnHugStart += () => { controller.SetMovementPaused(true); };
                 hugComponent.OnHugFinish += () => { controller.SetMovementPaused(false); };
-
-                if (target == friends["Prisoner"]) PrisonerHug = hugComponent;
-                else
-                {
-                    hugComponent.SetPrompt("Ghost");
-                    HuggableFrightsMain.HFOwlSetup(hugComponent);
-                }
             }
+
+            if (target == friends["Prisoner"]) return;
+            if (!Settings.SillyGhostNames) hugComponent.SetPrompt("Ghost");
+            HuggableFrightsMain.HFOwlSetup(hugComponent);
+        }
+        private static void Individualise_PartyOwls_PreInit(Target target, HugComponent hugComponent)
+        {
+            if (owlColliderObj == null) owlColliderObj = GameObject.Find("Prefab_IP_GhostBird_Micolash/Collider_Ghost");
+            if (owlColliderObj != null) proxyOwlColliderObj = GameObject.Instantiate(owlColliderObj, hugComponent.gameObject.transform);
+            //every target runs through all of AddHugComponent as part of the foreach so proxyOwlColliderObj is the same per target pre- and post-initialisation
+        }
+        private static void Individualise_PartyOwls(Target target, HugComponent hugComponent)
+        {
+            proxyOwlColliderObj.Exists()?.transform.SetParent(proxyOwlColliderObj.transform.parent.Find("Ghostbird_IP_ANIM"), true);
         }
     }
 }
diff --git a/HugMod/Targets/TargetPatches.cs b/HugMod/Targets/TargetPatches.cs
index 2d814fc..3ee4597 100644
--- a/HugMod/Targets/TargetPatches.cs
+++ b/HugMod/Targets/TargetPatches.cs
@@ -1,4 +1,7 @@
 using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Reflection.Emit;
 using UnityEngine;
 using static HugMod.HugMod;
 using static HugMod.Targets.TargetManager;
@@ -11,7 +14,14 @@ public class GabbroPatches
         public static void Apply() { new PatchClassProcessor(HarmonyInstance, typeof(GabbroPatches)).Patch(); }
 
 
-        [HarmonyPrefix] //keep hammock from receiving triggers it shouldn't
+        [HarmonyPostfix]
+        [HarmonyPatch(typeof(TornadoDialogueHandler), nameof(TornadoDialogueHandler.OnEnterTornado))]
+        public static void TornadoDialogueHandler_OnEnterTornado_Postfix()
+        {
+            GabbroHug.Exists()?.CancelHugSequence();
+        }
+
+        [HarmonyPrefix] //keep animators from crossfading when they shouldn't
         [HarmonyPatch(typeof(GabbroTravelerController), nameof(GabbroTravelerController.StartConversation))]
         public static bool GabbroTravelerController_StartConversation_Prefix()
         {
@@ -19,13 +29,6 @@ public static bool GabbroTravelerController_StartConversation_Prefix()
             Locator.GetTravelerAudioManager().StopAllTravelerAudio();
             return false;
         }
-
-        [HarmonyPostfix]
-        [HarmonyPatch(typeof(TornadoDialogueHandler), nameof(TornadoDialogueHandler.OnEnterTornado))]
-        public static void TornadoDialogueHandler_OnEnterTornado_Postfix()
-        {
-            GabbroHug?.CancelHugSequence();
-        }
     }
 
 
@@ -35,65 +38,84 @@ public class SolanumPatches
         public static void Apply() { new PatchClassProcessor(HarmonyInstance, typeof(SolanumPatches)).Patch(); }
 
 
-        [HarmonyPrefix]
+        [HarmonyPostfix]
         [HarmonyPatch(typeof(SolanumAnimController), nameof(SolanumAnimController.PlayRaiseCairns))]
-        public static bool SolanumAnimController_PlayRaiseCairns_Prefix()
+        public static void SolanumAnimController_PlayRaiseCairns_Postfix()
         {
-            SolanumHug?.SetHugEnabled(false);
-            return true;
+            SolanumHug.Exists()?.SetHugEnabled(false);
         }
 
         [HarmonyPostfix]
         [HarmonyPatch(typeof(SolanumAnimController), nameof(SolanumAnimController.Audio_ExitRaiseCairn))]
         public static void SolanumAnimController_Audio_ExitRaiseCairn_Postfix()
         {
-            SolanumHug?.SetHugEnabled(true);
+            SolanumHug.Exists()?.SetHugEnabled(true);
         }
 
-        [HarmonyPrefix]
+        [HarmonyPostfix]
         [HarmonyPatch(typeof(SolanumAnimController), nameof(SolanumAnimController.StartWritingMessage))]
-        public static bool SolanumAnimController_StartWritingMessage_Prefix()
+        public static void SolanumAnimController_StartWritingMessage_Postfix()
         {
-            SolanumHug?.SetHugEnabled(false);
-            return true;
+            SolanumHug.Exists()?.SetHugEnabled(false);
         }
 
         [HarmonyPostfix]
         [HarmonyPatch(typeof(SolanumAnimController), nameof(SolanumAnimController.StopWritingMessage))]
         public static void SolanumAnimController_StopWritingMessage_Postfix()
         {
-            SolanumHug?.SetHugEnabled(true);
+            SolanumHug.Exists()?.SetHugEnabled(true);
         }
 
-        [HarmonyPrefix] //make IK work without required parameters
+        [HarmonyTranspiler] //make IK work without required parameters
         [HarmonyPatch(typeof(SolanumAnimController), nameof(SolanumAnimController.OnAnimatorIK))]
-        public static bool SolanumAnimController_OnAnimatorIK_Prefix(SolanumAnimController __instance)
-        {
-            if (SolanumHug == null || !SolanumHug.IsSequenceInProgress()) return true;
-            __instance._animator.SetLookAtPosition(__instance.gameObject.transform.TransformPoint(__instance._localLookPosition));
-            __instance._animator.SetLookAtWeight(1, 0.5f, 0.9f, 0f);
-            __instance._animator.SetIKPosition(AvatarIKGoal.LeftHand, __instance._leftHandTransform.position);
-            __instance._animator.SetIKRotation(AvatarIKGoal.LeftHand, __instance._leftHandTransform.rotation * Quaternion.AngleAxis(-90f, Vector3.up));
-            __instance._animator.SetIKPositionWeight(AvatarIKGoal.LeftHand, 1);
-            __instance._animator.SetIKRotationWeight(AvatarIKGoal.LeftHand, 1);
-            __instance._animator.SetIKPosition(AvatarIKGoal.RightHand, __instance._rightHandTransform.position);
-            __instance._animator.SetIKPositionWeight(AvatarIKGoal.RightHand, 0.15f);
-            return false;
+        public static IEnumerable<CodeInstruction> SolanumAnimController_OnAnimatorIK_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+        {
+            var matcher = new CodeMatcher(instructions, generator).MatchForward(false,
+                new CodeMatch(OpCodes.Ldarg_0),
+                new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(SolanumAnimController), nameof(SolanumAnimController._animator))),
+                new CodeMatch(OpCodes.Ldstr),
+                new CodeMatch(OpCodes.Callvirt, AccessTools.Method(typeof(Animator), nameof(Animator.GetFloat), new Type[] { typeof(string) }))
+            );
+
+            matcher.Repeat(matcher => {
+                matcher.CreateLabel(out Label doGetFloat);
+                matcher.CreateLabelAt(matcher.Pos + 4, out Label skipGetFloat);
+
+                matcher.InsertAndAdvance( //move pointer past inserted code
+                    Transpilers.EmitDelegate(() => { return SolanumHug != null && SolanumHug.IsSequenceInProgress(); }),
+                    new CodeInstruction(OpCodes.Brfalse, doGetFloat),
+                    new CodeInstruction(OpCodes.Ldc_R4, 1f),
+                    new CodeInstruction(OpCodes.Br, skipGetFloat)
+                ).Advance(4); //move pointer past matched code, to not match with the same block again on repeat
+            });
+
+            return matcher.InstructionEnumeration();
         }
 
-        [HarmonyPrefix] //remove attempts to get AnimatorStateEvents during hug sequence
+        [HarmonyTranspiler] //remove attempts to get AnimatorStateEvents during hug sequence to avoid NREs
         [HarmonyPatch(typeof(SolanumAnimController), nameof(SolanumAnimController.LateUpdate))]
-        public static bool SolanumAnimController_LateUpdate_Prefix(SolanumAnimController __instance)
+        public static IEnumerable<CodeInstruction> SolanumAnimController_LateUpdate_Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
-            if (SolanumHug == null || !SolanumHug.IsSequenceInProgress()) return true;
-            Quaternion quaternion = Quaternion.LookRotation(__instance._playerCameraTransform.position - __instance._headBoneTransform.position, __instance.gameObject.transform.up);
-            __instance._currentLookRotation = __instance._lookSpring.Update(__instance._currentLookRotation, quaternion, Time.deltaTime);
-            Vector3 vector = __instance._headBoneTransform.position + __instance._currentLookRotation * Vector3.forward;
-            __instance._localLookPosition = __instance.gameObject.transform.InverseTransformPoint(vector);
-            return false;
+            var matcher = new CodeMatcher(instructions, generator).MatchForward(false, new CodeMatch(
+                OpCodes.Callvirt, AccessTools.Method(typeof(AnimatorStateEvents), "AnimatorStateEvents.add_OnEnterStateEvents", new Type[] { typeof(AnimatorStateEvents.StateEvent) })
+            )).Advance(1);
+
+            matcher.CreateLabel(out Label skipGetAnimatorStateEvents);
+
+            matcher.MatchBack(true, 
+                new CodeMatch(OpCodes.Ldarg_0),
+                new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(SolanumAnimController), nameof(SolanumAnimController._animatorStateEvents))),
+                new CodeMatch(OpCodes.Ldnull),
+                new CodeMatch(OpCodes.Call, AccessTools.Method(typeof(UnityEngine.Object), "Object.op_Equality", new Type[] { typeof(UnityEngine.Object), typeof(UnityEngine.Object) }))
+            ).Insert(
+                Transpilers.EmitDelegate(() => { return SolanumHug != null && SolanumHug.IsSequenceInProgress(); }),
+                new CodeInstruction(OpCodes.Brtrue, skipGetAnimatorStateEvents)
+            );
+
+            return matcher.InstructionEnumeration();
         }
 
-        [HarmonyPrefix]
+        [HarmonyPrefix] //freeze processes during hug sequence to prevent unaccounted for state alterations
         [HarmonyPatch(typeof(NomaiConversationManager), nameof(NomaiConversationManager.Update))]
         public static bool NomaiConversationManager_Update_Prefix()
         {
@@ -130,26 +152,28 @@ void DelayedArrival() //does the things that would normally happen the moment th
         [HarmonyPatch(typeof(PrisonerDirector), nameof(PrisonerDirector.OnPrisonerReadyToReceiveTorch))]
         public static void PrisonerDirector_OnPrisonerReadyToReceiveTorch_Postfix()
         {
-            PrisonerHug?.SetHugEnabled(true);
+            PrisonerHug.Exists()?.SetHugEnabled(true);
         }
 
-        [HarmonyPrefix]
+        [HarmonyPostfix]
         [HarmonyPatch(typeof(PrisonerEffects), nameof(PrisonerEffects.PlayFarewellBowAnimation))]
-        public static bool PrisonerEffects_PlayFarewellBowAnimation_Prefix()
+        public static void PrisonerEffects_PlayFarewellBowAnimation_Postfix()
         {
-            PrisonerHug?.SetHugEnabled(false);
-            return true;
+            PrisonerHug.Exists()?.SetHugEnabled(false);
         }
 
-        [HarmonyPrefix] //don't unpause movement during hugs
+        [HarmonyPrefix] //don't unpause movement during hugs, pt.1
         [HarmonyPatch(typeof(PrisonerBrain), nameof(PrisonerBrain.FixedUpdate))]
-        public static bool PrisonerBrain_FixedUpdate_Prefix(PrisonerBrain __instance)
+        public static void PrisonerBrain_FixedUpdate_Prefix(PrisonerBrain __instance, out bool __state)
         {
-            if (PrisonerHug == null || !PrisonerHug.IsSequenceInProgress()) return true;
-            __instance._controller.FixedUpdate_Controller();
-            __instance._sensors.FixedUpdate_Sensors();
-            __instance._data.FixedUpdate_Data(__instance._controller, __instance._sensors);
-            return false;
+            __state = __instance._controller._movementPaused;
+        }
+
+        [HarmonyPostfix] //don't unpause movement during hugs, pt.2
+        [HarmonyPatch(typeof(PrisonerBrain), nameof(PrisonerBrain.FixedUpdate))]
+        public static void PrisonerBrain_FixedUpdate_Postfix(PrisonerBrain __instance, bool __state)
+        {
+            if (PrisonerHug != null && PrisonerHug.IsSequenceInProgress()) __instance._controller.SetMovementPaused(__state);
         }
     }
 
diff --git a/HugMod/Targets/Travellers.json b/HugMod/Targets/Travellers.json
index e5f6a41..7c2a776 100644
--- a/HugMod/Targets/Travellers.json
+++ b/HugMod/Targets/Travellers.json
@@ -18,6 +18,7 @@
     "transitionClipName": "Riebeck_Talking",
     "isTraveller": true,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   },
   "Chert": {
@@ -39,6 +40,7 @@
     "transitionClipName": "Chert_Chatter_Chipper",
     "isTraveller": true,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   },
   "Gabbro": {
@@ -60,6 +62,7 @@
     "transitionClipName": "Gabbro_Idle",
     "isTraveller": true,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   },
   "Feldspar": {
@@ -81,6 +84,7 @@
     "transitionClipName": "Feldspar_Talking",
     "isTraveller": true,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   },
   "Esker": {
@@ -102,6 +106,7 @@
     "transitionClipName": "",
     "isTraveller": true,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": true
   }
 }
\ No newline at end of file
diff --git a/HugMod/Targets/Villagers.json b/HugMod/Targets/Villagers.json
index 3827e4e..0712546 100644
--- a/HugMod/Targets/Villagers.json
+++ b/HugMod/Targets/Villagers.json
@@ -18,6 +18,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Gossan": {
@@ -39,6 +40,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Hornfels_1": {
@@ -60,6 +62,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Hornfels_2": {
@@ -81,6 +84,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Hal_1": {
@@ -102,6 +106,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Hal_2": {
@@ -123,6 +128,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Marl": {
@@ -144,6 +150,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Porphy": {
@@ -165,6 +172,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Gneiss": {
@@ -186,6 +194,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Rutile": {
@@ -207,6 +216,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Spinel": {
@@ -228,6 +238,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Tuff": {
@@ -249,6 +260,7 @@
     "transitionClipName": "Tuff_Idle",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Tektite": {
@@ -270,6 +282,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Mica": {
@@ -291,6 +304,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Tephra_1": {
@@ -312,6 +326,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Tephra_2": {
@@ -333,6 +348,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Tephra_3": {
@@ -354,6 +370,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Galena_1": {
@@ -375,6 +392,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Galena_2": {
@@ -396,6 +414,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Moraine": {
@@ -417,6 +436,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Arkose": {
@@ -438,6 +458,7 @@
     "transitionClipName": "Arkose_IdleRock",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   },
   "Self": {
@@ -459,6 +480,7 @@
     "transitionClipName": "",
     "isTraveller": false,
     "isOwl": false,
+    "isPartyOwl": false,
     "isAtEye": false
   }
 }
\ No newline at end of file
diff --git a/HugMod/manifest.json b/HugMod/manifest.json
index 73d6bcf..9468581 100644
--- a/HugMod/manifest.json
+++ b/HugMod/manifest.json
@@ -4,7 +4,7 @@
   "author": "VioVayo",
   "name": "Hug Mod",
   "uniqueName": "VioVayo.HugMod",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "owmlVersion": "2.9.0",
   "dependencies": [],
   "pathsToPreserve": [ "settings.json" ]