diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 869996da5b..4066b5646f 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -2,7 +2,6 @@
 #define CSM_WOLRD_REFIDADAPTERIMP_H
 
 #include <map>
-#include <iostream>
 
 #include <QVariant>
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index f312a41c7a..8b7bcf6b92 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -394,8 +394,10 @@ namespace MWClass
                     damage = scaleDamage(damage, attacker, ptr);
 
                 MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Health Damage", 1.0f, 1.0f);
-                float health = getCreatureStats(ptr).getHealth().getCurrent() - damage;
-                setActorHealth(ptr, health, attacker);
+
+                MWMechanics::DynamicStat<float> health(getCreatureStats(ptr).getHealth());
+                health.setCurrent(health.getCurrent() - damage);
+                getCreatureStats(ptr).setHealth(health);
             }
             else
             {
@@ -430,26 +432,6 @@ namespace MWClass
         }
     }
 
-    void Creature::setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const
-    {
-        MWMechanics::CreatureStats &crstats = getCreatureStats(ptr);
-        bool wasDead = crstats.isDead();
-
-        MWMechanics::DynamicStat<float> stat(crstats.getHealth());
-        stat.setCurrent(health);
-        crstats.setHealth(stat);
-
-        if(!wasDead && crstats.isDead())
-        {
-            // actor was just killed
-        }
-        else if(wasDead && !crstats.isDead())
-        {
-            // actor was just resurrected
-        }
-    }
-
-
     boost::shared_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 740552a60f..b2a333beb3 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -72,8 +72,6 @@ namespace MWClass
 
             virtual void onHit(const MWWorld::Ptr &ptr, float damage, bool ishealth, const MWWorld::Ptr &object, const MWWorld::Ptr &attacker, bool successful) const;
 
-            virtual void setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const;
-
             virtual boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const;
             ///< Generate action for activation
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index d0dd9f994c..75b612dade 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -733,8 +733,9 @@ namespace MWClass
                 if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
                     MWBase::Environment::get().getWindowManager()->activateHitOverlay();
             }
-            float health = getCreatureStats(ptr).getHealth().getCurrent() - damage;
-            setActorHealth(ptr, health, attacker);
+            MWMechanics::DynamicStat<float> health(getCreatureStats(ptr).getHealth());
+            health.setCurrent(health.getCurrent() - damage);
+            getCreatureStats(ptr).setHealth(health);
         }
         else
         {
@@ -779,26 +780,6 @@ namespace MWClass
         }
     }
 
-    void Npc::setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const
-    {
-        MWMechanics::CreatureStats &crstats = getCreatureStats(ptr);
-        bool wasDead = crstats.isDead();
-
-        MWMechanics::DynamicStat<float> stat(crstats.getHealth());
-        stat.setCurrent(health);
-        crstats.setHealth(stat);
-
-        if(!wasDead && crstats.isDead())
-        {
-            // actor was just killed
-        }
-        else if(wasDead && !crstats.isDead())
-        {
-            // actor was just resurrected
-        }
-    }
-
-
     boost::shared_ptr<MWWorld::Action> Npc::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index f032ae77cd..b12b7b13fb 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -87,8 +87,6 @@ namespace MWClass
 
             virtual void block(const MWWorld::Ptr &ptr) const;
 
-            virtual void setActorHealth(const MWWorld::Ptr& ptr, float health, const MWWorld::Ptr& attacker) const;
-
             virtual boost::shared_ptr<MWWorld::Action> activate (const MWWorld::Ptr& ptr,
                 const MWWorld::Ptr& actor) const;
             ///< Generate action for activation
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 14561b4bb1..c135811dd6 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -699,7 +699,9 @@ namespace MWMechanics
             {
                 // If drowning, apply 3 points of damage per second
                 static const float fSuffocationDamage = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->getFloat();
-                ptr.getClass().setActorHealth(ptr, stats.getHealth().getCurrent() - fSuffocationDamage*duration);
+                DynamicStat<float> health = stats.getHealth();
+                health.setCurrent(health.getCurrent() - fSuffocationDamage*duration);
+                stats.setHealth(health);
 
                 // Play a drowning sound
                 MWBase::SoundManager *sndmgr = MWBase::Environment::get().getSoundManager();
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index b0621c8052..8761ca37fa 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -8,7 +8,6 @@
 #include "../mwmechanics/creaturestats.hpp"
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "steering.hpp"
 #include "movement.hpp"
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 457c9a95ca..b3aa346cee 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -1,10 +1,9 @@
 #include "aiavoiddoor.hpp"
-#include <iostream>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/cellstore.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 6a39178ce0..b2f938b9e3 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -5,22 +5,17 @@
 #include <components/esm/aisequence.hpp>
 
 #include "../mwworld/class.hpp"
-#include "../mwworld/timestamp.hpp"
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/esmstore.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 
 #include "../mwrender/animation.hpp"
 
-
 #include "creaturestats.hpp"
 #include "steering.hpp"
 #include "movement.hpp"
-#include "character.hpp" // fixme: for getActiveWeapon
+#include "character.hpp"
 
 #include "aicombataction.hpp"
 #include "combat.hpp"
@@ -291,7 +286,7 @@ namespace MWMechanics
         // Get weapon characteristics
         if (actorClass.hasInventoryStore(actor))
         {
-            //Get weapon speed and range
+            //Get weapon range
             MWWorld::ContainerStoreIterator weaponSlot =
                 MWMechanics::getActiveWeapon(actorClass.getCreatureStats(actor), actorClass.getInventoryStore(actor), &weaptype);
 
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 593f9f173e..f75fc22ad1 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -6,7 +6,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index a92e9eedc8..cd67c60582 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -1,8 +1,7 @@
 #include "aifollow.hpp"
 
-#include <iostream>
-
 #include <components/esm/aisequence.hpp>
+#include <components/esm/loadcell.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 0e68d9d79b..77efe62a88 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -1,7 +1,10 @@
-
 #include "aipackage.hpp"
 
 #include <cmath>
+
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadland.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwworld/class.hpp"
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index ac6b23ef6b..e936505c93 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -1,12 +1,12 @@
 #include "aipursue.hpp"
 
 #include <components/esm/aisequence.hpp>
+#include <components/esm/loadmgef.hpp>
 
 #include "../mwbase/environment.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/action.hpp"
-#include "../mwworld/cellstore.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index fb6450d16a..a750860ca9 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -1,6 +1,7 @@
-
 #include "aisequence.hpp"
 
+#include <limits>
+
 #include "aipackage.hpp"
 #include "aistate.hpp"
 
@@ -14,9 +15,6 @@
 
 #include <components/esm/aisequence.hpp>
 
-#include "../mwworld/class.hpp"
-#include "creaturestats.hpp"
-#include "npcstats.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index f192bed63f..1585a3007f 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -1,6 +1,7 @@
 #include "aitravel.hpp"
 
 #include <components/esm/aisequence.hpp>
+#include <components/esm/loadcell.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 50faaa91ba..9d5f7137f9 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -408,14 +408,13 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
         mCurrentMovement = movementAnimName;
         if(!mCurrentMovement.empty())
         {
-            float vel, speedmult = 1.0f;
-
             bool isrunning = mPtr.getClass().getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run)
                     && !MWBase::Environment::get().getWorld()->isFlying(mPtr);
 
             // For non-flying creatures, MW uses the Walk animation to calculate the animation velocity
             // even if we are running. This must be replicated, otherwise the observed speed would differ drastically.
             std::string anim = mCurrentMovement;
+            mAdjustMovementAnimSpeed = true;
             if (mPtr.getClass().getTypeName() == typeid(ESM::Creature).name()
                     && !(mPtr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Flies))
             {
@@ -423,46 +422,34 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
                 const StateInfo *stateinfo = std::find_if(sMovementList, sMovementListEnd, FindCharState(walkState));
                 anim = stateinfo->groupname;
 
-                if (mMovementSpeed > 0.0f && (vel=mAnimation->getVelocity(anim)) > 1.0f)
-                    speedmult = mMovementSpeed / vel;
-                else
+                mMovementAnimSpeed = mAnimation->getVelocity(anim);
+                if (mMovementAnimSpeed <= 1.0f)
+                {
                     // Another bug: when using a fallback animation (e.g. RunForward as fallback to SwimRunForward),
                     // then the equivalent Walk animation will not use a fallback, and if that animation doesn't exist
                     // we will play without any scaling.
                     // Makes the speed attribute of most water creatures totally useless.
                     // And again, this can not be fixed without patching game data.
-                    speedmult = 1.f;
+                    mAdjustMovementAnimSpeed = false;
+                    mMovementAnimSpeed = 1.f;
+                }
             }
             else
             {
-                if(mMovementSpeed > 0.0f && (vel=mAnimation->getVelocity(anim)) > 1.0f)
-                {
-                    speedmult = mMovementSpeed / vel;
-                }
-                else if (mMovementState == CharState_TurnLeft || mMovementState == CharState_TurnRight)
-                    speedmult = 1.f; // adjusted each frame
-                else if (mMovementSpeed > 0.0f)
+                mMovementAnimSpeed = mAnimation->getVelocity(anim);
+
+                if (mMovementAnimSpeed <= 1.0f)
                 {
                     // The first person anims don't have any velocity to calculate a speed multiplier from.
                     // We use the third person velocities instead.
                     // FIXME: should be pulled from the actual animation, but it is not presently loaded.
-                    speedmult = mMovementSpeed / (isrunning ? 222.857f : 154.064f);
+                    mMovementAnimSpeed = (isrunning ? 222.857f : 154.064f);
                     mMovementAnimationControlled = false;
                 }
             }
 
-            MWRender::Animation::AnimPriority priorityMovement (Priority_Movement);
-            if ((movement == CharState_TurnLeft || movement == CharState_TurnRight)
-                    && mPtr == MWBase::Environment::get().getWorld()->getPlayerPtr()
-                    && MWBase::Environment::get().getWorld()->isFirstPerson())
-            {
-                priorityMovement.mPriority[MWRender::Animation::BoneGroup_Torso] = 0;
-                priorityMovement.mPriority[MWRender::Animation::BoneGroup_LeftArm] = 0;
-                priorityMovement.mPriority[MWRender::Animation::BoneGroup_RightArm] = 0;
-            }
-
-            mAnimation->play(mCurrentMovement, priorityMovement, movemask, false,
-                             speedmult, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul);
+            mAnimation->play(mCurrentMovement, Priority_Movement, movemask, false,
+                             1.f, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul);
         }
     }
 
@@ -655,7 +642,6 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mAnimation(anim)
     , mIdleState(CharState_None)
     , mMovementState(CharState_None)
-    , mMovementSpeed(0.0f)
     , mHasMovedInXY(false)
     , mMovementAnimationControlled(true)
     , mDeathState(CharState_None)
@@ -1066,7 +1052,7 @@ bool CharacterController::updateWeaponState()
     }
 
     MWRender::Animation::AnimPriority priorityWeapon(Priority_Weapon);
-    priorityWeapon.mPriority[MWRender::Animation::BoneGroup_LowerBody] = 0;
+    priorityWeapon.mPriority[MWRender::Animation::BoneGroup_LowerBody] = Priority_WeaponLowerBody;
 
     bool forcestateupdate = false;
     if(weaptype != mWeaponType && mHitState != CharState_KnockDown && mHitState != CharState_KnockOut
@@ -1487,6 +1473,7 @@ void CharacterController::update(float duration)
     MWBase::World *world = MWBase::Environment::get().getWorld();
     const MWWorld::Class &cls = mPtr.getClass();
     osg::Vec3f movement(0.f, 0.f, 0.f);
+    float speed = 0.f;
 
     updateMagicEffects();
 
@@ -1550,10 +1537,10 @@ void CharacterController::update(float duration)
             vec = osg::Vec3f(0.f, 0.f, 0.f);
         osg::Vec3f rot = cls.getRotationVector(mPtr);
 
-        mMovementSpeed = cls.getSpeed(mPtr);
+        speed = cls.getSpeed(mPtr);
 
-        vec.x() *= mMovementSpeed;
-        vec.y() *= mMovementSpeed;
+        vec.x() *= speed;
+        vec.y() *= speed;
 
         CharacterState movestate = CharState_None;
         CharacterState idlestate = CharState_SpecialIdle;
@@ -1744,10 +1731,7 @@ void CharacterController::update(float duration)
                                          : (sneak ? CharState_SneakBack
                                                   : (isrunning ? CharState_RunBack : CharState_WalkBack)));
             }
-            // Don't play turning animations during attack. It would break positioning of the arrow bone when releasing a shot.
-            // Actually, in vanilla the turning animation is not even played when merely having equipped the weapon,
-            // but I don't think we need to go as far as that.
-            else if(rot.z() != 0.0f && !inwater && !sneak && mUpperBodyState < UpperCharState_StartToMinAttack)
+            else if(rot.z() != 0.0f && !inwater && !sneak && !MWBase::Environment::get().getWorld()->isFirstPerson())
             {
                 if(rot.z() > 0.0f)
                     movestate = CharState_TurnRight;
@@ -1807,6 +1791,11 @@ void CharacterController::update(float duration)
             if (duration > 0)
                 mAnimation->adjustSpeedMult(mCurrentMovement, std::min(1.5f, std::abs(rot.z()) / duration / static_cast<float>(osg::PI)));
         }
+        else if (mMovementState != CharState_None && mAdjustMovementAnimSpeed)
+        {
+            float speedmult = speed / mMovementAnimSpeed;
+            mAnimation->adjustSpeedMult(mCurrentMovement, speedmult);
+        }
 
         if (!mSkipAnim)
         {
@@ -1845,7 +1834,7 @@ void CharacterController::update(float duration)
         moved = osg::Vec3f(0.f, 0.f, 0.f);
 
     // Ensure we're moving in generally the right direction...
-    if(mMovementSpeed > 0.f)
+    if(speed > 0.f)
     {
         float l = moved.length();
 
@@ -1927,7 +1916,6 @@ void CharacterController::clearAnimQueue()
     mAnimQueue.clear();
 }
 
-
 void CharacterController::forceStateUpdate()
 {
     if(!mAnimation)
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index f37afd996a..d647cae229 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -28,6 +28,7 @@ class CreatureStats;
 
 enum Priority {
     Priority_Default,
+    Priority_WeaponLowerBody,
     Priority_Jump,
     Priority_Movement,
     Priority_Hit,
@@ -150,7 +151,8 @@ class CharacterController : public MWRender::Animation::TextKeyListener
 
     CharacterState mMovementState;
     std::string mCurrentMovement;
-    float mMovementSpeed;
+    float mMovementAnimSpeed;
+    bool mAdjustMovementAnimSpeed;
     bool mHasMovedInXY;
     bool mMovementAnimationControlled;
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index e9ef99454c..07fa6d5922 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1049,6 +1049,19 @@ namespace MWMechanics
         commitCrime(ptr, victim, OT_Theft, item.getClass().getValue(item) * count);
     }
 
+
+    void getFollowers (const MWWorld::Ptr& actor, std::set<MWWorld::Ptr>& out)
+    {
+        std::list<MWWorld::Ptr> followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowing(actor);
+        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
+        {
+            if (out.insert(*it).second)
+            {
+                getFollowers(*it, out);
+            }
+        }
+    }
+
     bool MechanicsManager::commitCrime(const MWWorld::Ptr &player, const MWWorld::Ptr &victim, OffenseType type, int arg, bool victimAware)
     {
         // NOTE: victim may be empty
@@ -1070,6 +1083,10 @@ namespace MWMechanics
         if (!victim.isEmpty() && (from - victim.getRefData().getPosition().asVec3()).length2() > radius*radius)
             neighbors.push_back(victim);
 
+        // get the player's followers / allies (works recursively) that will not report crimes
+        std::set<MWWorld::Ptr> playerFollowers;
+        getFollowers(player, playerFollowers);
+
         // Did anyone see it?
         bool crimeSeen = false;
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
@@ -1085,11 +1102,6 @@ namespace MWMechanics
                     // TODO: Add mod support for stealth executions!
                     || (type == OT_Murder && *it != victim))
             {
-                if (type == OT_Theft || type == OT_Pickpocket)
-                    MWBase::Environment::get().getDialogueManager()->say(*it, "thief");
-                else if (type == OT_Trespassing)
-                    MWBase::Environment::get().getDialogueManager()->say(*it, "intruder");
-
                 // Crime reporting only applies to NPCs
                 if (!it->getClass().isNpc())
                     continue;
@@ -1097,6 +1109,14 @@ namespace MWMechanics
                 if (it->getClass().getCreatureStats(*it).getAiSequence().isInCombat(victim))
                     continue;
 
+                if (playerFollowers.find(*it) != playerFollowers.end())
+                    continue;
+
+                if (type == OT_Theft || type == OT_Pickpocket)
+                    MWBase::Environment::get().getDialogueManager()->say(*it, "thief");
+                else if (type == OT_Trespassing)
+                    MWBase::Environment::get().getDialogueManager()->say(*it, "intruder");
+
                 crimeSeen = true;
             }
         }
diff --git a/apps/openmw/mwmechanics/obstacle.cpp b/apps/openmw/mwmechanics/obstacle.cpp
index 3d2ab7d3d7..25bd06301f 100644
--- a/apps/openmw/mwmechanics/obstacle.cpp
+++ b/apps/openmw/mwmechanics/obstacle.cpp
@@ -1,5 +1,7 @@
 #include "obstacle.hpp"
 
+#include <components/esm/loadcell.hpp>
+
 #include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 6ce54a4baa..d307e990a1 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -12,6 +12,7 @@
 #include <osgViewer/Viewer>
 
 #include <components/esm/fogstate.hpp>
+#include <components/esm/loadcell.hpp>
 #include <components/settings/settings.hpp>
 #include <components/sceneutil/visitor.hpp>
 #include <components/files/memorystream.hpp>
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 7cad745dd8..b5f141963a 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -17,6 +17,8 @@
 #include <components/nifosg/controller.hpp>
 #include <components/sceneutil/controller.hpp>
 
+#include <components/esm/loadcell.hpp>
+
 #include "vismask.hpp"
 #include "ripplesimulation.hpp"
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 8409351aa0..9a9127977a 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -567,7 +567,8 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getNpcStats (ptr).getDrawState () == MWMechanics::DrawState_Weapon);
+                    runtime.push((ptr.getClass().hasInventoryStore(ptr) || ptr.getClass().isBipedal(ptr)) &&
+                                ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState_Weapon);
                 }
         };
 
@@ -580,7 +581,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(ptr.getClass().getNpcStats (ptr).getDrawState () == MWMechanics::DrawState_Spell);
+                    runtime.push(ptr.getClass().getCreatureStats (ptr).getDrawState () == MWMechanics::DrawState_Spell);
                 }
         };
 
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index 6609155236..8bb80b564b 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -1,8 +1,6 @@
 
 #include "actioneat.hpp"
 
-#include <cstdlib>
-
 #include <components/esm/loadskil.hpp>
 
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index f879343d9d..f88bf09587 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -5,13 +5,32 @@
 #include <stdexcept>
 #include <string>
 #include <typeinfo>
+#include <map>
+
 #include <boost/shared_ptr.hpp>
 
 #include "livecellref.hpp"
 #include "cellreflist.hpp"
 
-#include <components/esm/fogstate.hpp>
-#include <components/esm/records.hpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadalch.hpp>
+#include <components/esm/loadappa.hpp>
+#include <components/esm/loadarmo.hpp>
+#include <components/esm/loadbook.hpp>
+#include <components/esm/loadclot.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loadcrea.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadingr.hpp>
+#include <components/esm/loadlevlist.hpp>
+#include <components/esm/loadligh.hpp>
+#include <components/esm/loadlock.hpp>
+#include <components/esm/loadprob.hpp>
+#include <components/esm/loadrepa.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esm/loadweap.hpp>
+#include <components/esm/loadnpc.hpp>
+#include <components/esm/loadmisc.hpp>
 
 #include "../mwmechanics/pathgrid.hpp"  // TODO: maybe belongs in mwworld
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 5ec2d4e165..180cba3327 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -109,11 +109,6 @@ namespace MWWorld
         throw std::runtime_error("class cannot be hit");
     }
 
-    void Class::setActorHealth(const Ptr& ptr, float health, const Ptr& attacker) const
-    {
-        throw std::runtime_error("class does not have actor health");
-    }
-
     boost::shared_ptr<Action> Class::activate (const Ptr& ptr, const Ptr& actor) const
     {
         return boost::shared_ptr<Action> (new NullAction);
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 3f091380f2..cd05b471b3 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -136,12 +136,6 @@ namespace MWWorld
             ///< Play the appropriate sound for a blocked attack, depending on the currently equipped shield
             /// (default implementation: throw an exception)
 
-            virtual void setActorHealth(const Ptr& ptr, float health, const Ptr& attacker=Ptr()) const;
-            ///< Sets a new current health value for the actor, optionally specifying the object causing
-            /// the change. Use this instead of using CreatureStats directly as this will make sure the
-            /// correct dialog and actor states are properly handled when being hurt or healed.
-            /// (default implementation: throw an exception)
-
             virtual boost::shared_ptr<Action> activate (const Ptr& ptr, const Ptr& actor) const;
             ///< Generate action for activation (default implementation: return a null action).
 
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 6c283bb3ea..2fe914a4e1 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -490,6 +490,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
 {
     int retCount = ContainerStore::remove(item, count, actor);
 
+    bool wasEquipped = false;
     if (!item.getRefData().getCount())
     {
         for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
@@ -500,6 +501,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
             if (*mSlots[slot] == item)
             {
                 unequipSlot(slot, actor);
+                wasEquipped = true;
                 break;
             }
         }
@@ -507,7 +509,7 @@ int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor
 
     // If an armor/clothing item is removed, try to find a replacement,
     // but not for the player nor werewolves.
-    if ((actor != MWBase::Environment::get().getWorld()->getPlayerPtr())
+    if (wasEquipped && (actor != MWBase::Environment::get().getWorld()->getPlayerPtr())
             && !(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf()))
     {
         std::string type = item.getTypeName();
diff --git a/apps/openmw/mwworld/inventorystore.hpp b/apps/openmw/mwworld/inventorystore.hpp
index a60d1f464f..95c16c115e 100644
--- a/apps/openmw/mwworld/inventorystore.hpp
+++ b/apps/openmw/mwworld/inventorystore.hpp
@@ -87,7 +87,6 @@ namespace MWWorld
                 float mMultiplier;
             };
 
-            // TODO: store in savegame
             typedef std::map<std::string, std::vector<EffectParams> > TEffectMagnitudes;
             TEffectMagnitudes mPermanentMagicEffectMagnitudes;
 
diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index b926c57992..d6e40ad09e 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -1,7 +1,6 @@
 #include "manualref.hpp"
 
 #include "esmstore.hpp"
-#include "cellstore.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index b17b8e1f0c..6bfdd29860 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -1,7 +1,7 @@
-
 #include "player.hpp"
 
 #include <stdexcept>
+#include <iostream>
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
@@ -19,11 +19,9 @@
 
 #include "../mwmechanics/movement.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/actors.hpp"
 
 #include "class.hpp"
 #include "ptr.hpp"
-#include "inventorystore.hpp"
 #include "cellstore.hpp"
 
 namespace MWWorld
@@ -327,6 +325,7 @@ namespace MWWorld
             }
             catch (...)
             {
+                std::cerr << "Player cell '" << player.mCellId.mWorldspace << "' no longer exists" << std::endl;
                 // Cell no longer exists. Place the player in a default cell.
                 ESM::Position pos = mPlayer.mData.getPosition();
                 MWBase::Environment::get().getWorld()->indexToPosition(0, 0, pos.pos[0], pos.pos[1], true);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 13e6593e50..9ffc4071d5 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1,15 +1,12 @@
 #include "scene.hpp"
 
 #include <limits>
+#include <iostream>
 
-#include <components/nif/niffile.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/settings/settings.hpp>
 #include <components/resource/resourcesystem.hpp>
-#include <components/vfs/manager.hpp>
-
-#include <osg/PositionAttitudeTransform>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index d873ab4686..29187f950d 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1,5 +1,4 @@
 #include "store.hpp"
-#include "esmstore.hpp"
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8011f81ce2..15c8cbeb2e 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -14,13 +14,11 @@
 
 #include <components/esm/esmreader.hpp>
 #include <components/esm/esmwriter.hpp>
+#include <components/esm/cellid.hpp>
 
 #include <components/misc/rng.hpp>
 
 #include <components/files/collections.hpp>
-#include <components/compiler/locals.hpp>
-#include <components/esm/cellid.hpp>
-#include <components/esm/esmreader.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>
 
diff --git a/components/compiler/fileparser.cpp b/components/compiler/fileparser.cpp
index 423841ac3e..c8a512340f 100644
--- a/components/compiler/fileparser.cpp
+++ b/components/compiler/fileparser.cpp
@@ -1,7 +1,5 @@
 #include "fileparser.hpp"
 
-#include <iostream>
-
 #include "tokenloc.hpp"
 #include "scanner.hpp"
 
diff --git a/components/esmterrain/storage.cpp b/components/esmterrain/storage.cpp
index 1811f58e60..10b75bb741 100644
--- a/components/esmterrain/storage.cpp
+++ b/components/esmterrain/storage.cpp
@@ -5,8 +5,6 @@
 #include <osg/Image>
 #include <osg/Plane>
 
-#include <iostream>
-
 #include <boost/algorithm/string.hpp>
 
 #include <components/misc/resourcehelpers.hpp>
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index 3e5d0c245e..cd9a3c8f57 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -1,7 +1,6 @@
 #include "constrainedfilestream.hpp"
 
 #include <streambuf>
-#include <iostream>
 
 #include "lowlevelfile.hpp"
 
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index ea1e9fc912..f5dee0dba3 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -2,7 +2,6 @@
 #include "interpreter.hpp"
 
 #include <cassert>
-#include <iostream>
 #include <sstream>
 #include <stdexcept>
 
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index adf961dc25..2496c68cde 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -3,7 +3,6 @@
 #include <cstdio>
 #include <vector>
 #include <list>
-#include <iostream>
 #include <stdexcept>
 
 #include <BulletCollision/CollisionShapes/btBoxShape.h>
diff --git a/components/sceneutil/attach.cpp b/components/sceneutil/attach.cpp
index 2432b5eb29..d8cfa428a2 100644
--- a/components/sceneutil/attach.cpp
+++ b/components/sceneutil/attach.cpp
@@ -1,7 +1,6 @@
 #include "attach.hpp"
 
 #include <stdexcept>
-#include <iostream>
 
 #include <osg/NodeVisitor>
 #include <osg/Group>
diff --git a/components/sceneutil/lightmanager.cpp b/components/sceneutil/lightmanager.cpp
index 039d556d11..07ec0aff6c 100644
--- a/components/sceneutil/lightmanager.cpp
+++ b/components/sceneutil/lightmanager.cpp
@@ -1,5 +1,7 @@
 #include "lightmanager.hpp"
 
+#include <stdexcept>
+
 #include <osg/NodeVisitor>
 #include <osg/Geode>
 
@@ -9,9 +11,6 @@
 
 #include <boost/functional/hash.hpp>
 
-#include <iostream>
-#include <stdexcept>
-
 namespace SceneUtil
 {
 
diff --git a/components/terrain/material.cpp b/components/terrain/material.cpp
index 2034883edd..df45b6ec2a 100644
--- a/components/terrain/material.cpp
+++ b/components/terrain/material.cpp
@@ -1,7 +1,5 @@
 #include "material.hpp"
 
-#include <iostream>
-
 #include <osg/Depth>
 #include <osg/TexEnvCombine>
 #include <osg/Texture2D>