diff --git a/Barotrauma/Content/Characters/Carrier/carrier.xml b/Barotrauma/Content/Characters/Carrier/carrier.xml
index 1791cf3c9..161ed1d71 100644
--- a/Barotrauma/Content/Characters/Carrier/carrier.xml
+++ b/Barotrauma/Content/Characters/Carrier/carrier.xml
@@ -8,6 +8,16 @@
   <sound file="Content/Characters/Carrier/carrier3.ogg" state="None" range="4000"/>
 
   <sound file="Content/Characters/Carrier/ping.ogg" state="Die" range="3000"/>
+
+  <ai
+    combatstrength="1000"
+    attackpriorityhumans="100.0"
+    attackpriorityrooms="50.0"
+    attackpriorityweaker="0.0"
+    attackprioritystronger="-80.0"
+    attackcooldown="15.0"
+    sight="0.5" 
+    hearing="1.0"/>
     
   <ragdoll waveamplitude="0.0" swimspeed="4.0" mirror="true" rotatetowardsmovement="false" headangle="-90" canentersubmarine="false">
 
@@ -52,9 +62,4 @@
 
   </ragdoll>
 
-  <ai attackhumans="100.0" attackrooms="50.0" 
-      attackweaker="0.0" attackstronger="-50.0" 
-      attackcooldown="15.0"
-      combatstrength="1000"
-      sight="0.5" hearing="1.0"/>
 </Character>
\ No newline at end of file
diff --git a/Barotrauma/Content/Characters/Charybdis/charybdis.xml b/Barotrauma/Content/Characters/Charybdis/charybdis.xml
index 395335780..feba14971 100644
--- a/Barotrauma/Content/Characters/Charybdis/charybdis.xml
+++ b/Barotrauma/Content/Characters/Charybdis/charybdis.xml
@@ -2,6 +2,15 @@
 <Character name ="charybdis" humanoid="false" health="1000.0" bleedingdecreasespeed="0.2">
   
   <sound file="Content/Characters/Charybdis/charybdisattack.ogg" state="Attack" range="8000" />
+
+  <ai 
+    combatstrength="1500"
+    attackpriorityhumans="100.0"
+    attackpriorityrooms="50.0"
+    attackpriorityweaker="50"
+    attackprioritystronger="-30"
+    sight="0.5"
+    hearing="1.0"/>
   
   <ragdoll waveamplitude="150.0" wavelength="10000" swimspeed="4.0" scale="1.5" canentersubmarine="false">
 
@@ -37,5 +46,4 @@
     
   </ragdoll>
 
-  <ai attackhumans="100.0" attackrooms="50.0" attackweaker="50" attackstronger="-30" combatstrength="1500" sight="0.5" hearing="1.0"/>
 </Character>
\ No newline at end of file
diff --git a/Barotrauma/Content/Characters/Coelanth/coelanth.xml b/Barotrauma/Content/Characters/Coelanth/coelanth.xml
index 4e820b397..d5a1c1e57 100644
--- a/Barotrauma/Content/Characters/Coelanth/coelanth.xml
+++ b/Barotrauma/Content/Characters/Coelanth/coelanth.xml
@@ -5,6 +5,15 @@
   <sound file="Content/Characters/Coelanth/idle1.ogg" state="None" />
   <sound file="Content/Characters/Coelanth/idle2.ogg" state="None" />
 
+  <ai
+    combatstrength="300"
+    attackpriorityhumans="90.0"
+    attackpriorityrooms="50.0"
+    attackpriorityweaker="50"
+    attackprioritystronger="-100"
+    sight="0.1"
+    hearing="1.0"/>
+
   <ragdoll waveamplitude="50.0" wavelength="2500" swimspeed="5.0" walkspeed="3.5" canentersubmarine="false">
 
     <collider radius="50" height="250"/>
@@ -51,10 +60,7 @@
     <joint limb1="2" limb1anchor="65,100" limb2="4" limb2anchor="0,160" lowerlimit="-50" upperlimit="0"/>
 
     <!-- body to back fin -->
-    <joint limb1="2" limb1anchor="46,-48" limb2="5" limb2anchor="0,55" lowerlimit="-50" upperlimit="0"/>
-
-    
+    <joint limb1="2" limb1anchor="46,-48" limb2="5" limb2anchor="0,55" lowerlimit="-50" upperlimit="0"/>    
   </ragdoll>
-
-  <ai attackhumans="100.0" attackrooms="50.0" attackweaker="50" attackstronger="-30" sight="0.1" hearing="1.0"/>
+  
 </Character>
\ No newline at end of file
diff --git a/Barotrauma/Content/Characters/Crawler/crawler.xml b/Barotrauma/Content/Characters/Crawler/crawler.xml
index 9d0e1de0f..649123d8a 100644
--- a/Barotrauma/Content/Characters/Crawler/crawler.xml
+++ b/Barotrauma/Content/Characters/Crawler/crawler.xml
@@ -6,9 +6,21 @@
   <sound file="Content/Characters/Crawler/idle1.ogg" state="None" range="500"/>
   <sound file="Content/Characters/Crawler/idle2.ogg" state="None" range="500"/>
 
+  <ai 
+    combatstrength="100"
+    attackpriorityhumans="500"
+    attackpriorityrooms="50.0"
+    attackpriorityweaker="50"
+    attackprioritystronger="-60"
+    sight="0.5" 
+    hearing="1.0"
+    fleehealththreshold="10"
+    attackcooldown="3.0"/>
+
   <ragdoll headposition="50" headangle="-70" 
-           waveamplitude="2.0" wavelength="5000" 
-           swimspeed="3.0" walkspeed="2.0"
+           waveamplitude="2.0" wavelength="3000" 
+           swimspeed="2.0" walkspeed="2.0"
+           runspeedmultiplier="2" swimspeedmultiplier="2.0"
            stepsize ="15.0,20.0"           
            legtorque="10"
            flip="true">
@@ -75,10 +87,5 @@
     <joint limb1="0" limb1anchor="13,-35" limb2="8" limb2anchor="0,14" lowerlimit="-270" upperlimit="-180"/>
     <joint limb1="8" limb1anchor="0,-17" limb2="9" limb2anchor="0,-17" lowerlimit="-350" upperlimit="-190"/>
   </ragdoll>
-
-  <ai attackhumans="500" attackrooms="50.0" attackweaker="50" attackstronger="-30" 
-      sight="0.5" hearing="1.0"
-      fleehealththreshold="10"
-      attackcooldown="3.0"/>
 </Character>
 
diff --git a/Barotrauma/Content/Characters/Endworm/endworm.xml b/Barotrauma/Content/Characters/Endworm/endworm.xml
index 824642ecd..23f5b98d6 100644
--- a/Barotrauma/Content/Characters/Endworm/endworm.xml
+++ b/Barotrauma/Content/Characters/Endworm/endworm.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Character name ="endworm" humanoid="false" health="10000.0" doesbleed="false">
-  
+
   <sound file="Content/Characters/Endworm/endwormidle.ogg" state="None" range="8000" />
   <sound file="Content/Characters/Endworm/endwormattack1.ogg" state="Attack" range="8000" />
   <sound file="Content/Characters/Endworm/endwormattack2.ogg" state="Attack" range="8000" />
 
+  <ai 
+    combatstrength="10000" 
+    attackpriorityrooms="100.0"
+    attackpriorityweaker="0" 
+    attackstronger="-30" 
+    sight="0.1" 
+    hearing="2.0"/>
+  
   <ragdoll waveamplitude="100.0" wavelength="1000" speed="2.0" scale ="2.0" flip="false" canentersubmarine="false">
 
     <collider radius="300"/>
@@ -75,6 +83,5 @@
     <joint limb1="0" limb1anchor="160,50" limb2="9" limb2anchor="0,-200" lowerlimit="-50" upperlimit="20"/>
   </ragdoll>
 
-  <ai attackrooms="100.0" attackweaker="50" attackstronger="-30" combatstrength="10000" sight="0.1" hearing="2.0"/>
 </Character>
 
diff --git a/Barotrauma/Content/Characters/Fractalguardian/fractalguardian.xml b/Barotrauma/Content/Characters/Fractalguardian/fractalguardian.xml
index 69ad89036..9cfe763b5 100644
--- a/Barotrauma/Content/Characters/Fractalguardian/fractalguardian.xml
+++ b/Barotrauma/Content/Characters/Fractalguardian/fractalguardian.xml
@@ -5,6 +5,14 @@
   <sound file="Content/Characters/Fractalguardian/guardian2.ogg" state="Attack" range="3000" />
   <sound file="Content/Characters/Fractalguardian/Die1.ogg" state="Die" range="3000" />
   <sound file="Content/Characters/Fractalguardian/Die2.ogg" state="Die" range="3000" />
+
+  <ai 
+    combatstrength="500"
+    attackpriorityrooms="0.0" 
+    attackpriorityhumans="100"
+    sight="1.0" 
+    hearing="2.0" 
+    attackcooldown="1"/>
   
   <ragdoll waveamplitude="50.0" wavelength="500" swimspeed="3.0" walkspeed="0.3" flip="false" canentersubmarine="false">
 
@@ -51,6 +59,5 @@
     <joint limb1="0" limb1anchor="-30,10" limb2="5" limb2anchor="0,-110" lowerlimit="90" upperlimit="180"/>
   </ragdoll>
 
-  <ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0" attackcooldown="1"/>
 </Character>
 
diff --git a/Barotrauma/Content/Characters/Fractalguardian2/fractalguardian2.xml b/Barotrauma/Content/Characters/Fractalguardian2/fractalguardian2.xml
index 9f45de877..d665dde72 100644
--- a/Barotrauma/Content/Characters/Fractalguardian2/fractalguardian2.xml
+++ b/Barotrauma/Content/Characters/Fractalguardian2/fractalguardian2.xml
@@ -5,6 +5,14 @@
   <sound file="Content/Characters/Fractalguardian/guardian2.ogg" state="Attack" range="3000" />
   <sound file="Content/Characters/Fractalguardian/Die1.ogg" state="Die" range="3000" />
   <sound file="Content/Characters/Fractalguardian/Die2.ogg" state="Die" range="3000" />
+
+  <ai
+    combatstrength="500"
+    attackpriorityrooms="0.0"
+    attackpriorityhumans="100"
+    sight="1.0"
+    hearing="2.0"
+    attackcooldown="1"/>
   
   <ragdoll waveamplitude="0.0" swimspeed="1.0" walkspeed="0.3" flip="false" canentersubmarine="false" rotatetowardsmovement="false">
 
@@ -32,19 +40,16 @@
     <limb id = "4" width="30" height="175">
       <sprite texture="Content/Characters/Fractalguardian/fractalguardian.png" sourcerect="131,0,36,175" depth="0.1" origin="0.5,0.5"/>
       <attack range="150" duration="0.5" damage="30" stun="1.0" torque="-150" damagetype="slash"/>            
-    </limb>
-        
+    </limb>        
 
     <!-- head to body -->
     <joint limb1="0" limb1anchor="-37,-40" limb2="1" limb2anchor="0,80" lowerlimit="-60" upperlimit="0"/>
     <joint limb1="1" limb1anchor="0,-80" limb2="2" limb2anchor="0,80" lowerlimit="0" upperlimit="120"/>
     
     <joint limb1="0" limb1anchor="37,-40" limb2="3" limb2anchor="0,80" lowerlimit="0" upperlimit="60"/>
-    <joint limb1="3" limb1anchor="0,-80" limb2="4" limb2anchor="0,80" lowerlimit="-120" upperlimit="0"/>
-    
+    <joint limb1="3" limb1anchor="0,-80" limb2="4" limb2anchor="0,80" lowerlimit="-120" upperlimit="0"/>    
     
   </ragdoll>
 
-  <ai attackrooms="0.0" attackhumans="100" sight="1.0" hearing="2.0" attackcooldown="1"/>
 </Character>
 
diff --git a/Barotrauma/Content/Characters/Husk/husk.xml b/Barotrauma/Content/Characters/Husk/husk.xml
index 537f7d584..33952ffb0 100644
--- a/Barotrauma/Content/Characters/Husk/husk.xml
+++ b/Barotrauma/Content/Characters/Husk/husk.xml
@@ -5,6 +5,16 @@
   <sound file="Content/Characters/Husk/Husk2.ogg" state="Attack" range="1000"/>
   <sound file="Content/Characters/Husk/Husk3.ogg" state="Attack" range="1000"/>
   
+  <ai 
+    combatstrength="100"
+    attackpriorityhumans="500"
+    attackpriorityrooms="5.0"
+    attackpriorityweaker="50"
+    attackprioritystronger="-30"
+    sight="0.5"
+    hearing="1.0"
+    attackcooldown="1.0"/>
+  
   <ragdoll headposition="134" torsoposition="108" 
            stepsize="42.0, 12.0"
            walkanimspeed="4.58"
@@ -15,7 +25,7 @@
            runspeedmultiplier="2.0" swimspeedmultiplier="1.5">
 
     <collider height="80" radius="15"/>
-	<collider height="40" radius="15"/>
+	  <collider height="40" radius="15"/>
 
     <!-- head -->
     <limb id = "0" radius="13" mass = "6" type="Head" attackpriority="2">
@@ -103,13 +113,8 @@
     <!-- body to right leg -->
     <joint limb1="12" limb1anchor="0,-1" limb2="9" limb2anchor="0,14" lowerlimit="-30" upperlimit="120"/>
     <joint limb1="9" limb1anchor="0,-15" limb2="10" limb2anchor="0,20" lowerlimit="-150" upperlimit="-10"/>
-    <joint limb1="10" limb1anchor="-3,-21" limb2="11" limb2anchor="5,7" lowerlimit="20" upperlimit="90"/>
-  
+    <joint limb1="10" limb1anchor="-3,-21" limb2="11" limb2anchor="5,7" lowerlimit="20" upperlimit="90"/>  
   </ragdoll>
 
-
-  <ai attackhumans="500" attackrooms="5.0" attackweaker="50" attackstronger="-30"
-      sight="0.5" hearing="1.0"
-      attackcooldown="1.0"/>
 </Character>
 
diff --git a/Barotrauma/Content/Characters/Mantis/mantis.xml b/Barotrauma/Content/Characters/Mantis/mantis.xml
index cd816f21b..5c337d46d 100644
--- a/Barotrauma/Content/Characters/Mantis/mantis.xml
+++ b/Barotrauma/Content/Characters/Mantis/mantis.xml
@@ -7,10 +7,22 @@
   <sound file="Content/Characters/Mantis/idle1.ogg" state="None" range="500"/>
   <sound file="Content/Characters/Mantis/idle2.ogg" state="None" range="500"/>
   <sound file="Content/Characters/Mantis/idle3.ogg" state="None" range="500"/>
+
+  <ai
+    combatstrength="250"
+    attackpriorityhumans="500.0"
+    attackpriorityrooms="50.0"
+    attackpriorityweaker="60"
+    attackprioritystronger="-70"
+    attackcooldown="1.0"
+    sight="0.5"
+    hearing="1.0"
+    fleehealththreshold="20"/>
   
   <ragdoll headposition="120" headangle="-90" 
            waveamplitude="50.0" wavelength="2500" 
-           swimspeed="2.0" walkspeed="3.0"
+           swimspeed="2.0" walkspeed="2.0"
+           runspeedmultiplier="1.5" swimspeedmultiplier="1.5"
            stepsize ="20.0,20.0"
            legtorque="10"
            footrotation ="180.0"
@@ -87,15 +99,5 @@
     <joint limb1="9" limb1anchor="0,-28" limb2="10" limb2anchor="-11,-46" lowerlimit="-190" upperlimit="-50"/>  
   </ragdoll>
 
-  <ai
-    combatstrength="250"
-    attackpriorithumans="500.0"
-    attackpriorityrooms="50.0"
-    attackpriorityweaker="60"
-    attackprioritystronger="-30"
-    attackcooldown="1.0"
-    sight="0.5"
-    hearing="1.0"
-    fleehealththreshold="20"/>
 </Character>
 
diff --git a/Barotrauma/Content/Characters/Moloch/moloch.xml b/Barotrauma/Content/Characters/Moloch/moloch.xml
index 12c85dc13..617384afd 100644
--- a/Barotrauma/Content/Characters/Moloch/moloch.xml
+++ b/Barotrauma/Content/Characters/Moloch/moloch.xml
@@ -6,6 +6,14 @@
   <sound file="Content/Characters/Moloch/idle1.ogg" state="None" range="3000"/>
   <sound file="Content/Characters/Moloch/idle2.ogg" state="None" range="3000"/>
 
+  <ai
+    combatstrength="1200"
+    attackpriorityhumans="40.0"
+    attackpriorityrooms="50.0"
+    attackprioritystronger="-100.0"
+    attackcooldown="15.0"
+    sight="0.5" hearing="1.0"/>
+
   <ragdoll waveamplitude="0.0" swimspeed="2.0" mirror="true" rotatetowardsmovement="false" headangle="-90" canentersubmarine="false">
 
     <collider radius ="230"/>
@@ -60,8 +68,4 @@
 
   </ragdoll>
 
-  <ai attackhumans="100.0" attackrooms="50.0" 
-      attackweaker="50.0" attackstronger="-30.0" 
-      attackcooldown="15.0"
-      sight="0.5" hearing="1.0"/>
 </Character>
\ No newline at end of file
diff --git a/Barotrauma/Content/Characters/Tigerthresher/tigerthresher.xml b/Barotrauma/Content/Characters/Tigerthresher/tigerthresher.xml
index c4fb666af..c6e13719d 100644
--- a/Barotrauma/Content/Characters/Tigerthresher/tigerthresher.xml
+++ b/Barotrauma/Content/Characters/Tigerthresher/tigerthresher.xml
@@ -5,7 +5,18 @@
   <sound file="Content/Characters/Scorpion/scorpionidle1.ogg" state="None" />
   <sound file="Content/Characters/Scorpion/scorpionidle2.ogg" state="None" />
 
-  <ragdoll waveamplitude="50.0" wavelength="2500" swimspeed="4.0" walkspeed="3.5" canentersubmarine="false">
+  <ai
+    combatstrength="400"
+    attackpriorityhumans="100.0"
+    attackpriorityrooms="50.0"
+    attackpriorityweaker="50"
+    attackprioritystronger="-30"
+    sight="0.5"
+    hearing="1.0"/>
+
+  <ragdoll waveamplitude="50.0" wavelength="2500" 
+           swimspeed="4.0" swimspeedmultiplier="1.5"
+           canentersubmarine="false">
 
     <collider radius="50" height="320"/>
     
@@ -19,7 +30,7 @@
     <limb id = "1" width="16" height="103">
       <sprite texture="Content/Characters/Tigerthresher/tigerthresher.png" sourcerect="391,169,28,110" depth="0.025" origin="0.5,0.5"/>
       <damagedsprite texture="Content/Characters/Tigerthresher/damagedtigerthresher.png" sourcerect="391,169,28,110" origin="0.5,0.5"/>
-      <attack range="300" duration="0.5" damage="150" bleedingdamage="10" structuredamage="200" damagetype="slash" force="10" torque="80" targetforce="-50"/>      
+      <attack range="300" duration="0.5" damage="150" bleedingdamage="10" structuredamage="200" damagetype="slash" force="80" torque="80" targetforce="-50"/>      
     </limb>
 
     <!-- body -->
@@ -67,17 +78,8 @@
     <joint limb1="2" limb1anchor="5,-30" limb2="5" limb2anchor="7,57" lowerlimit="-50" upperlimit="0"/>
 
     <!-- body to long -->
-    <joint limb1="2" limb1anchor="-5,-137" limb2="6" limb2anchor="-8,132" lowerlimit="-30" upperlimit="0"/>  
-    
+    <joint limb1="2" limb1anchor="-5,-137" limb2="6" limb2anchor="-8,132" lowerlimit="-30" upperlimit="0"/>      
     
   </ragdoll>
 
-  <ai
-    combatstrength="400"
-    attackpriorithumans="100.0" 
-    attackpriorityrooms="50.0" 
-    attackpriorityweaker="50" 
-    attackprioritystronger="-30" 
-    sight="0.5" 
-    hearing="1.0"/>
 </Character>
\ No newline at end of file
diff --git a/Barotrauma/Content/Characters/Watcher/watcher.xml b/Barotrauma/Content/Characters/Watcher/watcher.xml
index 314af040b..24033c190 100644
--- a/Barotrauma/Content/Characters/Watcher/watcher.xml
+++ b/Barotrauma/Content/Characters/Watcher/watcher.xml
@@ -12,6 +12,14 @@
   <sound file="Content/Characters/Watcher/watch5.ogg" state="None" range="500"/>
   <sound file="Content/Characters/Watcher/watch6.ogg" state="None" range="500"/>
 
+  <ai
+    attackpriorityhumans="0.0"
+    attackpriorityrooms="0.0"
+    combatstrength="1000"
+    attackwhenprovoked="true"
+    sight="1.0"
+    hearing="0.0" />
+
   <ragdoll waveamplitude="0.0" swimspeed="0.5" walkspeed="0.3" mirror="true" rotatetowardsmovement="false" headangle="-90">
 
     <collider radius="100"/>
@@ -36,6 +44,4 @@
     <joint limb1="0" limb1anchor="60,130" limb2="1" limb2anchor="-30,100" lowerlimit="70" upperlimit="80"/>
     <joint limb1="0" limb1anchor="72,110" limb2="2" limb2anchor="120,-20" lowerlimit="90" upperlimit="180"/>
   </ragdoll>
-
-  <ai attackhumans="0.0" attackrooms="0.0" sight="1.0" hearing="0.0" attackwhenprovoked="true"/>
 </Character>
\ No newline at end of file