diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs
index cc9829018..c136956f9 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs
@@ -175,6 +175,63 @@ namespace Barotrauma.Items.Components
                     }
                 }
             }
+
+            public void ApplyTo(RectTransform target)
+            {
+                if (RelativeOffset.HasValue)
+                {
+                    target.RelativeOffset = RelativeOffset.Value;
+                }
+                else if (AbsoluteOffset.HasValue)
+                {
+                    target.AbsoluteOffset = AbsoluteOffset.Value;
+                }
+                if (RelativeSize.HasValue)
+                {
+                    target.RelativeSize = RelativeSize.Value;
+                }
+                else if (AbsoluteSize.HasValue)
+                {
+                    target.NonScaledSize = AbsoluteSize.Value;
+                }
+                if (Anchor.HasValue)
+                {
+                    target.Anchor = Anchor.Value;
+                }
+                if (Pivot.HasValue)
+                {
+                    target.Pivot = Pivot.Value;
+                }
+                else
+                {
+                    target.Pivot = RectTransform.MatchPivotToAnchor(target.Anchor);
+                }
+                target.RecalculateChildren(true, true);
+            }
+        }
+
+        public GUIFrame GuiFrame { get; protected set; }
+
+        [Serialize(false, false)]
+        public bool AllowUIOverlap
+        {
+            get;
+            set;
+        }
+
+        private ItemComponent linkToUIComponent;
+        [Serialize("", false)]
+        public string LinkUIToComponent
+        {
+            get;
+            set;
+        }
+
+        [Serialize(0, false)]
+        public int HudPriority
+        {
+            get;
+            private set;
         }
 
         private bool shouldMuffleLooping;
@@ -496,11 +553,7 @@ namespace Barotrauma.Items.Components
                 {
                     msg = msg.Replace("[" + inputType.ToString().ToLowerInvariant() + "]", GameMain.Config.KeyBind(inputType).ToString());
                 }
-                DisplayMsg = msg;
-            }
-            else
-            {
-                DisplayMsg = Msg;
+                Msg = msg;
             }
         }
     }
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs
index 51b085582..378a71008 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs
@@ -133,16 +133,25 @@ namespace Barotrauma
                 }
                 else if (leftDist < WallAvoidDistance)
                 {
-                    PathSteering.SteeringManual(deltaTime, Vector2.UnitX * (WallAvoidDistance - leftDist) / WallAvoidDistance);
+                    //PathSteering.SteeringManual(deltaTime, Vector2.UnitX * (WallAvoidDistance - leftDist) / WallAvoidDistance);
+                    PathSteering.SteeringManual(deltaTime, Vector2.UnitX);
                     PathSteering.WanderAngle = 0.0f;
                 }
                 else if (rightDist < WallAvoidDistance)
                 {
-                    PathSteering.SteeringManual(deltaTime, -Vector2.UnitX * (WallAvoidDistance - rightDist) / WallAvoidDistance);
+                    //PathSteering.SteeringManual(deltaTime, -Vector2.UnitX * (WallAvoidDistance - rightDist) / WallAvoidDistance);
+                    PathSteering.SteeringManual(deltaTime, -Vector2.UnitX);
                     PathSteering.WanderAngle = MathHelper.Pi;
                 }
+                else
+                {
+                    SteeringManager.SteeringWander();
+                }
+            }
+            else
+            {
+                SteeringManager.SteeringWander();
             }
-            SteeringManager.SteeringWander();
             if (!character.IsClimbing && !character.AnimController.InWater)
             {
                 //reset vertical steering to prevent dropping down from platforms etc
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
index 21fd14e74..421ed1b63 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
@@ -189,7 +189,8 @@ namespace Barotrauma.Items.Components
         {
             get { return name; }
         }
-        
+
+        //TODO: this shouldn't be saved as-is, causes tags ("ItemMsgPressSelect" etc) to be converted into actual texts when saving the subs
         [Editable, Serialize("", true)]
         public string Msg
         {
@@ -203,6 +204,12 @@ namespace Barotrauma.Items.Components
             set;
         }
 
+        public AITarget AITarget
+        {
+            get;
+            private set;
+        }
+
         public AITarget AITarget
         {
             get;
@@ -247,7 +254,7 @@ namespace Barotrauma.Items.Components
             {
                 DebugConsole.ThrowError("Invalid pick key in " + element + "!", e);
             }
-
+            
             SerializableProperties = SerializableProperty.DeserializeProperties(this, element);
             ParseMsg();
 
diff --git a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
index 81355ef74..105a87746 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
@@ -503,6 +503,23 @@ namespace Barotrauma
                         break;
                 }
             }
+            
+            if (!category.HasFlag(MapEntityCategory.Legacy) && string.IsNullOrEmpty(identifier))
+            {
+                DebugConsole.ThrowError(
+                    "Item prefab \"" + name + "\" has no identifier. All item prefabs have a unique identifier string that's used to differentiate between items during saving and loading.");
+            }
+            if (!string.IsNullOrEmpty(identifier))
+            {
+                MapEntityPrefab existingPrefab = List.Find(e => e.Identifier == identifier);
+                if (existingPrefab != null)
+                {
+                    DebugConsole.ThrowError(
+                        "Map entity prefabs \"" + name + "\" and \"" + existingPrefab.Name + "\" have the same identifier!");
+                }
+            }
+
+            AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
 
             if (sprite == null)
             {