diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index b271aed182..976d7d84c1 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -182,8 +182,8 @@ namespace MWBase
             virtual void activateQuickKey  (int index) = 0;
 
             virtual void setSelectedSpell(const std::string& spellId, int successChancePercent) = 0;
-            virtual void setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent) = 0;
-            virtual void setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent) = 0;
+            virtual void setSelectedEnchantItem(const MWWorld::Ptr& item) = 0;
+            virtual void setSelectedWeapon(const MWWorld::Ptr& item) = 0;
             virtual void unsetSelectedSpell() = 0;
             virtual void unsetSelectedWeapon() = 0;
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 8eea383eb4..040dc703c0 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -216,6 +216,9 @@ namespace MWBase
             virtual MWWorld::Ptr  getFacedObject() = 0;
             ///< Return pointer to the object the player is looking at, if it is within activation range
 
+            virtual void adjustPosition (const MWWorld::Ptr& ptr) = 0;
+            ///< Adjust position after load to be on ground. Must be called after model load.
+
             virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
 
             virtual void moveObject (const MWWorld::Ptr& ptr, float x, float y, float z) = 0;
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index b94c270d56..320944d3ce 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -260,6 +260,8 @@ namespace MWClass
         }
 
         info.enchant = ref->mBase->mEnchant;
+        if (!info.enchant.empty())
+            info.remainingEnchantCharge = ptr.getCellRef().mEnchantmentCharge;
 
         info.text = text;
 
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index d65376898e..abad267675 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -207,6 +207,8 @@ namespace MWClass
         }
 
         info.enchant = ref->mBase->mEnchant;
+        if (!info.enchant.empty())
+            info.remainingEnchantCharge = ptr.getCellRef().mEnchantmentCharge;
 
         info.text = text;
 
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 1097f8f29c..04889360f3 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -9,6 +9,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontalk.hpp"
@@ -86,6 +87,11 @@ namespace MWClass
         return ref->mBase->mId;
     }
 
+    void Creature::adjustPosition(const MWWorld::Ptr& ptr) const
+    {
+        MWBase::Environment::get().getWorld()->adjustPosition(ptr);
+    }
+
     void Creature::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
         MWRender::Actors& actors = renderingInterface.getActors();
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index ea356165eb..297c2ea61b 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -22,6 +22,8 @@ namespace MWClass
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
 
+            virtual void adjustPosition(const MWWorld::Ptr& ptr) const;
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index cd6b0def11..7cda87bb15 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -160,6 +160,11 @@ namespace MWClass
         return ref->mBase->mId;
     }
 
+    void Npc::adjustPosition(const MWWorld::Ptr& ptr) const
+    {
+        MWBase::Environment::get().getWorld()->adjustPosition(ptr);
+    }
+
     void Npc::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
         renderingInterface.getActors().insertNPC(ptr, getInventoryStore(ptr));
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 1a10bce6c1..d1a9158fdf 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -44,6 +44,8 @@ namespace MWClass
 
             virtual void insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics) const;
 
+            virtual void adjustPosition(const MWWorld::Ptr& ptr) const;
+
             virtual std::string getName (const MWWorld::Ptr& ptr) const;
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index ed2a095e37..0a527262f8 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -349,6 +349,9 @@ namespace MWClass
 
         info.enchant = ref->mBase->mEnchant;
 
+        if (!info.enchant.empty())
+            info.remainingEnchantCharge = ptr.getCellRef().mEnchantmentCharge;
+
         if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
             text += MWGui::ToolTips::getMiscString(ref->mRef.mOwner, "Owner");
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index aeab5f94aa..001f42bd11 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -294,7 +294,7 @@ namespace MWGui
         if (weaponSlot == invStore.end())
             mWindowManager.unsetSelectedWeapon();
         else
-            mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
+            mWindowManager.setSelectedWeapon(*weaponSlot); /// \todo track weapon durability
 
         mPreviewDirty = true;
 
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index 0a65326050..1c9056748b 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -40,7 +40,8 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor)
 
     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
     MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
-    for (MWWorld::ContainerStoreIterator iter (store.begin());
+    int categories = MWWorld::ContainerStore::Type_Weapon | MWWorld::ContainerStore::Type_Armor;
+    for (MWWorld::ContainerStoreIterator iter (store.begin(categories));
          iter!=store.end(); ++iter)
     {
         if (MWWorld::Class::get(*iter).hasItemHealth(*iter))
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 5ea13fb0d7..2e4bf9100b 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -346,7 +346,7 @@ namespace MWGui
 
             store.setSelectedEnchantItem(it);
             spells.setSelectedSpell("");
-            mWindowManager.setSelectedEnchantItem(item, 100); /// \todo track charge %
+            mWindowManager.setSelectedEnchantItem(item);
         }
     }
 
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index d7fb0e1bcd..021a849a08 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -382,7 +382,7 @@ namespace MWGui
 
         store.setSelectedEnchantItem(it);
         spells.setSelectedSpell("");
-        mWindowManager.setSelectedEnchantItem(item, 100); /// \todo track charge %
+        mWindowManager.setSelectedEnchantItem(item);
 
         updateSpells();
     }
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index af3e146bba..9292e60e5c 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -456,8 +456,8 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
         if (enchant->mData.mType == ESM::Enchantment::WhenStrikes
             || enchant->mData.mType == ESM::Enchantment::WhenUsed)
         {
-            /// \todo store the current enchantment charge somewhere
-            int charge = enchant->mData.mCharge;
+            int maxCharge = enchant->mData.mCharge;
+            int charge = (info.remainingEnchantCharge == -1) ? maxCharge : info.remainingEnchantCharge;
 
             const int chargeWidth = 204;
 
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index ba94915cc7..da5a35221c 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -17,6 +17,7 @@ namespace MWGui
             : isPotion(false)
             , imageSize(32)
             , wordWrap(true)
+            , remainingEnchantCharge(-1)
         {}
 
         std::string caption;
@@ -26,6 +27,7 @@ namespace MWGui
 
         // enchantment (for cloth, armor, weapons)
         std::string enchant;
+        int remainingEnchantCharge;
 
         // effects (for potions, ingredients)
         Widgets::SpellEffectList effects;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index c975b2cdba..f994683a66 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -933,14 +933,19 @@ void WindowManager::setSelectedSpell(const std::string& spellId, int successChan
     mSpellWindow->setTitle(spell->mName);
 }
 
-void WindowManager::setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent)
+void WindowManager::setSelectedEnchantItem(const MWWorld::Ptr& item)
 {
+    const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>()
+            .find(MWWorld::Class::get(item).getEnchantment(item));
+
+    int chargePercent = item.getCellRef().mEnchantmentCharge / static_cast<float>(ench->mData.mCharge) * 100;
     mHud->setSelectedEnchantItem(item, chargePercent);
     mSpellWindow->setTitle(MWWorld::Class::get(item).getName(item));
 }
 
-void WindowManager::setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent)
+void WindowManager::setSelectedWeapon(const MWWorld::Ptr& item)
 {
+    int durabilityPercent = item.getCellRef().mCharge / static_cast<float>(MWWorld::Class::get(item).getItemMaxHealth(item)) * 100;
     mHud->setSelectedWeapon(item, durabilityPercent);
     mInventoryWindow->setTitle(MWWorld::Class::get(item).getName(item));
 }
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index c14c6b2fe4..3c9fc586a3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -179,8 +179,8 @@ namespace MWGui
     virtual void activateQuickKey  (int index);
 
     virtual void setSelectedSpell(const std::string& spellId, int successChancePercent);
-    virtual void setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent);
-    virtual void setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent);
+    virtual void setSelectedEnchantItem(const MWWorld::Ptr& item);
+    virtual void setSelectedWeapon(const MWWorld::Ptr& item);
     virtual void unsetSelectedSpell();
     virtual void unsetSelectedWeapon();
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 7c442c6868..cd5ab19b9d 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -235,7 +235,7 @@ void RenderingManager::cellAdded (MWWorld::Ptr::CellStore *store)
     mObjects.buildStaticGeometry (*store);
     mDebugging->cellAdded(store);
     if (store->mCell->isExterior())
-      mTerrainManager->cellAdded(store);
+        mTerrainManager->cellAdded(store);
     waterAdded(store);
 }
 
@@ -529,25 +529,28 @@ void RenderingManager::applyFog (bool underwater)
 
 void RenderingManager::setAmbientMode()
 {
-  switch (mAmbientMode)
-  {
+    switch (mAmbientMode)
+    {
     case 0:
-
-      setAmbientColour(mAmbientColor);
-      break;
+        setAmbientColour(mAmbientColor);
+        break;
 
     case 1:
-
-      setAmbientColour(0.7f*mAmbientColor + 0.3f*ColourValue(1,1,1));
-      break;
+        setAmbientColour(0.7f*mAmbientColor + 0.3f*ColourValue(1,1,1));
+        break;
 
     case 2:
-
-      setAmbientColour(ColourValue(1,1,1));
-      break;
-  }
+        setAmbientColour(ColourValue(1,1,1));
+        break;
+    }
 }
 
+float RenderingManager::getTerrainHeightAt(Ogre::Vector3 worldPos)
+{
+    return mTerrainManager->getTerrainHeightAt(worldPos);
+}
+
+
 void RenderingManager::configureAmbient(MWWorld::Ptr::CellStore &mCell)
 {
     mAmbientColor.setAsABGR (mCell.mCell->mAmbi.mAmbient);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index fd43438ca5..b343a60bdb 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -158,6 +158,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
 
     void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches);
 
+    float getTerrainHeightAt (Ogre::Vector3 worldPos);
+
     void setGlare(bool glare);
     void skyEnable ();
     void skyDisable ();
diff --git a/apps/openmw/mwrender/terrain.cpp b/apps/openmw/mwrender/terrain.cpp
index 438366873c..c27dce6cad 100644
--- a/apps/openmw/mwrender/terrain.cpp
+++ b/apps/openmw/mwrender/terrain.cpp
@@ -71,6 +71,17 @@ namespace MWRender
 
     //----------------------------------------------------------------------------------------------
 
+    float TerrainManager::getTerrainHeightAt(Vector3 worldPos)
+    {
+        Ogre::Terrain* terrain = NULL;
+        float height = mTerrainGroup.getHeightAtWorldPosition(worldPos, &terrain);
+        if (terrain == NULL)
+            return std::numeric_limits<int>().min();
+        return height;
+    }
+
+    //----------------------------------------------------------------------------------------------
+
     TerrainManager::~TerrainManager()
     {
         OGRE_DELETE mTerrainGlobals;
diff --git a/apps/openmw/mwrender/terrain.hpp b/apps/openmw/mwrender/terrain.hpp
index 484a0dbe3a..45c56390e8 100644
--- a/apps/openmw/mwrender/terrain.hpp
+++ b/apps/openmw/mwrender/terrain.hpp
@@ -40,6 +40,9 @@ namespace MWRender{
 
         void cellAdded(MWWorld::CellStore* store);
         void cellRemoved(MWWorld::CellStore* store);
+
+        float getTerrainHeightAt (Ogre::Vector3 worldPos);
+
     private:
         Ogre::TerrainGlobalOptions* mTerrainGlobals;
         Ogre::TerrainGroup mTerrainGroup;
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index d86a6e3486..97dc6d7188 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -303,6 +303,8 @@ namespace MWScript
                             zRot = zRot/60.;
                         }
                         MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
+
+                        MWWorld::Class::get(ptr).adjustPosition(ptr);
                     }
                     else
                     {
@@ -341,6 +343,7 @@ namespace MWScript
                         zRot = zRot/60.;
                     }
                     MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
+                    MWWorld::Class::get(ptr).adjustPosition(ptr);
                 }
         };
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 1b07dfe627..69e3016767 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -208,14 +208,21 @@ namespace MWSound
 
     void SoundManager::startRandomTitle()
     {
-        Ogre::StringVectorPtr filelist;
-        filelist = mResourceMgr.findResourceNames(Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
-                                                  "Music/"+mCurrentPlaylist+"/*");
-        if(!filelist->size())
+        Ogre::StringVector filelist;
+
+        Ogre::StringVector groups = Ogre::ResourceGroupManager::getSingleton().getResourceGroups ();
+        for (Ogre::StringVector::iterator it = groups.begin(); it != groups.end(); ++it)
+        {
+            Ogre::StringVectorPtr resourcesInThisGroup = mResourceMgr.findResourceNames(*it,
+                                                                                        "Music/"+mCurrentPlaylist+"/*");
+            filelist.insert(filelist.end(), resourcesInThisGroup->begin(), resourcesInThisGroup->end());
+        }
+
+        if(!filelist.size())
             return;
 
-        int i = rand()%filelist->size();
-        streamMusicFull((*filelist)[i]);
+        int i = rand()%filelist.size();
+        streamMusicFull(filelist[i]);
     }
 
     bool SoundManager::isMusicPlaying()
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 98579797c7..2dfa241b3b 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -259,6 +259,10 @@ namespace MWWorld
         throw std::runtime_error ("class can't be enchanted");
     }
 
+    void Class::adjustPosition(const MWWorld::Ptr& ptr) const
+    {
+    }
+
     MWWorld::Ptr
     Class::copyToCellImpl(const Ptr &ptr, CellStore &cell) const
     {
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index e34ebdde77..de4741e38b 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -81,6 +81,9 @@ namespace MWWorld
             ///< \return name (the one that is to be presented to the user; not the internal one);
             /// can return an empty string.
 
+            virtual void adjustPosition(const MWWorld::Ptr& ptr) const;
+            ///< Adjust position to stand on ground. Must be called post model load
+
             virtual MWMechanics::CreatureStats& getCreatureStats (const Ptr& ptr) const;
             ///< Return creature stats or throw an exception, if class does not have creature stats
             /// (default implementation: throw an exceoption)
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 28f3317065..19ee2e517b 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -88,6 +88,50 @@ namespace MWWorld
         }
 
     public:
+        static Ogre::Vector3 traceDown(const MWWorld::Ptr &ptr, OEngine::Physic::PhysicEngine *engine)
+        {
+            const ESM::Position &refpos = ptr.getRefData().getPosition();
+            Ogre::Vector3 position(refpos.pos);
+
+            bool hit=false;
+            bool isInterior = !ptr.getCell()->isExterior();
+
+            OEngine::Physic::PhysicActor *physicActor = engine->getCharacter(ptr.getRefData().getHandle());
+            if (!physicActor)
+                return position;
+
+            bool wasCollisionMode = physicActor->getCollisionMode();
+
+            physicActor->enableCollisions(false);
+
+            Ogre::Vector3 halfExtents = physicActor->getHalfExtents();// + Vector3(1,1,1);
+
+            Ogre::Vector3 newPosition = position;
+
+            traceResults trace; //no initialization needed
+
+            int maxHeight = 400.f;
+            int steps = 100;
+            for (int i=0; i<steps; ++i)
+            {
+                newtrace(&trace, newPosition, newPosition-Ogre::Vector3(0,0,maxHeight / steps), halfExtents, isInterior, engine);
+                if(trace.fraction < 1.0f)
+                    hit = true;
+                newPosition = trace.endpos;
+            }
+
+            newPosition = trace.endpos;
+
+            physicActor->setOnGround(hit);
+            physicActor->enableCollisions(wasCollisionMode);
+
+            if (hit)
+                return newPosition;
+            else
+                return position;
+        }
+
+
         static Ogre::Vector3 move(const MWWorld::Ptr &ptr, const Ogre::Vector3 &movement, float time,
                                   bool gravity, OEngine::Physic::PhysicEngine *engine)
         {
@@ -318,7 +362,7 @@ namespace MWWorld
         btVector3 btTo = btVector3(to.x, to.y, to.z);
 
         std::pair<std::string, float> test = mEngine->rayTest(btFrom, btTo);
-        if (test.first == "") {
+        if (test.second == -1) {
             return std::make_pair(false, Ogre::Vector3());
         }
         return std::make_pair(true, ray.getPoint(len * test.second));
@@ -351,6 +395,10 @@ namespace MWWorld
         return MovementSolver::move(ptr, movement, time, gravity, mEngine);
     }
 
+    Ogre::Vector3 PhysicsSystem::traceDown(const MWWorld::Ptr &ptr)
+    {
+        return MovementSolver::traceDown(ptr, mEngine);
+    }
 
     void PhysicsSystem::addHeightField (float* heights,
                 int x, int y, float yoffset,
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index 2e48be4079..4eec9367cb 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -51,6 +51,7 @@ namespace MWWorld
             bool toggleCollisionMode();
             
             Ogre::Vector3 move(const MWWorld::Ptr &ptr, const Ogre::Vector3 &movement, float time, bool gravity);
+            Ogre::Vector3 traceDown(const MWWorld::Ptr &ptr);
 
             std::pair<float, std::string> getFacedHandle (MWWorld::World& world, float queryDistance);
             std::vector < std::pair <float, std::string> > getFacedHandles (float queryDistance);
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 339026ca60..2244a4fc64 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -51,6 +51,7 @@ namespace
                         class_.insertObject(ptr, physics);
                         MWBase::Environment::get().getWorld()->rotateObject(ptr, 0, 0, 0, true);
                         MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().mScale);
+                        class_.adjustPosition(ptr);
                     }
                     catch (const std::exception& e)
                     {
@@ -99,7 +100,6 @@ namespace MWWorld
         }
 
         mRendering.removeCell(*iter);
-       //mPhysics->removeObject("Unnamed_43");
 
         MWBase::Environment::get().getWorld()->getLocalScripts().clearCell (*iter);
         MWBase::Environment::get().getMechanicsManager()->drop (*iter);
@@ -115,11 +115,6 @@ namespace MWWorld
 
         if(result.second)
         {
-            /// \todo rescale depending on the state of a new GMST
-            insertCell (*cell, true);
-
-            mRendering.cellAdded (cell);
-
             float verts = ESM::Land::LAND_SIZE;
             float worldsize = ESM::Land::REAL_SIZE;
 
@@ -142,6 +137,11 @@ namespace MWWorld
                 }
             }
 
+            /// \todo rescale depending on the state of a new GMST
+            insertCell (*cell, true);
+
+            mRendering.cellAdded (cell);
+
             mRendering.configureAmbient(*cell);
             mRendering.requestMap(cell);
             mRendering.configureAmbient(*cell);
@@ -165,6 +165,8 @@ namespace MWWorld
             float y = Ogre::Radian(pos.rot[1]).valueDegrees();
             float z = Ogre::Radian(pos.rot[2]).valueDegrees();
             world->rotateObject(player, x, y, z);
+
+            MWWorld::Class::get(player).adjustPosition(player);
         }
 
         MWBase::MechanicsManager *mechMgr =
@@ -355,6 +357,8 @@ namespace MWWorld
             float y = Ogre::Radian(position.rot[1]).valueDegrees();
             float z = Ogre::Radian(position.rot[2]).valueDegrees();
             world->rotateObject(world->getPlayer().getPlayer(), x, y, z);
+
+            MWWorld::Class::get(world->getPlayer().getPlayer()).adjustPosition(world->getPlayer().getPlayer());
             return;
         }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ae0e02c8c9..ae9b7a06b7 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -706,9 +706,11 @@ namespace MWWorld
     void World::moveObject(const Ptr &ptr, CellStore &newCell, float x, float y, float z)
     {
         ESM::Position &pos = ptr.getRefData().getPosition();
+
         pos.pos[0] = x;
         pos.pos[1] = y;
         pos.pos[2] = z;
+
         Ogre::Vector3 vec(x, y, z);
 
         CellStore *currCell = ptr.getCell();
@@ -717,7 +719,7 @@ namespace MWWorld
 
         if (*currCell != newCell)
         {
-        removeContainerScripts(ptr);
+            removeContainerScripts(ptr);
 
             if (isPlayer)
             {
@@ -749,7 +751,7 @@ namespace MWWorld
                 else
                 {
                     MWWorld::Ptr copy =
-                        MWWorld::Class::get(ptr).copyToCell(ptr, newCell);
+                        MWWorld::Class::get(ptr).copyToCell(ptr, newCell, pos);
 
                     mRendering->updateObjectCell(ptr, copy);
 
@@ -779,12 +781,14 @@ namespace MWWorld
     bool World::moveObjectImp(const Ptr& ptr, float x, float y, float z)
     {
         CellStore *cell = ptr.getCell();
+
         if (cell->isExterior()) {
             int cellX, cellY;
             positionToIndex(x, y, cellX, cellY);
 
             cell = getExterior(cellX, cellY);
         }
+
         moveObject(ptr, *cell, x, y, z);
 
         return cell != ptr.getCell();
@@ -822,6 +826,33 @@ namespace MWWorld
         }
     }
 
+    void World::adjustPosition(const Ptr &ptr)
+    {
+        Ogre::Vector3 pos (ptr.getRefData().getPosition().pos[0], ptr.getRefData().getPosition().pos[1], ptr.getRefData().getPosition().pos[2]);
+
+        if(!ptr.getRefData().getBaseNode())
+        {
+            // will be adjusted when Ptr's cell becomes active
+            return;
+        }
+
+        float terrainHeight = mRendering->getTerrainHeightAt(pos);
+
+        if (pos.z < terrainHeight)
+            pos.z = terrainHeight+400; // place slightly above. will snap down to ground with code below
+
+        ptr.getRefData().getPosition().pos[2] = pos.z;
+
+        if (!isFlying(ptr))
+        {
+            Ogre::Vector3 traced = mPhysics->traceDown(ptr);
+            if (traced.z < pos.z)
+                pos.z = traced.z;
+        }
+
+        moveObject(ptr, pos.x, pos.y, pos.z);
+    }
+
     void World::rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust)
     {
         rotateObjectImp(ptr, Ogre::Vector3(Ogre::Degree(x).valueRadians(),
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 8cff50bd16..5ae87a1ff7 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -188,6 +188,9 @@ namespace MWWorld
             virtual Ptr searchPtrViaHandle (const std::string& handle);
             ///< Return a pointer to a liveCellRef with the given Ogre handle or Ptr() if not found
 
+            virtual void adjustPosition (const Ptr& ptr);
+            ///< Adjust position after load to be on ground. Must be called after model load.
+
             virtual void enable (const Ptr& ptr);
 
             virtual void disable (const Ptr& ptr);
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 7b831d32c5..f71fa4320b 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -323,7 +323,8 @@ namespace Physic
 
         mHeightFieldMap [name] = hf;
 
-        dynamicsWorld->addRigidBody(body,CollisionType_World,CollisionType_World|CollisionType_ActorInternal|CollisionType_ActorExternal);
+        dynamicsWorld->addRigidBody(body,CollisionType_World|CollisionType_Raycasting,
+                                    CollisionType_World|CollisionType_ActorInternal|CollisionType_ActorExternal|CollisionType_Raycasting);
     }
 
     void PhysicEngine::removeHeightField(int x, int y)