diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8179021a4c..7f349e2236 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 29)
+set(OPENMW_VERSION_MINOR 30)
 set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")
@@ -36,18 +36,8 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
                 string(REGEX REPLACE "^openmw-[0-9]+\\.([0-9]+).*" "\\1" GIT_VERSION_MINOR "${VERSION}")
                 string(REGEX REPLACE "^openmw-[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" GIT_VERSION_RELEASE "${VERSION}")
 
-                set(GIT_VERSION "${GIT_VERSION_MAJOR}.${GIT_VERSION_MINOR}.${GIT_VERSION_RELEASE}")
-
-                if(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
-                    message(FATAL_ERROR "Silly Zini forgot to update the version again...")
-                else(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
-                    set(OPENMW_VERSION_MAJOR ${GIT_VERSION_MAJOR})
-                    set(OPENMW_VERSION_MINOR ${GIT_VERSION_MINOR})
-                    set(OPENMW_VERSION_RELEASE ${GIT_VERSION_RELEASE})
-
-                    set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
-                    set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
-                endif(NOT ${OPENMW_VERSION} STREQUAL ${GIT_VERSION})
+                set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
+                set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
 
                 message(STATUS "OpenMW version ${OPENMW_VERSION}")
             else(MATCH)
@@ -129,6 +119,7 @@ set(OENGINE_OGRE
 )
 
 set(OENGINE_GUI
+  ${LIBDIR}/openengine/gui/loglistener.cpp
   ${LIBDIR}/openengine/gui/manager.cpp
   ${LIBDIR}/openengine/gui/layout.hpp
 )
@@ -234,6 +225,9 @@ endif ()
 
 
 set(BOOST_COMPONENTS system filesystem program_options)
+if(WIN32)
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
+endif(WIN32)
 
 IF(BOOST_STATIC)
     set(Boost_USE_STATIC_LIBS   ON)
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 25b2a45050..fd4b97acb9 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -651,7 +651,7 @@ void Record<ESM::Dialogue>::print()
     // Sadly, there are no DialInfos, because the loader dumps as it
     // loads, rather than loading and then dumping. :-( Anyone mind if
     // I change this?
-    std::vector<ESM::DialInfo>::iterator iit;
+    ESM::Dialogue::InfoContainer::iterator iit;
     for (iit = mData.mInfo.begin(); iit != mData.mInfo.end(); iit++)
         std::cout << "INFO!" << iit->mId << std::endl;
 }
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 5cf8f8a892..fb4c09b918 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -41,11 +41,11 @@ Launcher::MainDialog::MainDialog(QWidget *parent)
     // Check if the font is installed
     if (!fonts.contains("EB Garamond")) {
 
-        QString font = QString::fromStdString(mCfgMgr.getGlobalDataPath().string()) + QString("resources/mygui/EBGaramond-Regular.ttf");
+        QString font = QString::fromUtf8(mCfgMgr.getGlobalDataPath().string().c_str()) + QString("resources/mygui/EBGaramond-Regular.ttf");
         file.setFileName(font);
 
         if (!file.exists()) {
-            font = QString::fromStdString(mCfgMgr.getLocalPath().string()) + QString("resources/mygui/EBGaramond-Regular.ttf");
+            font = QString::fromUtf8(mCfgMgr.getLocalPath().string().c_str()) + QString("resources/mygui/EBGaramond-Regular.ttf");
         }
 
         fontDatabase.addApplicationFont(font);
@@ -243,7 +243,7 @@ bool Launcher::MainDialog::showFirstRunDialog()
         }
 
         // Create the file if it doesn't already exist, else the importer will fail
-        QString path = QString::fromStdString(mCfgMgr.getUserConfigPath().string()) + QString("openmw.cfg");
+        QString path = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str()) + QString("openmw.cfg");
         QFile file(path);
 
         if (!file.exists()) {
@@ -358,7 +358,7 @@ bool Launcher::MainDialog::setupLauncherSettings()
 {
     mLauncherSettings.setMultiValueEnabled(true);
 
-    QString userPath = QString::fromStdString(mCfgMgr.getUserConfigPath().string());
+    QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
 
     QStringList paths;
     paths.append(QString("launcher.cfg"));
@@ -464,8 +464,8 @@ bool Launcher::expansions(Launcher::UnshieldThread& cd)
 
 bool Launcher::MainDialog::setupGameSettings()
 {
-    QString userPath = QString::fromStdString(mCfgMgr.getUserConfigPath().string());
-    QString globalPath = QString::fromStdString(mCfgMgr.getGlobalPath().string());
+    QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
+    QString globalPath = QString::fromUtf8(mCfgMgr.getGlobalPath().string().c_str());
 
     // Load the user config file first, separately
     // So we can write it properly, uncontaminated
@@ -594,7 +594,7 @@ bool Launcher::MainDialog::setupGameSettings()
 
             while(expansions(cd));
 
-            selectedFile = QString::fromStdString(cd.GetMWEsmPath());
+            selectedFile = QString::fromUtf8(cd.GetMWEsmPath().c_str());
         }
         #endif // WIN32
 
@@ -615,8 +615,8 @@ bool Launcher::MainDialog::setupGraphicsSettings()
 {
     mGraphicsSettings.setMultiValueEnabled(false);
 
-    QString userPath = QString::fromStdString(mCfgMgr.getUserConfigPath().string());
-    QString globalPath = QString::fromStdString(mCfgMgr.getGlobalPath().string());
+    QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
+    QString globalPath = QString::fromUtf8(mCfgMgr.getGlobalPath().string().c_str());
 
     QFile localDefault(QString("settings-default.cfg"));
     QFile globalDefault(globalPath + QString("settings-default.cfg"));
@@ -702,7 +702,7 @@ bool Launcher::MainDialog::writeSettings()
     mGraphicsPage->saveSettings();
     mDataFilesPage->saveSettings();
 
-    QString userPath = QString::fromStdString(mCfgMgr.getUserConfigPath().string());
+    QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
     QDir dir(userPath);
 
     if (!dir.exists()) {
diff --git a/apps/launcher/settings/gamesettings.cpp b/apps/launcher/settings/gamesettings.cpp
index e7e5cf1ea7..2f3dd9a458 100644
--- a/apps/launcher/settings/gamesettings.cpp
+++ b/apps/launcher/settings/gamesettings.cpp
@@ -45,7 +45,8 @@ void Launcher::GameSettings::validatePaths()
     Files::PathContainer dataDirs;
 
     foreach (const QString &path, paths) {
-        dataDirs.push_back(Files::PathContainer::value_type(path.toStdString()));
+        QByteArray bytes = path.toUtf8();
+        dataDirs.push_back(Files::PathContainer::value_type(std::string(bytes.constData(), bytes.length())));
     }
 
     // Parse the data dirs to convert the tokenized paths
@@ -53,7 +54,7 @@ void Launcher::GameSettings::validatePaths()
     mDataDirs.clear();
 
     for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it) {
-        QString path = QString::fromStdString(it->string());
+        QString path = QString::fromUtf8(it->string().c_str());
         path.remove(QChar('\"'));
 
         QDir dir(path);
@@ -68,12 +69,13 @@ void Launcher::GameSettings::validatePaths()
         return;
 
     dataDirs.clear();
-    dataDirs.push_back(Files::PathContainer::value_type(local.toStdString()));
+    QByteArray bytes = local.toUtf8();
+    dataDirs.push_back(Files::PathContainer::value_type(std::string(bytes.constData(), bytes.length())));
 
     mCfgMgr.processPaths(dataDirs);
 
     if (!dataDirs.empty()) {
-        QString path = QString::fromStdString(dataDirs.front().string());
+        QString path = QString::fromUtf8(dataDirs.front().string().c_str());
         path.remove(QChar('\"'));
 
         QDir dir(path);
diff --git a/apps/launcher/unshieldthread.cpp b/apps/launcher/unshieldthread.cpp
index 52f9357108..3d0f2e5da6 100644
--- a/apps/launcher/unshieldthread.cpp
+++ b/apps/launcher/unshieldthread.cpp
@@ -1,6 +1,6 @@
 #include "unshieldthread.hpp"
 
-#include <fstream>
+#include <boost/filesystem/fstream.hpp>
 #include <components/misc/stringops.hpp>
    
 namespace bfs = boost::filesystem;
@@ -49,7 +49,7 @@ namespace
 
     std::string read_to_string(const bfs::path& path)
     {
-        std::ifstream strstream(path.c_str(), std::ios::in | std::ios::binary);
+        bfs::ifstream strstream(path, std::ios::in | std::ios::binary);
         std::string str;
 
         strstream.seekg(0, std::ios::end);
@@ -201,7 +201,7 @@ namespace
             add_setting("Archives", "Archive 1", "Bloodmoon.bsa", ini);
         }
 
-        std::ofstream inistream(ini_path.c_str());
+        bfs::ofstream inistream((ini_path));
         inistream << ini;
         inistream.close();
     }
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 648ab3ebee..3a52592ae8 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -1,6 +1,5 @@
 #include "importer.hpp"
-#include <boost/iostreams/device/file.hpp>
-#include <boost/iostreams/stream.hpp>
+
 #include <iostream>
 #include <string>
 #include <map>
@@ -9,6 +8,10 @@
 #include <sstream>
 #include <components/misc/stringops.hpp>
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+
+namespace bfs = boost::filesystem;
 
 MwIniImporter::MwIniImporter()
     : mVerbose(false)
@@ -661,7 +664,7 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::string& filenam
 
     std::string section("");
     MwIniImporter::multistrmap map;
-    boost::iostreams::stream<boost::iostreams::file_source>file(filename.c_str());
+    bfs::ifstream file((bfs::path(filename)));
     ToUTF8::Utf8Encoder encoder(mEncoding);
 
     std::string line;
@@ -674,6 +677,10 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::string& filenam
             line = line.substr(0, line.length()-1);
         }
 
+        if(line.empty()) {
+            continue;
+        }
+
         if(line[0] == '[') {
             int pos = line.find(']');
             if(pos < 2) {
@@ -690,10 +697,6 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(const std::string& filenam
             line = line.substr(0,comment_pos);
         }
 
-        if(line.empty()) {
-            continue;
-        }
-
         int pos = line.find("=");
         if(pos < 1) {
             continue;
@@ -720,7 +723,7 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::string& filenam
     std::cout << "load cfg file: " << filename << std::endl;
 
     MwIniImporter::multistrmap map;
-    boost::iostreams::stream<boost::iostreams::file_source>file(filename.c_str());
+    bfs::ifstream file((bfs::path(filename)));
 
     std::string line;
     while (std::getline(file, line)) {
@@ -858,7 +861,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, const multistrmap &ini) co
     }
 }
 
-void MwIniImporter::writeToFile(boost::iostreams::stream<boost::iostreams::file_sink> &out, const multistrmap &cfg) {
+void MwIniImporter::writeToFile(std::ostream &out, const multistrmap &cfg) {
 
     for(multistrmap::const_iterator it=cfg.begin(); it != cfg.end(); ++it) {
         for(std::vector<std::string>::const_iterator entry=it->second.begin(); entry != it->second.end(); ++entry) {
diff --git a/apps/mwiniimporter/importer.hpp b/apps/mwiniimporter/importer.hpp
index 784980e090..72b14ba75f 100644
--- a/apps/mwiniimporter/importer.hpp
+++ b/apps/mwiniimporter/importer.hpp
@@ -1,12 +1,11 @@
 #ifndef MWINIIMPORTER_IMPORTER
 #define MWINIIMPORTER_IMPORTER 1
 
-#include <boost/iostreams/device/file.hpp>
-#include <boost/iostreams/stream.hpp>
 #include <string>
 #include <map>
 #include <vector>
 #include <exception>
+#include <iosfwd>
 
 #include <components/to_utf8/to_utf8.hpp>
 
@@ -24,7 +23,7 @@ class MwIniImporter {
     void    mergeFallback(multistrmap &cfg, const multistrmap &ini) const;
     void    importGameFiles(multistrmap &cfg, const multistrmap &ini) const;
     void    importArchives(multistrmap &cfg, const multistrmap &ini) const;
-    static void    writeToFile(boost::iostreams::stream<boost::iostreams::file_sink> &out, const multistrmap &cfg);
+    static void    writeToFile(std::ostream &out, const multistrmap &cfg);
 
   private:
     static void insertMultistrmap(multistrmap &cfg, const std::string& key, const std::string& value);
diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp
index 364a6b1a4a..c10103cd62 100644
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@@ -1,14 +1,59 @@
 #include "importer.hpp"
 
-#include <iostream>
 #include <string>
+#include <iostream>
+
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 namespace bpo = boost::program_options;
+namespace bfs = boost::filesystem;
 
+#ifndef _WIN32
 int main(int argc, char *argv[]) {
+#else
 
+// Include on Windows only
+#include <boost/locale.hpp>
+
+class utf8argv
+{
+public:
+
+    utf8argv(int argc, wchar_t *wargv[])
+    {
+        args.reserve(argc);
+        argv = new const char *[argc];
+
+        for (int i = 0; i < argc; ++i) {
+            args.push_back(boost::locale::conv::utf_to_utf<char>(wargv[i]));
+            argv[i] = args.back().c_str();
+        }
+    }
+
+    ~utf8argv() { delete[] argv; }
+    char **get() const { return const_cast<char **>(argv); }
+
+private:
+
+    const char **argv;
+    std::vector<std::string> args;
+};
+
+/*  The only way to pass Unicode on Winodws with CLI is to use wide
+    characters interface which presents UTF-16 encoding. The rest of
+    OpenMW application stack assumes UTF-8 encoding, therefore this
+    conversion.
+
+    For boost::filesystem::path::imbue see components/files/windowspath.cpp
+*/
+int wmain(int argc, wchar_t *wargv[]) {
+    utf8argv converter(argc, wargv);
+    char **argv = converter.get();
+    boost::filesystem::path::imbue(boost::locale::generator().generate(""));
+#endif
     bpo::options_description desc("Syntax: mwiniimporter <options> inifile configfile\nAllowed options");
     bpo::positional_options_description p_desc;
     desc.add_options()
@@ -94,7 +139,7 @@ int main(int argc, char *argv[]) {
     }
 
     std::cout << "write to: " << outputFile << std::endl;
-    boost::iostreams::stream<boost::iostreams::file_sink> file(outputFile);
+    bfs::ofstream file((bfs::path(outputFile)));
     importer.writeToFile(file, cfg);
 
     return 0;
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 35551f97b8..4576432e1c 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -145,6 +145,10 @@ if(WIN32)
 endif(WIN32)
 
 set(BOOST_COMPONENTS system filesystem program_options thread wave)
+if(WIN32)
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
+endif(WIN32)
+
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 
 find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index eb93d90475..066c76734e 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -27,7 +27,9 @@ void CSMDoc::OpenSaveStage::perform (int stage, Messages& messages)
 {
     mState.start (mDocument, mProjectFile);
 
-    mState.getStream().open ((mProjectFile ? mState.getPath() : mState.getTmpPath()).string().c_str());
+    mState.getStream().open (
+        mProjectFile ? mState.getPath() : mState.getTmpPath(),
+        std::ios::binary);
 
     if (!mState.getStream().is_open())
         throw std::runtime_error ("failed to open stream for saving");
@@ -260,4 +262,4 @@ void CSMDoc::FinalSavingStage::perform (int stage, Messages& messages)
 
         mDocument.getUndoStack().setClean();
     }
-}
\ No newline at end of file
+}
diff --git a/apps/opencs/model/doc/savingstate.cpp b/apps/opencs/model/doc/savingstate.cpp
index 8742148226..07c42a490f 100644
--- a/apps/opencs/model/doc/savingstate.cpp
+++ b/apps/opencs/model/doc/savingstate.cpp
@@ -47,7 +47,7 @@ const boost::filesystem::path& CSMDoc::SavingState::getTmpPath() const
     return mTmpPath;
 }
 
-std::ofstream& CSMDoc::SavingState::getStream()
+boost::filesystem::ofstream& CSMDoc::SavingState::getStream()
 {
     return mStream;
 }
@@ -60,4 +60,4 @@ ESM::ESMWriter& CSMDoc::SavingState::getWriter()
 bool CSMDoc::SavingState::isProjectFile() const
 {
     return mProjectFile;
-}
\ No newline at end of file
+}
diff --git a/apps/opencs/model/doc/savingstate.hpp b/apps/opencs/model/doc/savingstate.hpp
index 6b45655846..7b0c373866 100644
--- a/apps/opencs/model/doc/savingstate.hpp
+++ b/apps/opencs/model/doc/savingstate.hpp
@@ -4,6 +4,7 @@
 #include <fstream>
 
 #include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include <components/esm/esmwriter.hpp>
 
@@ -20,7 +21,7 @@ namespace CSMDoc
             boost::filesystem::path mPath;
             boost::filesystem::path mTmpPath;
             ToUTF8::Utf8Encoder mEncoder;
-            std::ofstream mStream;
+            boost::filesystem::ofstream mStream;
             ESM::ESMWriter mWriter;
             boost::filesystem::path mProjectPath;
             bool mProjectFile;
@@ -39,7 +40,7 @@ namespace CSMDoc
 
             const boost::filesystem::path& getTmpPath() const;
 
-            std::ofstream& getStream();
+            boost::filesystem::ofstream& getStream();
 
             ESM::ESMWriter& getWriter();
 
@@ -50,4 +51,4 @@ namespace CSMDoc
 
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 8a58b7d328..52e7afefd3 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -86,8 +86,11 @@ namespace CSVRender
         }
 
         std::stringstream windowHandle;
+#ifdef WIN32
+        windowHandle << Ogre::StringConverter::toString((unsigned long)(this->winId()));
+#else
         windowHandle << this->winId();
-
+#endif
         std::stringstream windowTitle;
         static int count=0;
         windowTitle << ++count;
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index aee5cbeacc..9e959a986d 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -57,7 +57,7 @@ add_openmw_dir (mwworld
     cells localscripts customdata weather inventorystore ptr actionopen actionread
     actionequip timestamp actionalchemy cellstore actionapply actioneat
     esmstore store recordcmp fallback actionrepair actionsoulgem livecellref actiondoor
-    contentloader esmloader omwloader actiontrap cellreflist
+    contentloader esmloader omwloader actiontrap cellreflist projectilemanager
     )
 
 add_openmw_dir (mwclass
@@ -83,6 +83,10 @@ add_openmw_dir (mwbase
 
 # Main executable
 set(BOOST_COMPONENTS system filesystem program_options thread wave)
+if(WIN32)
+    set(BOOST_COMPONENTS ${BOOST_COMPONENTS} locale)
+endif(WIN32)
+
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 
 IF(OGRE_STATIC)
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 03361408cf..820863cb95 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -66,9 +66,13 @@ void OMW::Engine::executeLocalScripts()
 
 bool OMW::Engine::frameStarted (const Ogre::FrameEvent& evt)
 {
-    bool paused = MWBase::Environment::get().getWindowManager()->isGuiMode();
-    MWBase::Environment::get().getWorld()->frameStarted(evt.timeSinceLastFrame, paused);
-    MWBase::Environment::get().getWindowManager ()->frameStarted(evt.timeSinceLastFrame);
+    if (MWBase::Environment::get().getStateManager()->getState()!=
+        MWBase::StateManager::State_NoGame)
+    {
+        bool paused = MWBase::Environment::get().getWindowManager()->isGuiMode();
+        MWBase::Environment::get().getWorld()->frameStarted(evt.timeSinceLastFrame, paused);
+        MWBase::Environment::get().getWindowManager ()->frameStarted(evt.timeSinceLastFrame);
+    }
     return true;
 }
 
@@ -110,8 +114,12 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
 
 
         // update actors
-        MWBase::Environment::get().getMechanicsManager()->update(frametime,
-            paused);
+        if (MWBase::Environment::get().getStateManager()->getState()!=
+            MWBase::StateManager::State_NoGame)
+        {
+            MWBase::Environment::get().getMechanicsManager()->update(frametime,
+                paused);
+        }
 
         if (MWBase::Environment::get().getStateManager()->getState()==
             MWBase::StateManager::State_Running)
@@ -122,16 +130,24 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         }
 
         // update world
-        MWBase::Environment::get().getWorld()->update(frametime, paused);
+        if (MWBase::Environment::get().getStateManager()->getState()!=
+            MWBase::StateManager::State_NoGame)
+        {
+            MWBase::Environment::get().getWorld()->update(frametime, paused);
+        }
 
         // update GUI
-        Ogre::RenderWindow* window = mOgre->getWindow();
-        unsigned int tri, batch;
-        MWBase::Environment::get().getWorld()->getTriangleBatchCount(tri, batch);
-        MWBase::Environment::get().getWindowManager()->wmUpdateFps(window->getLastFPS(), tri, batch);
+        if (MWBase::Environment::get().getStateManager()->getState()!=
+            MWBase::StateManager::State_NoGame)
+        {
+            Ogre::RenderWindow* window = mOgre->getWindow();
+            unsigned int tri, batch;
+            MWBase::Environment::get().getWorld()->getTriangleBatchCount(tri, batch);
+            MWBase::Environment::get().getWindowManager()->wmUpdateFps(window->getLastFPS(), tri, batch);
 
-        MWBase::Environment::get().getWindowManager()->onFrame(frametime);
-        MWBase::Environment::get().getWindowManager()->update();
+            MWBase::Environment::get().getWindowManager()->onFrame(frametime);
+            MWBase::Environment::get().getWindowManager()->update();
+        }
     }
     catch (const std::exception& e)
     {
@@ -220,7 +236,7 @@ void OMW::Engine::addArchive (const std::string& archive) {
 // Set resource dir
 void OMW::Engine::setResourceDir (const boost::filesystem::path& parResDir)
 {
-    mResDir = boost::filesystem::system_complete(parResDir);
+    mResDir = parResDir;
 }
 
 // Set start cell name (only interiors for now)
@@ -364,7 +380,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     // Create the world
     mEnvironment.setWorld( new MWWorld::World (*mOgre, mFileCollections, mContentFiles,
         mResDir, mCfgMgr.getCachePath(), mEncoder, mFallbackMap,
-        mActivationDistanceOverride, mCellName));
+        mActivationDistanceOverride, mCellName, mStartupScript));
     MWBase::Environment::get().getWorld()->setupPlayer();
     input->setPlayer(&mEnvironment.getWorld()->getPlayer());
 
@@ -393,10 +409,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mEnvironment.setJournal (new MWDialogue::Journal);
     mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mVerboseScripts, mTranslationDataStorage));
 
-    mEnvironment.getWorld()->renderPlayer();
-    mechanics->buildPlayer();
-    window->updatePlayer();
-
     mOgre->getRoot()->addFrameListener (this);
 
     // scripts
@@ -450,10 +462,9 @@ void OMW::Engine::go()
         catch (...) {}
     }
     else
+    {
         MWBase::Environment::get().getStateManager()->newGame (true);
-
-    if (!mStartupScript.empty())
-        MWBase::Environment::get().getWindowManager()->executeInConsole (mStartupScript);
+    }
 
     // Start the main rendering loop
     while (!mEnvironment.get().getStateManager()->hasQuitRequest())
@@ -481,11 +492,11 @@ void OMW::Engine::activate()
     MWScript::InterpreterContext interpreterContext (&ptr.getRefData().getLocals(), ptr);
 
     boost::shared_ptr<MWWorld::Action> action =
-        MWWorld::Class::get (ptr).activate (ptr, MWBase::Environment::get().getWorld()->getPlayerPtr());
+        ptr.getClass().activate (ptr, MWBase::Environment::get().getWorld()->getPlayerPtr());
 
     interpreterContext.activate (ptr, action);
 
-    std::string script = MWWorld::Class::get (ptr).getScript (ptr);
+    std::string script = ptr.getClass().getScript (ptr);
 
     MWBase::Environment::get().getWorld()->breakInvisibility(MWBase::Environment::get().getWorld()->getPlayerPtr());
 
diff --git a/apps/openmw/mwbase/journal.hpp b/apps/openmw/mwbase/journal.hpp
index 7f06320aad..a49ebb9bc4 100644
--- a/apps/openmw/mwbase/journal.hpp
+++ b/apps/openmw/mwbase/journal.hpp
@@ -37,7 +37,7 @@ namespace MWBase
 
             typedef std::deque<MWDialogue::StampedJournalEntry> TEntryContainer;
             typedef TEntryContainer::const_iterator TEntryIter;
-            typedef std::map<std::string, MWDialogue::Quest> TQuestContainer; // topc, quest
+            typedef std::map<std::string, MWDialogue::Quest> TQuestContainer; // topic, quest
             typedef TQuestContainer::const_iterator TQuestIter;
             typedef std::map<std::string, MWDialogue::Topic> TTopicContainer; // topic-id, topic-content
             typedef TTopicContainer::const_iterator TTopicIter;
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index f3973153a2..15739730ba 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -110,18 +110,25 @@ namespace MWBase
             ///< Play a sound, independently of 3D-position
             ///< @param offset Value from [0,1] meaning from which fraction the sound the playback starts.
 
-            virtual SoundPtr playSound3D(const MWWorld::Ptr &reference, const std::string& soundId,
-                                         float volume, float pitch, PlayType type=Play_TypeSfx,
-                                         PlayMode mode=Play_Normal, float offset=0) = 0;
-            ///< Play a sound from an object
+            virtual MWBase::SoundPtr playSound3D(const MWWorld::Ptr &reference, const std::string& soundId,
+                                                 float volume, float pitch, PlayType type=Play_TypeSfx,
+                                                 PlayMode mode=Play_Normal, float offset=0) = 0;
+            ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless Play_NoTrack is specified.
             ///< @param offset Value from [0,1] meaning from which fraction the sound the playback starts.
 
+            virtual MWBase::SoundPtr playManualSound3D(const Ogre::Vector3& initialPos, const std::string& soundId,
+                                                             float volume, float pitch, PlayType type, PlayMode mode, float offset=0) = 0;
+            ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated manually using Sound::setPosition.
+
             virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId) = 0;
             ///< Stop the given object from playing the given sound,
 
             virtual void stopSound3D(const MWWorld::Ptr &reference) = 0;
             ///< Stop the given object from playing all sounds.
 
+            virtual void stopSound(MWBase::SoundPtr sound) = 0;
+            ///< Stop the given sound handle
+
             virtual void stopSound(const MWWorld::CellStore *cell) = 0;
             ///< Stop all sounds for the given cell.
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 39cfc47eda..44ebed3e98 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -193,9 +193,9 @@ namespace MWBase
             virtual void setDragDrop(bool dragDrop) = 0;
             virtual bool getWorldMouseOver() = 0;
 
-            virtual void toggleFogOfWar() = 0;
+            virtual bool toggleFogOfWar() = 0;
 
-            virtual void toggleFullHelp() = 0;
+            virtual bool toggleFullHelp() = 0;
             ///< show extra info in item tooltips (owner, script)
 
             virtual bool getFullHelp() const = 0;
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 0459d5341b..81bec6fe86 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -126,7 +126,7 @@ namespace MWBase
 
             virtual void setWaterHeight(const float height) = 0;
 
-            virtual void toggleWater() = 0;
+            virtual bool toggleWater() = 0;
 
             virtual void adjustSky() = 0;
 
@@ -255,7 +255,8 @@ namespace MWBase
             virtual void changeToExteriorCell (const ESM::Position& position) = 0;
             ///< Move to exterior cell.
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position) = 0;
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange=true) = 0;
+            ///< @param detectWorldSpaceChange if true, clean up worldspace-specific data when the world space changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const = 0;
             ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
@@ -354,15 +355,14 @@ namespace MWBase
 
             virtual void update (float duration, bool paused) = 0;
 
-            virtual bool placeObject (const MWWorld::Ptr& object, float cursorX, float cursorY, int amount) = 0;
+            virtual MWWorld::Ptr placeObject (const MWWorld::Ptr& object, float cursorX, float cursorY, int amount) = 0;
             ///< copy and place an object into the gameworld at the specified cursor position
             /// @param object
             /// @param cursor X (relative 0-1)
             /// @param cursor Y (relative 0-1)
             /// @param number of objects to place
-            /// @return true if the object was placed, or false if it was rejected because the position is too far away
 
-            virtual void dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::Ptr& object, int amount) = 0;
+            virtual MWWorld::Ptr dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::Ptr& object, int amount) = 0;
             ///< copy and place an object into the gameworld at the given actor's position
             /// @param actor giving the dropped object position
             /// @param object
@@ -468,7 +468,8 @@ namespace MWBase
 
             virtual void castSpell (const MWWorld::Ptr& actor) = 0;
 
-            virtual void launchMagicBolt (const std::string& id, bool stack, const ESM::EffectList& effects,
+            virtual void launchMagicBolt (const std::string& model, const std::string& sound, const std::string& spellId,
+                                          float speed, bool stack, const ESM::EffectList& effects,
                                            const MWWorld::Ptr& actor, const std::string& sourceName) = 0;
             virtual void launchProjectile (MWWorld::Ptr actor, MWWorld::Ptr projectile,
                                            const Ogre::Vector3& worldPos, const Ogre::Quaternion& orient, MWWorld::Ptr bow, float speed) = 0;
@@ -514,7 +515,7 @@ namespace MWBase
             /// Spawn a blood effect for \a ptr at \a worldPosition
             virtual void spawnBloodEffect (const MWWorld::Ptr& ptr, const Ogre::Vector3& worldPosition) = 0;
 
-            virtual void explodeSpell (const Ogre::Vector3& origin, const MWWorld::Ptr& object, const ESM::EffectList& effects,
+            virtual void explodeSpell (const Ogre::Vector3& origin, const ESM::EffectList& effects,
                                        const MWWorld::Ptr& caster, const std::string& id, const std::string& sourceName) = 0;
     };
 }
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 16ab6321d5..fe9368b446 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -108,7 +108,7 @@ namespace MWClass
 
     boost::shared_ptr<MWWorld::Action> Activator::activate(const MWWorld::Ptr &ptr, const MWWorld::Ptr &actor) const
     {
-        if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
+        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfActivator");
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 550151e43b..26d1cab6d2 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -295,7 +295,7 @@ namespace MWClass
             return std::make_pair(0, "#{sInventoryMessage1}");
 
         // slots that this item can be equipped in
-        std::pair<std::vector<int>, bool> slots_ = MWWorld::Class::get(ptr).getEquipmentSlots(ptr);
+        std::pair<std::vector<int>, bool> slots_ = ptr.getClass().getEquipmentSlots(ptr);
 
         if (slots_.first.empty())
             return std::make_pair(0, "");
diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp
index ebc3b18e6f..183d91ca1f 100644
--- a/apps/openmw/mwclass/book.cpp
+++ b/apps/openmw/mwclass/book.cpp
@@ -61,7 +61,7 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Book::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
+        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem");
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index 18a40d5d30..a174f69a77 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -233,7 +233,7 @@ namespace MWClass
     std::pair<int, std::string> Clothing::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
     {
         // slots that this item can be equipped in
-        std::pair<std::vector<int>, bool> slots_ = MWWorld::Class::get(ptr).getEquipmentSlots(ptr);
+        std::pair<std::vector<int>, bool> slots_ = ptr.getClass().getEquipmentSlots(ptr);
 
         if (slots_.first.empty())
             return std::make_pair(0, "");
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index be76bd0b41..62734c03de 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -60,6 +60,24 @@ namespace MWClass
         }
     }
 
+    void Container::respawn(const MWWorld::Ptr &ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Container> *ref =
+            ptr.get<ESM::Container>();
+        if (ref->mBase->mFlags & ESM::Container::Respawn)
+        {
+            ptr.getRefData().setCustomData(NULL);
+        }
+    }
+
+    void Container::restock(const MWWorld::Ptr& ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
+        const ESM::InventoryList& list = ref->mBase->mInventory;
+        MWWorld::ContainerStore& store = getContainerStore(ptr);
+        store.restock(list, ptr, ptr.getCellRef().mOwner, ptr.getCellRef().mFaction);
+    }
+
     void Container::insertObjectRendering (const MWWorld::Ptr& ptr, MWRender::RenderingInterface& renderingInterface) const
     {
         const std::string model = getModel(ptr);
@@ -94,7 +112,7 @@ namespace MWClass
         if (!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return boost::shared_ptr<MWWorld::Action> (new MWWorld::NullAction ());
 
-        if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
+        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfContainer");
@@ -109,7 +127,7 @@ namespace MWClass
         const std::string trapActivationSound = "Disarm Trap Fail";
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& invStore = player.getClass().getInventoryStore(player);
 
         bool needKey = ptr.getCellRef().mLockLevel > 0;
         bool hasKey = false;
@@ -125,7 +143,7 @@ namespace MWClass
             if (refId == keyId)
             {
                 hasKey = true;
-                keyName = MWWorld::Class::get(*it).getName(*it);
+                keyName = it->getClass().getName(*it);
             }
         }
 
diff --git a/apps/openmw/mwclass/container.hpp b/apps/openmw/mwclass/container.hpp
index f012d675c8..9fc013e45e 100644
--- a/apps/openmw/mwclass/container.hpp
+++ b/apps/openmw/mwclass/container.hpp
@@ -64,6 +64,10 @@ namespace MWClass
 
             static void registerSelf();
 
+            virtual void respawn (const MWWorld::Ptr& ptr) const;
+
+            virtual void restock (const MWWorld::Ptr &ptr) const;
+
             virtual std::string getModel(const MWWorld::Ptr &ptr) const;
     };
 }
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index dc23b63f3b..7e484f9d48 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -123,9 +123,6 @@ namespace MWClass
             else
                 data->mContainerStore = new MWWorld::ContainerStore();
 
-            // Relates to NPC gold reset delay
-            data->mCreatureStats.setTradeTime(MWWorld::TimeStamp(0.0, 0));
-
             data->mCreatureStats.setGoldPool(ref->mBase->mData.mGold);
 
             // store
@@ -280,7 +277,7 @@ namespace MWClass
 
         if (!weapon.isEmpty())
         {
-            const bool weaphashealth = get(weapon).hasItemHealth(weapon);
+            const bool weaphashealth = weapon.getClass().hasItemHealth(weapon);
             const unsigned char *attack = NULL;
             if(type == ESM::Weapon::AT_Chop)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
@@ -357,7 +354,7 @@ namespace MWClass
         }
 
         if(!object.isEmpty())
-            getCreatureStats(ptr).setLastHitObject(MWWorld::Class::get(object).getId(object));
+            getCreatureStats(ptr).setLastHitObject(object.getClass().getId(object));
 
         if(!attacker.isEmpty() && attacker.getRefData().getHandle() == "player")
         {
@@ -447,7 +444,7 @@ namespace MWClass
     boost::shared_ptr<MWWorld::Action> Creature::activate (const MWWorld::Ptr& ptr,
         const MWWorld::Ptr& actor) const
     {
-        if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
+        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfCreature");
@@ -822,6 +819,34 @@ namespace MWClass
         return ptr.get<ESM::Creature>()->mBase->mData.mGold;
     }
 
+    void Creature::respawn(const MWWorld::Ptr &ptr) const
+    {
+        if (ptr.get<ESM::Creature>()->mBase->mFlags & ESM::Creature::Respawn)
+        {
+            // Note we do not respawn moved references in the cell they were moved to. Instead they are respawned in the original cell.
+            // This also means we cannot respawn dynamically placed references with no content file connection.
+            if (ptr.getCellRef().mRefNum.mContentFile != -1)
+            {
+                if (ptr.getRefData().getCount() == 0)
+                    ptr.getRefData().setCount(1);
+
+                // Reset to original position
+                ESM::Position& pos = ptr.getRefData().getPosition();
+                pos = ptr.getCellRef().mPos;
+
+                ptr.getRefData().setCustomData(NULL);
+            }
+        }
+    }
+
+    void Creature::restock(const MWWorld::Ptr& ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
+        const ESM::InventoryList& list = ref->mBase->mInventory;
+        MWWorld::ContainerStore& store = getContainerStore(ptr);
+        store.restock(list, ptr, ptr.getCellRef().mRefID, ptr.getCellRef().mFaction);
+    }
+
     const ESM::GameSetting* Creature::fMinWalkSpeedCreature;
     const ESM::GameSetting* Creature::fMaxWalkSpeedCreature;
     const ESM::GameSetting *Creature::fEncumberedMoveEffect;
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 04c010c830..30573cd154 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -143,6 +143,10 @@ namespace MWClass
             ///< Write additional state from \a ptr into \a state.
 
             virtual int getBaseGold(const MWWorld::Ptr& ptr) const;
+
+            virtual void respawn (const MWWorld::Ptr& ptr) const;
+
+            virtual void restock (const MWWorld::Ptr &ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index be01b848a3..fea30735c6 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -14,6 +14,7 @@ namespace
     {
         // actorId of the creature we spawned
         int mSpawnActorId;
+        bool mSpawn; // Should a new creature be spawned?
 
         virtual MWWorld::CustomData *clone() const;
     };
@@ -31,6 +32,14 @@ namespace MWClass
         return "";
     }
 
+    void CreatureLevList::respawn(const MWWorld::Ptr &ptr) const
+    {
+        ensureCustomData(ptr);
+
+        CreatureLevListCustomData& customData = dynamic_cast<CreatureLevListCustomData&> (*ptr.getRefData().getCustomData());
+        customData.mSpawn = true;
+    }
+
     void CreatureLevList::registerSelf()
     {
         boost::shared_ptr<Class> instance (new CreatureLevList);
@@ -43,9 +52,8 @@ namespace MWClass
         ensureCustomData(ptr);
 
         CreatureLevListCustomData& customData = dynamic_cast<CreatureLevListCustomData&> (*ptr.getRefData().getCustomData());
-        if (customData.mSpawnActorId != -1)
-            return;  // TODO: handle respawning
-
+        if (!customData.mSpawn)
+            return;
 
         MWWorld::LiveCellRef<ESM::CreatureLevList> *ref =
             ptr.get<ESM::CreatureLevList>();
@@ -54,11 +62,21 @@ namespace MWClass
 
         if (!id.empty())
         {
+            // Delete the previous creature
+            if (customData.mSpawnActorId != -1)
+            {
+                MWWorld::Ptr creature = MWBase::Environment::get().getWorld()->searchPtrViaActorId(customData.mSpawnActorId);
+                if (!creature.isEmpty())
+                    MWBase::Environment::get().getWorld()->deleteObject(creature);
+                customData.mSpawnActorId = -1;
+            }
+
             const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
             MWWorld::ManualRef ref(store, id);
             ref.getPtr().getCellRef().mPos = ptr.getCellRef().mPos;
             MWWorld::Ptr placed = MWBase::Environment::get().getWorld()->safePlaceObject(ref.getPtr(), ptr.getCell() , ptr.getCellRef().mPos);
             customData.mSpawnActorId = placed.getClass().getCreatureStats(placed).getActorId();
+            customData.mSpawn = false;
         }
     }
 
@@ -68,6 +86,7 @@ namespace MWClass
         {
             std::auto_ptr<CreatureLevListCustomData> data (new CreatureLevListCustomData);
             data->mSpawnActorId = -1;
+            data->mSpawn = true;
 
             ptr.getRefData().setCustomData(data.release());
         }
@@ -81,6 +100,7 @@ namespace MWClass
         ensureCustomData(ptr);
         CreatureLevListCustomData& customData = dynamic_cast<CreatureLevListCustomData&> (*ptr.getRefData().getCustomData());
         customData.mSpawnActorId = state2.mSpawnActorId;
+        customData.mSpawn = state2.mSpawn;
     }
 
     void CreatureLevList::writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state)
@@ -91,5 +111,6 @@ namespace MWClass
         ensureCustomData(ptr);
         CreatureLevListCustomData& customData = dynamic_cast<CreatureLevListCustomData&> (*ptr.getRefData().getCustomData());
         state2.mSpawnActorId = customData.mSpawnActorId;
+        state2.mSpawn = customData.mSpawn;
     }
 }
diff --git a/apps/openmw/mwclass/creaturelevlist.hpp b/apps/openmw/mwclass/creaturelevlist.hpp
index b67fb5523f..6c51a31891 100644
--- a/apps/openmw/mwclass/creaturelevlist.hpp
+++ b/apps/openmw/mwclass/creaturelevlist.hpp
@@ -27,6 +27,8 @@ namespace MWClass
             virtual void writeAdditionalState (const MWWorld::Ptr& ptr, ESM::ObjectState& state)
                 const;
             ///< Write additional state from \a ptr into \a state.
+
+            virtual void respawn (const MWWorld::Ptr& ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 06f0619cec..27903c4103 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -99,7 +99,7 @@ namespace MWClass
         const std::string lockedSound = "LockedDoor";
         const std::string trapActivationSound = "Disarm Trap Fail";
 
-        MWWorld::ContainerStore &invStore = get(actor).getContainerStore(actor);
+        MWWorld::ContainerStore &invStore = actor.getClass().getContainerStore(actor);
 
         bool needKey = ptr.getCellRef().mLockLevel > 0;
         bool hasKey = false;
@@ -115,7 +115,7 @@ namespace MWClass
             if (refId == keyId)
             {
                 hasKey = true;
-                keyName = get(*it).getName(*it);
+                keyName = it->getClass().getName(*it);
             }
         }
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index e15424c388..ebe41bb537 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -153,7 +153,7 @@ namespace MWClass
         }
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats (player);
         int alchemySkill = npcStats.getSkill (ESM::Skill::Alchemy).getBase();
 
         static const float fWortChanceValue =
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index bd25b66b2c..1b28a84625 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -250,7 +250,7 @@ namespace MWClass
 
     std::pair<int, std::string> Light::canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const
     {
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(npc).getInventoryStore(npc);
+        MWWorld::InventoryStore& invStore = npc.getClass().getInventoryStore(npc);
         MWWorld::ContainerStoreIterator weapon = invStore.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
 
         if(weapon == invStore.end())
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 845fffbc0d..bca7708eab 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -484,10 +484,10 @@ namespace MWClass
         if(victim.isEmpty()) // Didn't hit anything
             return;
 
-        const MWWorld::Class &othercls = MWWorld::Class::get(victim);
+        const MWWorld::Class &othercls = victim.getClass();
         if(!othercls.isActor()) // Can't hit non-actors
             return;
-        MWMechanics::CreatureStats &otherstats = victim.getClass().getCreatureStats(victim);
+        MWMechanics::CreatureStats &otherstats = othercls.getCreatureStats(victim);
         if(otherstats.isDead()) // Can't hit dead actors
             return;
 
@@ -496,7 +496,7 @@ namespace MWClass
 
         int weapskill = ESM::Skill::HandToHand;
         if(!weapon.isEmpty())
-            weapskill = get(weapon).getEquipmentSkill(weapon);
+            weapskill = weapon.getClass().getEquipmentSkill(weapon);
 
         float hitchance = MWMechanics::getHitChance(ptr, victim, ptr.getClass().getSkill(ptr, weapskill));
 
@@ -511,7 +511,7 @@ namespace MWClass
         MWMechanics::NpcStats &stats = getNpcStats(ptr);
         if(!weapon.isEmpty())
         {
-            const bool weaphashealth = get(weapon).hasItemHealth(weapon);
+            const bool weaphashealth = weapon.getClass().hasItemHealth(weapon);
             const unsigned char *attack = NULL;
             if(type == ESM::Weapon::AT_Chop)
                 attack = weapon.get<ESM::Weapon>()->mBase->mData.mChop;
@@ -621,7 +621,8 @@ namespace MWClass
 
         // Attacking peaceful NPCs is a crime
         // anything below 80 is considered peaceful (see Actors::updateActor)
-        if (!attacker.isEmpty() && ptr.getClass().getCreatureStats(ptr).getAiSetting(MWMechanics::CreatureStats::AI_Fight).getModified() < 80)
+        if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).isHostile() &&
+                ptr.getClass().getCreatureStats(ptr).getAiSetting(MWMechanics::CreatureStats::AI_Fight).getModified() < 80)
             MWBase::Environment::get().getMechanicsManager()->commitCrime(attacker, ptr, MWBase::MechanicsManager::OT_Assault);
 
         getCreatureStats(ptr).setAttacked(true);
@@ -636,7 +637,7 @@ namespace MWClass
         }
 
         if(!object.isEmpty())
-            getCreatureStats(ptr).setLastHitObject(get(object).getId(object));
+            getCreatureStats(ptr).setLastHitObject(object.getClass().getId(object));
 
         if(!attacker.isEmpty() && attacker.getRefData().getHandle() == "player")
         {
@@ -715,9 +716,9 @@ namespace MWClass
                         inv.unequipItem(armor, ptr);
 
                     if (ptr.getRefData().getHandle() == "player")
-                        skillUsageSucceeded(ptr, get(armor).getEquipmentSkill(armor), 0);
+                        skillUsageSucceeded(ptr, armor.getClass().getEquipmentSkill(armor), 0);
 
-                    switch(get(armor).getEquipmentSkill(armor))
+                    switch(armor.getClass().getEquipmentSkill(armor))
                     {
                         case ESM::Skill::LightArmor:
                             sndMgr->playSound3D(ptr, "Light Armor Hit", 1.0f, 1.0f);
@@ -801,7 +802,7 @@ namespace MWClass
         if(ptr.getRefData().getHandle() == "player")
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionTalk(actor));
 
-        if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
+        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfNPC");
@@ -813,7 +814,7 @@ namespace MWClass
         }
         if(getCreatureStats(ptr).isDead())
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr, true));
-        if(get(ptr).getCreatureStats(ptr).isHostile())
+        if(ptr.getClass().getCreatureStats(ptr).isHostile())
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::FailedAction("#{sActorInCombat}"));
         if(getCreatureStats(actor).getStance(MWMechanics::CreatureStats::Stance_Sneak))
             return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionOpen(ptr)); // stealing
@@ -942,7 +943,7 @@ namespace MWClass
 
         if (fallHeight >= fallDistanceMin)
         {
-            const float acrobaticsSkill = MWWorld::Class::get(ptr).getNpcStats (ptr).getSkill(ESM::Skill::Acrobatics).getModified();
+            const float acrobaticsSkill = ptr.getClass().getNpcStats (ptr).getSkill(ESM::Skill::Acrobatics).getModified();
             const NpcCustomData *npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
             const float jumpSpellBonus = npcdata->mNpcStats.getMagicEffects().get(ESM::MagicEffect::Jump).mMagnitude;
             const float fallAcroBase = gmst.find("fFallAcroBase")->getFloat();
@@ -1106,7 +1107,7 @@ namespace MWClass
             {
                 MWWorld::LiveCellRef<ESM::Armor> *ref = it->get<ESM::Armor>();
 
-                int armorSkillType = MWWorld::Class::get(*it).getEquipmentSkill(*it);
+                int armorSkillType = it->getClass().getEquipmentSkill(*it);
                 int armorSkill = stats.getSkill(armorSkillType).getModified();
 
                 if(ref->mBase->mData.mWeight == 0)
@@ -1176,7 +1177,7 @@ namespace MWClass
                 if(boots == inv.end() || boots->getTypeName() != typeid(ESM::Armor).name())
                     return "FootBareLeft";
 
-                switch(Class::get(*boots).getEquipmentSkill(*boots))
+                switch(boots->getClass().getEquipmentSkill(*boots))
                 {
                     case ESM::Skill::LightArmor:
                         return "FootLightLeft";
@@ -1203,7 +1204,7 @@ namespace MWClass
                 if(boots == inv.end() || boots->getTypeName() != typeid(ESM::Armor).name())
                     return "FootBareRight";
 
-                switch(Class::get(*boots).getEquipmentSkill(*boots))
+                switch(boots->getClass().getEquipmentSkill(*boots))
                 {
                     case ESM::Skill::LightArmor:
                         return "FootLightRight";
@@ -1309,6 +1310,34 @@ namespace MWClass
         return Misc::StringUtils::ciEqual(ptr.get<ESM::NPC>()->mBase->mClass, className);
     }
 
+    void Npc::respawn(const MWWorld::Ptr &ptr) const
+    {
+        if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn)
+        {
+            // Note we do not respawn moved references in the cell they were moved to. Instead they are respawned in the original cell.
+            // This also means we cannot respawn dynamically placed references with no content file connection.
+            if (ptr.getCellRef().mRefNum.mContentFile != -1)
+            {
+                if (ptr.getRefData().getCount() == 0)
+                    ptr.getRefData().setCount(1);
+
+                // Reset to original position
+                ESM::Position& pos = ptr.getRefData().getPosition();
+                pos = ptr.getCellRef().mPos;
+
+                ptr.getRefData().setCustomData(NULL);
+            }
+        }
+    }
+
+    void Npc::restock(const MWWorld::Ptr& ptr) const
+    {
+        MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
+        const ESM::InventoryList& list = ref->mBase->mInventory;
+        MWWorld::ContainerStore& store = getContainerStore(ptr);
+        store.restock(list, ptr, ptr.getCellRef().mRefID, ptr.getCellRef().mFaction);
+    }
+
     const ESM::GameSetting *Npc::fMinWalkSpeed;
     const ESM::GameSetting *Npc::fMaxWalkSpeed;
     const ESM::GameSetting *Npc::fEncumberedMoveEffect;
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 4b9c8988ec..356e358b9d 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -178,6 +178,10 @@ namespace MWClass
             virtual bool canWalk (const MWWorld::Ptr &ptr) const {
                 return true;
             }
+
+            virtual void respawn (const MWWorld::Ptr& ptr) const;
+
+            virtual void restock (const MWWorld::Ptr& ptr) const;
     };
 }
 
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index 216f815cd6..f9d7947a66 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -133,7 +133,7 @@ namespace MWClass
 
         // hide effects the player doesnt know about
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats (player);
         int alchemySkill = npcStats.getSkill (ESM::Skill::Alchemy).getBase();
         int i=0;
         static const float fWortChanceValue =
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index e9b0c8f3cb..146251ca29 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -392,7 +392,7 @@ namespace MWClass
         if (ptr.getCellRef().mCharge == 0)
             return std::make_pair(0, "#{sInventoryMessage1}");
 
-        std::pair<std::vector<int>, bool> slots_ = MWWorld::Class::get(ptr).getEquipmentSlots(ptr);
+        std::pair<std::vector<int>, bool> slots_ = ptr.getClass().getEquipmentSlots(ptr);
 
         if (slots_.first.empty())
             return std::make_pair (0, "");
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 8c425caa01..c7e832e4ab 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -134,13 +134,13 @@ namespace MWDialogue
 
         mActor = actor;
 
-        MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get (actor).getCreatureStats (actor);
+        MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats (actor);
         mTalkedTo = creatureStats.hasTalkedToPlayer();
 
         mActorKnownTopics.clear();
 
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
-        win->startDialogue(actor, MWWorld::Class::get (actor).getName (actor));
+        win->startDialogue(actor, actor.getClass().getName (actor));
 
         //setup the list of topics known by the actor. Topics who are also on the knownTopics list will be added to the GUI
         updateTopics();
@@ -194,7 +194,7 @@ namespace MWDialogue
 
             Compiler::Locals locals;
 
-            std::string actorScript = MWWorld::Class::get (mActor).getScript (mActor);
+            std::string actorScript = mActor.getClass().getScript (mActor);
 
             if (!actorScript.empty())
             {
@@ -286,7 +286,18 @@ namespace MWDialogue
 
             MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
             win->addResponse (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext), title);
-            MWBase::Environment::get().getJournal()->addTopic (topic, info->mId, mActor.getClass().getName(mActor));
+
+            // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
+            // in which case it should not be added to the journal.
+            for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
+                iter!=dialogue.mInfo.end(); ++iter)
+            {
+                if (iter->mId == info->mId)
+                {
+                    MWBase::Environment::get().getJournal()->addTopic (topic, info->mId, mActor.getClass().getName(mActor));
+                    break;
+                }
+            }
 
             executeScript (info->mResultScript);
 
@@ -424,7 +435,7 @@ namespace MWDialogue
         // Apply disposition change to NPC's base disposition
         if (mActor.getClass().isNpc())
         {
-            MWMechanics::NpcStats& npcStats = MWWorld::Class::get(mActor).getNpcStats(mActor);
+            MWMechanics::NpcStats& npcStats = mActor.getClass().getNpcStats(mActor);
             npcStats.setBaseDisposition(npcStats.getBaseDisposition() + mPermanentDispositionChange);
         }
         mPermanentDispositionChange = 0;
@@ -453,7 +464,19 @@ namespace MWDialogue
 
                     MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
                     MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addResponse (Interpreter::fixDefinesDialog(text, interpreterContext));
-                    MWBase::Environment::get().getJournal()->addTopic (mLastTopic, info->mId, mActor.getClass().getName(mActor));
+
+                    // Make sure the returned DialInfo is from the Dialogue we supplied. If could also be from the Info refusal group,
+                    // in which case it should not be added to the journal.
+                    for (ESM::Dialogue::InfoContainer::const_iterator iter = mDialogueMap[mLastTopic].mInfo.begin();
+                        iter!=mDialogueMap[mLastTopic].mInfo.end(); ++iter)
+                    {
+                        if (iter->mId == info->mId)
+                        {
+                            MWBase::Environment::get().getJournal()->addTopic (mLastTopic, info->mId, mActor.getClass().getName(mActor));
+                            break;
+                        }
+                    }
+
                     executeScript (info->mResultScript);
                 }
             }
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index b1c700e315..0678623455 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -25,7 +25,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
     // actor id
     if (!info.mActor.empty())
     {
-        if ( !Misc::StringUtils::ciEqual(info.mActor, MWWorld::Class::get (mActor).getId (mActor)))
+        if ( !Misc::StringUtils::ciEqual(info.mActor, mActor.getClass().getId (mActor)))
             return false;
     }
     else if (isCreature)
@@ -64,7 +64,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
         if (isCreature)
             return false;
 
-        MWMechanics::NpcStats& stats = MWWorld::Class::get (mActor).getNpcStats (mActor);
+        MWMechanics::NpcStats& stats = mActor.getClass().getNpcStats (mActor);
         std::map<std::string, int>::iterator iter = stats.getFactionRanks().find ( Misc::StringUtils::lowerCase (info.mFaction));
 
         if (iter==stats.getFactionRanks().end())
@@ -98,7 +98,7 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
     // check player faction
     if (!info.mPcFaction.empty())
     {
-        MWMechanics::NpcStats& stats = MWWorld::Class::get (player).getNpcStats (player);
+        MWMechanics::NpcStats& stats = player.getClass().getNpcStats (player);
         std::map<std::string,int>::iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (info.mPcFaction));
 
         if(iter==stats.getFactionRanks().end())
@@ -182,7 +182,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
 
         case SelectWrapper::Function_Local:
         {
-            std::string scriptName = MWWorld::Class::get (mActor).getScript (mActor);
+            std::string scriptName = mActor.getClass().getScript (mActor);
 
             if (scriptName.empty())
                 return false; // no script
@@ -220,8 +220,8 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
         {
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-            float ratio = MWWorld::Class::get (player).getCreatureStats (player).getHealth().getCurrent() /
-                MWWorld::Class::get (player).getCreatureStats (player).getHealth().getModified();
+            float ratio = player.getClass().getCreatureStats (player).getHealth().getCurrent() /
+                player.getClass().getCreatureStats (player).getHealth().getModified();
 
             return select.selectCompare (static_cast<int>(ratio*100));
         }
@@ -230,7 +230,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
         {
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-            float value = MWWorld::Class::get (player).getCreatureStats (player).
+            float value = player.getClass().getCreatureStats (player).
                 getDynamic (select.getArgument()).getCurrent();
 
             return select.selectCompare (value);
@@ -238,8 +238,8 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
 
         case SelectWrapper::Function_HealthPercent:
         {
-            float ratio = MWWorld::Class::get (mActor).getCreatureStats (mActor).getHealth().getCurrent() /
-                MWWorld::Class::get (mActor).getCreatureStats (mActor).getHealth().getModified();
+            float ratio = mActor.getClass().getCreatureStats (mActor).getHealth().getCurrent() /
+                mActor.getClass().getCreatureStats (mActor).getHealth().getModified();
 
             return select.selectCompare (ratio);
         }
@@ -262,7 +262,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_Item:
         {
-            MWWorld::ContainerStore& store = MWWorld::Class::get (player).getContainerStore (player);
+            MWWorld::ContainerStore& store = player.getClass().getContainerStore (player);
 
             int sum = 0;
 
@@ -285,29 +285,29 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_AiSetting:
 
-            return MWWorld::Class::get (mActor).getCreatureStats (mActor).getAiSetting (
+            return mActor.getClass().getCreatureStats (mActor).getAiSetting (
                         (MWMechanics::CreatureStats::AiSetting)select.getArgument()).getModified();
 
         case SelectWrapper::Function_PcAttribute:
 
-            return MWWorld::Class::get (player).getCreatureStats (player).
+            return player.getClass().getCreatureStats (player).
                 getAttribute (select.getArgument()).getModified();
 
         case SelectWrapper::Function_PcSkill:
 
-            return static_cast<int> (MWWorld::Class::get (player).
+            return static_cast<int> (player.getClass().
                 getNpcStats (player).getSkill (select.getArgument()).getModified());
 
         case SelectWrapper::Function_FriendlyHit:
         {
-            int hits = MWWorld::Class::get (mActor).getCreatureStats (mActor).getFriendlyHits();
+            int hits = mActor.getClass().getCreatureStats (mActor).getFriendlyHits();
 
             return hits>4 ? 4 : hits;
         }
 
         case SelectWrapper::Function_PcLevel:
 
-            return MWWorld::Class::get (player).getCreatureStats (player).getLevel();
+            return player.getClass().getCreatureStats (player).getLevel();
 
         case SelectWrapper::Function_PcGender:
 
@@ -315,7 +315,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_PcClothingModifier:
         {
-            MWWorld::InventoryStore& store = MWWorld::Class::get (player).getInventoryStore (player);
+            MWWorld::InventoryStore& store = player.getClass().getInventoryStore (player);
 
             int value = 0;
 
@@ -324,7 +324,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
                 MWWorld::ContainerStoreIterator slot = store.getSlot (i);
 
                 if (slot!=store.end())
-                    value += MWWorld::Class::get (*slot).getValue (*slot);
+                    value += slot->getClass().getValue (*slot);
             }
 
             return value;
@@ -332,15 +332,15 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_PcCrimeLevel:
 
-            return MWWorld::Class::get (player).getNpcStats (player).getBounty();
+            return player.getClass().getNpcStats (player).getBounty();
 
         case SelectWrapper::Function_RankRequirement:
         {
-            if (MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().empty())
+            if (mActor.getClass().getNpcStats (mActor).getFactionRanks().empty())
                 return 0;
 
             std::string faction =
-                MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().begin()->first;
+                mActor.getClass().getNpcStats (mActor).getFactionRanks().begin()->first;
 
             int rank = getFactionRank (player, faction);
 
@@ -360,11 +360,11 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_Level:
 
-            return MWWorld::Class::get (mActor).getCreatureStats (mActor).getLevel();
+            return mActor.getClass().getCreatureStats (mActor).getLevel();
 
         case SelectWrapper::Function_PCReputation:
 
-            return MWWorld::Class::get (player).getNpcStats (player).getReputation();
+            return player.getClass().getNpcStats (player).getReputation();
 
         case SelectWrapper::Function_Weather:
 
@@ -372,15 +372,15 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_Reputation:
 
-            return MWWorld::Class::get (mActor).getNpcStats (mActor).getReputation();
+            return mActor.getClass().getNpcStats (mActor).getReputation();
 
         case SelectWrapper::Function_FactionRankDiff:
         {
-            if (MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().empty())
+            if (mActor.getClass().getNpcStats (mActor).getFactionRanks().empty())
                 return 0;
 
             std::pair<std::string, int> faction =
-                *MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().begin();
+                *mActor.getClass().getNpcStats (mActor).getFactionRanks().begin();
 
             int rank = getFactionRank (player, faction.first);
 
@@ -389,25 +389,25 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
 
         case SelectWrapper::Function_WerewolfKills:
 
-            return MWWorld::Class::get (player).getNpcStats (player).getWerewolfKills();
+            return player.getClass().getNpcStats (player).getWerewolfKills();
 
         case SelectWrapper::Function_RankLow:
         case SelectWrapper::Function_RankHigh:
         {
             bool low = select.getFunction()==SelectWrapper::Function_RankLow;
 
-            if (MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().empty())
+            if (mActor.getClass().getNpcStats (mActor).getFactionRanks().empty())
                 return 0;
 
             std::string factionId =
-                MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().begin()->first;
+                mActor.getClass().getNpcStats (mActor).getFactionRanks().begin()->first;
 
             int value = 0;
 
             const ESM::Faction& faction =
                 *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find (factionId);
 
-            MWMechanics::NpcStats& playerStats = MWWorld::Class::get (player).getNpcStats (player);
+            MWMechanics::NpcStats& playerStats = player.getClass().getNpcStats (player);
 
             for (std::vector<ESM::Faction::Reaction>::const_iterator iter (faction.mReactions.begin());
                 iter!=faction.mReactions.end(); ++iter)
@@ -436,7 +436,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_NotId:
 
-            return !Misc::StringUtils::ciEqual(MWWorld::Class::get (mActor).getId (mActor), select.getName());
+            return !Misc::StringUtils::ciEqual(mActor.getClass().getId (mActor), select.getName());
 
         case SelectWrapper::Function_NotFaction:
 
@@ -456,7 +456,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_NotLocal:
         {
-            std::string scriptName = MWWorld::Class::get (mActor).getScript (mActor);
+            std::string scriptName = mActor.getClass().getScript (mActor);
 
             if (scriptName.empty())
                 // This actor has no attached script, so there is no local variable
@@ -489,36 +489,36 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_SameFaction:
 
-            return MWWorld::Class::get (mActor).getNpcStats (mActor).isSameFaction (
-                MWWorld::Class::get (player).getNpcStats (player));
+            return mActor.getClass().getNpcStats (mActor).isSameFaction (
+                player.getClass().getNpcStats (player));
 
         case SelectWrapper::Function_PcCommonDisease:
 
-            return MWWorld::Class::get (player).getCreatureStats (player).hasCommonDisease();
+            return player.getClass().getCreatureStats (player).hasCommonDisease();
 
         case SelectWrapper::Function_PcBlightDisease:
 
-            return MWWorld::Class::get (player).getCreatureStats (player).hasBlightDisease();
+            return player.getClass().getCreatureStats (player).hasBlightDisease();
 
         case SelectWrapper::Function_PcCorprus:
 
-            return MWWorld::Class::get (player).getCreatureStats (player).
+            return player.getClass().getCreatureStats (player).
                 getMagicEffects().get (ESM::MagicEffect::Corprus).mMagnitude!=0;
 
         case SelectWrapper::Function_PcExpelled:
         {
-            if (MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().empty())
+            if (mActor.getClass().getNpcStats (mActor).getFactionRanks().empty())
                 return false;
 
             std::string faction =
-                MWWorld::Class::get (mActor).getNpcStats (mActor).getFactionRanks().begin()->first;
+                mActor.getClass().getNpcStats (mActor).getFactionRanks().begin()->first;
 
             return player.getClass().getNpcStats(player).getExpelled(faction);
         }
 
         case SelectWrapper::Function_PcVampire:
 
-            return MWWorld::Class::get (player).getCreatureStats(player).getMagicEffects().
+            return player.getClass().getCreatureStats(player).getMagicEffects().
                     get(ESM::MagicEffect::Vampirism).mMagnitude > 0;
 
         case SelectWrapper::Function_TalkedToPc:
@@ -527,7 +527,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Alarmed:
 
-            return MWWorld::Class::get (mActor).getCreatureStats (mActor).isAlarmed();
+            return mActor.getClass().getCreatureStats (mActor).isAlarmed();
 
         case SelectWrapper::Function_Detected:
 
@@ -535,11 +535,11 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Attacked:
 
-            return MWWorld::Class::get (mActor).getCreatureStats (mActor).getAttacked();
+            return mActor.getClass().getCreatureStats (mActor).getAttacked();
 
         case SelectWrapper::Function_ShouldAttack:
 
-            return MWWorld::Class::get (mActor).getCreatureStats (mActor).isHostile();
+            return mActor.getClass().getCreatureStats (mActor).isHostile();
 
         case SelectWrapper::Function_CreatureTargetted:
 
@@ -547,7 +547,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Werewolf:
 
-            return MWWorld::Class::get (mActor).getNpcStats (mActor).isWerewolf();
+            return mActor.getClass().getNpcStats (mActor).isWerewolf();
 
         default:
 
@@ -557,7 +557,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
 int MWDialogue::Filter::getFactionRank (const MWWorld::Ptr& actor, const std::string& factionId) const
 {
-    MWMechanics::NpcStats& stats = MWWorld::Class::get (actor).getNpcStats (actor);
+    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats (actor);
 
     std::map<std::string, int>::const_iterator iter = stats.getFactionRanks().find (factionId);
 
@@ -573,13 +573,13 @@ bool MWDialogue::Filter::hasFactionRankSkillRequirements (const MWWorld::Ptr& ac
     if (rank<0 || rank>=10)
         throw std::runtime_error ("rank index out of range");
 
-    if (!MWWorld::Class::get (actor).getNpcStats (actor).hasSkillsForRank (factionId, rank))
+    if (!actor.getClass().getNpcStats (actor).hasSkillsForRank (factionId, rank))
         return false;
 
     const ESM::Faction& faction =
         *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find (factionId);
 
-    MWMechanics::CreatureStats& stats = MWWorld::Class::get (actor).getCreatureStats (actor);
+    MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats (actor);
 
     return stats.getAttribute (faction.mData.mAttribute[0]).getBase()>=faction.mData.mRankData[rank].mAttribute1 &&
         stats.getAttribute (faction.mData.mAttribute[1]).getBase()>=faction.mData.mRankData[rank].mAttribute2;
@@ -591,7 +591,7 @@ bool MWDialogue::Filter::hasFactionRankReputationRequirements (const MWWorld::Pt
     if (rank<0 || rank>=10)
         throw std::runtime_error ("rank index out of range");
 
-    MWMechanics::NpcStats& stats = MWWorld::Class::get (actor).getNpcStats (actor);
+    MWMechanics::NpcStats& stats = actor.getClass().getNpcStats (actor);
 
     const ESM::Faction& faction =
         *MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find (factionId);
@@ -621,7 +621,7 @@ std::vector<const ESM::DialInfo *> MWDialogue::Filter::list (const ESM::Dialogue
     bool infoRefusal = false;
 
     // Iterate over topic responses to find a matching one
-    for (std::vector<ESM::DialInfo>::const_iterator iter = dialogue.mInfo.begin();
+    for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
         iter!=dialogue.mInfo.end(); ++iter)
     {
         if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
@@ -646,7 +646,7 @@ std::vector<const ESM::DialInfo *> MWDialogue::Filter::list (const ESM::Dialogue
 
         const ESM::Dialogue& infoRefusalDialogue = *dialogues.find ("Info Refusal");
 
-        for (std::vector<ESM::DialInfo>::const_iterator iter = infoRefusalDialogue.mInfo.begin();
+        for (ESM::Dialogue::InfoContainer::const_iterator iter = infoRefusalDialogue.mInfo.begin();
             iter!=infoRefusalDialogue.mInfo.end(); ++iter)
             if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter) && testDisposition(*iter, invertDisposition)) {
                 infos.push_back(&*iter);
@@ -660,7 +660,7 @@ std::vector<const ESM::DialInfo *> MWDialogue::Filter::list (const ESM::Dialogue
 
 bool MWDialogue::Filter::responseAvailable (const ESM::Dialogue& dialogue) const
 {
-    for (std::vector<ESM::DialInfo>::const_iterator iter = dialogue.mInfo.begin();
+    for (ESM::Dialogue::InfoContainer::const_iterator iter = dialogue.mInfo.begin();
         iter!=dialogue.mInfo.end(); ++iter)
     {
         if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
diff --git a/apps/openmw/mwdialogue/filter.hpp b/apps/openmw/mwdialogue/filter.hpp
index 5c6d092ad9..7e7f2b6f54 100644
--- a/apps/openmw/mwdialogue/filter.hpp
+++ b/apps/openmw/mwdialogue/filter.hpp
@@ -55,6 +55,7 @@ namespace MWDialogue
 
             std::vector<const ESM::DialInfo *> list (const ESM::Dialogue& dialogue,
                 bool fallbackToInfoRefusal, bool searchAll, bool invertDisposition=false) const;
+            ///< \note If fallbackToInfoRefusal is used, the returned DialInfo might not be from the supplied ESM::Dialogue.
 
             const ESM::DialInfo* search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const;
             ///< Get a matching response for the requested dialogue.
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 9463e4c45b..55574bf3eb 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -20,7 +20,7 @@ namespace MWDialogue
         const ESM::Dialogue *dialogue =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (topic);
 
-        for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
+        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->mId == mInfoId)
             {
@@ -73,7 +73,7 @@ namespace MWDialogue
         const ESM::Dialogue *dialogue =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (topic);
 
-        for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
+        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->mData.mDisposition==index) /// \todo cleanup info structure
             {
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 724d531cfb..04aa0534dd 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -56,7 +56,7 @@ namespace MWDialogue
             if (infoId.empty())
                 return true;
 
-            for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
+            for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
                 iter!=dialogue->mInfo.end(); ++iter)
                 if (iter->mId == infoId)
                     return true;
diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index a5411b7479..a699286a15 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -27,7 +27,7 @@ namespace MWDialogue
         const ESM::Dialogue *dialogue =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (mTopic);
 
-        for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
+        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->mQuestStatus==ESM::DialInfo::QS_Name)
                 return iter->mResponse;
@@ -45,8 +45,7 @@ namespace MWDialogue
         const ESM::Dialogue *dialogue =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (mTopic);
 
-        bool found=false;
-        for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
+        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->mData.mDisposition==index && iter->mQuestStatus!=ESM::DialInfo::QS_Name)
             {
@@ -54,15 +53,10 @@ namespace MWDialogue
                     mFinished = true;
                 else if (iter->mQuestStatus==ESM::DialInfo::QS_Restart)
                     mFinished = false;
-
-                found = true;
-                // Don't return here. Quest status may actually be in a different info record, since we don't merge these (yet?)
             }
 
-        if (found)
-            mIndex = index;
-        else
-            throw std::runtime_error ("unknown journal index for topic " + mTopic);
+        // The index must be set even if no related journal entry was found
+        mIndex = index;
     }
 
     bool Quest::isFinished() const
@@ -77,7 +71,7 @@ namespace MWDialogue
         const ESM::Dialogue *dialogue =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>().find (entry.mTopic);
 
-        for (std::vector<ESM::DialInfo>::const_iterator iter (dialogue->mInfo.begin());
+        for (ESM::Dialogue::InfoContainer::const_iterator iter (dialogue->mInfo.begin());
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->mId == entry.mInfoId)
             {
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index a6880ffcb5..6524c168e1 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -19,7 +19,7 @@ namespace
     std::string getIconPath(MWWorld::Ptr ptr)
     {
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(ptr).getInventoryIcon(ptr);
+        path += ptr.getClass().getInventoryIcon(ptr);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
@@ -174,7 +174,7 @@ namespace MWGui
         {
             update();
 
-            std::string sound = MWWorld::Class::get(item).getUpSoundId(item);
+            std::string sound = item.getClass().getUpSoundId(item);
             MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
         }
     }
diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp
index 4f41a6756f..2cebc8e194 100644
--- a/apps/openmw/mwgui/bookpage.cpp
+++ b/apps/openmw/mwgui/bookpage.cpp
@@ -93,7 +93,10 @@ struct TypesetBookImpl : TypesetBook
 
     typedef std::vector <Section> Sections;
 
+    // Holds "top" and "bottom" vertical coordinates in the source text.
+    // A page is basically a "window" into a portion of the source text, similar to a ScrollView.
     typedef std::pair <int, int> Page;
+
     typedef std::vector <Page> Pages;
 
     Pages mPages;
@@ -374,6 +377,29 @@ struct TypesetBookImpl::Typesetter : BookTypesetter
             else
             {
                 //split section
+                int sectionHeightLeft = sectionHeight;
+                while (sectionHeightLeft > mPageHeight)
+                {
+                    spaceLeft = mPageHeight - (curPageStop - curPageStart);
+
+                    // Adjust to the top of the first line that does not fit on the current page anymore
+                    int splitPos = curPageStop;
+                    for (Lines::iterator j = i->mLines.begin (); j != i->mLines.end (); ++j)
+                    {
+                        if (j->mRect.bottom > curPageStart + mPageHeight)
+                        {
+                            splitPos = j->mRect.top;
+                            break;
+                        }
+                    }
+
+                    mBook->mPages.push_back (Page (curPageStart, splitPos));
+                    curPageStart = splitPos;
+                    curPageStop = splitPos;
+
+                    sectionHeightLeft = (i->mRect.bottom - splitPos);
+                }
+                curPageStop = i->mRect.bottom;
             }
         }
 
diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index fa1bd28be2..85f57a1a8c 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -47,7 +47,7 @@ namespace
     void updatePlayerHealth()
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(player).getNpcStats(player);
+        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats(player);
         npcStats.updateHealth();
     }
 }
@@ -220,7 +220,7 @@ namespace MWGui
 
                 {
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                    const MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+                    const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
                     mReviewDialog->setHealth ( stats.getHealth()  );
                     mReviewDialog->setMagicka( stats.getMagicka() );
diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index a0a34108eb..70093049da 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -61,7 +61,7 @@ void CompanionWindow::onItemSelected(int index)
     if (count > 1 && !shift)
     {
         CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
-        dialog->open(MWWorld::Class::get(object).getName(object), "#{sTake}", count);
+        dialog->open(object.getClass().getName(object), "#{sTake}", count);
         dialog->eventOkClicked.clear();
         dialog->eventOkClicked += MyGUI::newDelegate(this, &CompanionWindow::dragItem);
     }
@@ -92,7 +92,7 @@ void CompanionWindow::open(const MWWorld::Ptr& npc)
     mSortModel = new SortFilterItemModel(mModel);
     mItemView->setModel(mSortModel);
 
-    setTitle(MWWorld::Class::get(npc).getName(npc));
+    setTitle(npc.getClass().getName(npc));
 }
 
 void CompanionWindow::onFrame()
@@ -104,22 +104,22 @@ void CompanionWindow::updateEncumbranceBar()
 {
     if (mPtr.isEmpty())
         return;
-    float capacity = MWWorld::Class::get(mPtr).getCapacity(mPtr);
-    float encumbrance = MWWorld::Class::get(mPtr).getEncumbrance(mPtr);
+    float capacity = mPtr.getClass().getCapacity(mPtr);
+    float encumbrance = mPtr.getClass().getEncumbrance(mPtr);
     mEncumbranceBar->setValue(encumbrance, capacity);
 
     if (mPtr.getTypeName() != typeid(ESM::NPC).name())
         mProfitLabel->setCaption("");
     else
     {
-        MWMechanics::NpcStats& stats = MWWorld::Class::get(mPtr).getNpcStats(mPtr);
+        MWMechanics::NpcStats& stats = mPtr.getClass().getNpcStats(mPtr);
         mProfitLabel->setCaptionWithReplacing("#{sProfitValue} " + boost::lexical_cast<std::string>(stats.getProfit()));
     }
 }
 
 void CompanionWindow::onCloseButtonClicked(MyGUI::Widget* _sender)
 {
-    if (mPtr.getTypeName() == typeid(ESM::NPC).name() && MWWorld::Class::get(mPtr).getNpcStats(mPtr).getProfit() < 0)
+    if (mPtr.getTypeName() == typeid(ESM::NPC).name() && mPtr.getClass().getNpcStats(mPtr).getProfit() < 0)
     {
         std::vector<std::string> buttons;
         buttons.push_back("#{sCompanionWarningButtonOne}");
@@ -135,8 +135,8 @@ void CompanionWindow::onMessageBoxButtonClicked(int button)
 {
     if (button == 0)
     {
-        mPtr.getRefData().getLocals().setVarByInt(MWWorld::Class::get(mPtr).getScript(mPtr),
-            "minimumProfit", MWWorld::Class::get(mPtr).getNpcStats(mPtr).getProfit());
+        mPtr.getRefData().getLocals().setVarByInt(mPtr.getClass().getScript(mPtr),
+            "minimumProfit", mPtr.getClass().getNpcStats(mPtr).getProfit());
 
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
         MWBase::Environment::get().getDialogueManager()->startDialogue (mPtr);
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index d51d4298f6..237d145a2e 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -1,5 +1,8 @@
 #include "console.hpp"
 
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
 
@@ -194,7 +197,8 @@ namespace MWGui
 
     void Console::executeFile (const std::string& path)
     {
-        std::ifstream stream (path.c_str());
+        namespace bfs = boost::filesystem;
+        bfs::ifstream stream ((bfs::path(path)));
 
         if (!stream.is_open())
             printError ("failed to open file: " + path);
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 5856473388..a207dec0c5 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -37,7 +37,7 @@ namespace MWGui
         mIsOnDragAndDrop = true;
         mDragAndDropWidget->setVisible(true);
 
-        std::string sound = MWWorld::Class::get(mItem.mBase).getUpSoundId(mItem.mBase);
+        std::string sound = mItem.mBase.getClass().getUpSoundId(mItem.mBase);
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
 
         if (mSourceSortModel)
@@ -47,7 +47,7 @@ namespace MWGui
         }
 
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(mItem.mBase).getInventoryIcon(mItem.mBase);
+        path += mItem.mBase.getClass().getInventoryIcon(mItem.mBase);
         MyGUI::ImageBox* baseWidget = mDragAndDropWidget->createWidget<MyGUI::ImageBox>
                 ("ImageBox", MyGUI::IntCoord(0, 0, 42, 42), MyGUI::Align::Default);
         mDraggedWidget = baseWidget;
@@ -76,7 +76,7 @@ namespace MWGui
 
     void DragAndDrop::drop(ItemModel *targetModel, ItemView *targetView)
     {
-        std::string sound = MWWorld::Class::get(mItem.mBase).getDownSoundId(mItem.mBase);
+        std::string sound = mItem.mBase.getClass().getDownSoundId(mItem.mBase);
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
 
         mDragAndDropWidget->setVisible(false);
@@ -91,7 +91,8 @@ namespace MWGui
         mSourceModel->update();
 
         finish();
-        targetView->update();
+        if (targetView)
+            targetView->update();
 
         // We need to update the view since an other item could be auto-equipped.
         mSourceView->update();
@@ -154,7 +155,7 @@ namespace MWGui
         if (count > 1 && !shift)
         {
             CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
-            dialog->open(MWWorld::Class::get(object).getName(object), "#{sTake}", count);
+            dialog->open(object.getClass().getName(object), "#{sTake}", count);
             dialog->eventOkClicked.clear();
             dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
         }
@@ -176,8 +177,8 @@ namespace MWGui
         {
             // check that we don't exceed container capacity
             MWWorld::Ptr item = mDragAndDrop->mItem.mBase;
-            float weight = MWWorld::Class::get(item).getWeight(item) * mDragAndDrop->mDraggedCount;
-            if (MWWorld::Class::get(mPtr).getCapacity(mPtr) < MWWorld::Class::get(mPtr).getEncumbrance(mPtr) + weight)
+            float weight = item.getClass().getWeight(item) * mDragAndDrop->mDraggedCount;
+            if (mPtr.getClass().getCapacity(mPtr) < mPtr.getClass().getEncumbrance(mPtr) + weight)
             {
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sContentsMessage3}");
                 return;
@@ -226,7 +227,7 @@ namespace MWGui
 
         // Careful here. setTitle may cause size updates, causing itemview redraw, so make sure to do it last
         // or we end up using a possibly invalid model.
-        setTitle(MWWorld::Class::get(container).getName(container));
+        setTitle(container.getClass().getName(container));
     }
 
     void ContainerWindow::onKeyPressed(MyGUI::Widget *_sender, MyGUI::KeyCode _key, MyGUI::Char _char)
@@ -283,7 +284,7 @@ namespace MWGui
                 {
                     // play the sound of the first object
                     MWWorld::Ptr item = mModel->getItem(i).mBase;
-                    std::string sound = MWWorld::Class::get(item).getUpSoundId(item);
+                    std::string sound = item.getClass().getUpSoundId(item);
                     MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
                 }
 
@@ -305,7 +306,7 @@ namespace MWGui
         {
             onTakeAllButtonClicked(mTakeButton);
 
-            if (MWWorld::Class::get(mPtr).isPersistent(mPtr))
+            if (mPtr.getClass().isPersistent(mPtr))
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sDisposeCorpseFail}");
             else
                 MWBase::Environment::get().getWorld()->deleteObject(mPtr);
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index b5b498e5e6..b2befc3ba8 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -85,7 +85,7 @@ void ContainerItemModel::removeItem (const ItemStack& item, size_t count)
 
     for (std::vector<MWWorld::Ptr>::iterator source = mItemSources.begin(); source != mItemSources.end(); ++source)
     {
-        MWWorld::ContainerStore& store = MWWorld::Class::get(*source).getContainerStore(*source);
+        MWWorld::ContainerStore& store = source->getClass().getContainerStore(*source);
 
         for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
         {
@@ -120,7 +120,7 @@ void ContainerItemModel::update()
     mItems.clear();
     for (std::vector<MWWorld::Ptr>::iterator source = mItemSources.begin(); source != mItemSources.end(); ++source)
     {
-        MWWorld::ContainerStore& store = MWWorld::Class::get(*source).getContainerStore(*source);
+        MWWorld::ContainerStore& store = source->getClass().getContainerStore(*source);
 
         for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
         {
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 8f1b9f6f39..0002757947 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -363,6 +363,8 @@ namespace MWGui
         mTopicsList->setEnabled(true);
         setTitle(npcName);
 
+        clearChoices();
+
         mTopicsList->clear();
 
         for (std::vector<DialogueText*>::iterator it = mHistoryContents.begin(); it != mHistoryContents.end(); ++it)
@@ -384,8 +386,8 @@ namespace MWGui
         mTopicLinks.clear();
         mKeywordSearch.clear();
 
-        bool isCompanion = !MWWorld::Class::get(mPtr).getScript(mPtr).empty()
-                && mPtr.getRefData().getLocals().getIntVar(MWWorld::Class::get(mPtr).getScript(mPtr), "companion");
+        bool isCompanion = !mPtr.getClass().getScript(mPtr).empty()
+                && mPtr.getRefData().getLocals().getIntVar(mPtr.getClass().getScript(mPtr), "companion");
 
         bool anyService = mServices > 0 || isCompanion || mPtr.getTypeName() == typeid(ESM::NPC).name();
 
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index ada004612a..b303848df5 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -119,7 +119,7 @@ namespace MWGui
 
         MyGUI::ImageBox* image = mSoulBox->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 32, 32), MyGUI::Align::Default);
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(soulgem).getInventoryIcon(soulgem);
+        path += soulgem.getClass().getInventoryIcon(soulgem);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
@@ -164,7 +164,7 @@ namespace MWGui
 
         MyGUI::ImageBox* image = mItemBox->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 32, 32), MyGUI::Align::Default);
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(item).getInventoryIcon(item);
+        path += item.getClass().getInventoryIcon(item);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
@@ -207,7 +207,7 @@ namespace MWGui
 
         MyGUI::ImageBox* image = mSoulBox->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(0, 0, 32, 32), MyGUI::Align::Default);
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(item).getInventoryIcon(item);
+        path += item.getClass().getInventoryIcon(item);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index ccd4489ba8..103c48ca14 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -17,9 +17,47 @@
 #include "itemmodel.hpp"
 #include "container.hpp"
 
+#include "itemmodel.hpp"
+
 namespace MWGui
 {
 
+    /**
+     * Makes it possible to use ItemModel::moveItem to move an item from an inventory to the world.
+     */
+    class WorldItemModel : public ItemModel
+    {
+    public:
+        WorldItemModel(float left, float top) : mLeft(left), mTop(top) {}
+        virtual ~WorldItemModel() {}
+        virtual MWWorld::Ptr copyItem (const ItemStack& item, size_t count, bool setNewOwner=false)
+        {
+            MWBase::World* world = MWBase::Environment::get().getWorld();
+
+            MWWorld::Ptr dropped;
+            if (world->canPlaceObject(mLeft, mTop))
+                dropped = world->placeObject(item.mBase, mLeft, mTop, count);
+            else
+                dropped = world->dropObjectOnGround(world->getPlayerPtr(), item.mBase, count);
+            if (setNewOwner)
+                dropped.getCellRef().mOwner = "";
+
+            return dropped;
+        }
+
+        virtual void removeItem (const ItemStack& item, size_t count) { throw std::runtime_error("removeItem not implemented"); }
+        virtual ModelIndex getIndex (ItemStack item) { throw std::runtime_error("getIndex not implemented"); }
+        virtual void update() {}
+        virtual size_t getItemCount() { return 0; }
+        virtual ItemStack getItem (ModelIndex index) { throw std::runtime_error("getItem not implemented"); }
+
+    private:
+        // Where to drop the item
+        float mLeft;
+        float mTop;
+    };
+
+
     HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
         : Layout("openmw_hud.layout")
         , mHealth(NULL)
@@ -229,10 +267,6 @@ namespace MWGui
         if (mDragAndDrop->mIsOnDragAndDrop)
         {
             // drop item into the gameworld
-            MWWorld::Ptr object = mDragAndDrop->mItem.mBase;
-
-            MWBase::World* world = MWBase::Environment::get().getWorld();
-
             MWBase::Environment::get().getWorld()->breakInvisibility(
                         MWBase::Environment::get().getWorld()->getPlayerPtr());
 
@@ -241,20 +275,10 @@ namespace MWGui
             float mouseX = cursorPosition.left / float(viewSize.width);
             float mouseY = cursorPosition.top / float(viewSize.height);
 
-            if (world->canPlaceObject(mouseX, mouseY))
-                world->placeObject(object, mouseX, mouseY, mDragAndDrop->mDraggedCount);
-            else
-                world->dropObjectOnGround(world->getPlayerPtr(), object, mDragAndDrop->mDraggedCount);
+            WorldItemModel drop (mouseX, mouseY);
+            mDragAndDrop->drop(&drop, NULL);
 
             MWBase::Environment::get().getWindowManager()->changePointer("arrow");
-
-            std::string sound = MWWorld::Class::get(object).getDownSoundId(object);
-            MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
-
-            // remove object from the container it was coming from
-            mDragAndDrop->mSourceModel->removeItem(mDragAndDrop->mItem, mDragAndDrop->mDraggedCount);
-            mDragAndDrop->finish();
-            mDragAndDrop->mSourceModel->update();
         }
         else
         {
@@ -324,7 +348,7 @@ namespace MWGui
     void HUD::onWeaponClicked(MyGUI::Widget* _sender)
     {
         const MWWorld::Ptr& player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        if (MWWorld::Class::get(player).getNpcStats(player).isWerewolf())
+        if (player.getClass().getNpcStats(player).isWerewolf())
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sWerewolfRefusal}");
             return;
@@ -336,7 +360,7 @@ namespace MWGui
     void HUD::onMagicClicked(MyGUI::Widget* _sender)
     {
         const MWWorld::Ptr& player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        if (MWWorld::Class::get(player).getNpcStats(player).isWerewolf())
+        if (player.getClass().getNpcStats(player).isWerewolf())
         {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sWerewolfRefusal}");
             return;
@@ -419,7 +443,7 @@ namespace MWGui
 
     void HUD::setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent)
     {
-        std::string itemName = MWWorld::Class::get(item).getName(item);
+        std::string itemName = item.getClass().getName(item);
         if (itemName != mSpellName && mSpellVisible)
         {
             mWeaponSpellTimer = 5.0f;
@@ -442,7 +466,7 @@ namespace MWGui
             , MyGUI::Align::Stretch);
 
         std::string path = std::string("icons\\");
-        path+=MWWorld::Class::get(item).getInventoryIcon(item);
+        path+=item.getClass().getInventoryIcon(item);
         Widgets::fixTexturePath(path);
         itemBox->setImageTexture(path);
         itemBox->setNeedMouseFocus(false);
@@ -450,7 +474,7 @@ namespace MWGui
 
     void HUD::setSelectedWeapon(const MWWorld::Ptr& item, int durabilityPercent)
     {
-        std::string itemName = MWWorld::Class::get(item).getName(item);
+        std::string itemName = item.getClass().getName(item);
         if (itemName != mWeaponName && mWeaponVisible)
         {
             mWeaponSpellTimer = 5.0f;
@@ -469,10 +493,10 @@ namespace MWGui
             MyGUI::Gui::getInstance().destroyWidget(mWeapImage->getChildAt(0));
 
         std::string path = std::string("icons\\");
-        path+=MWWorld::Class::get(item).getInventoryIcon(item);
+        path+=item.getClass().getInventoryIcon(item);
         Widgets::fixTexturePath(path);
 
-        if (MWWorld::Class::get(item).getEnchantment(item) != "")
+        if (item.getClass().getEnchantment(item) != "")
         {
             mWeapImage->setImageTexture("textures\\menu_icon_magic_mini.dds");
             MyGUI::ImageBox* itemBox = mWeapImage->createWidgetReal<MyGUI::ImageBox>("ImageBox", MyGUI::FloatCoord(0,0,1,1)
@@ -521,7 +545,7 @@ namespace MWGui
 
         MWBase::World *world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
-        if (MWWorld::Class::get(player).getNpcStats(player).isWerewolf())
+        if (player.getClass().getNpcStats(player).isWerewolf())
             mWeapImage->setImageTexture("icons\\k\\tx_werewolf_hand.dds");
         else
             mWeapImage->setImageTexture("icons\\k\\stealth_handtohand.dds");
@@ -604,12 +628,15 @@ namespace MWGui
             effectsDx = (viewSize.width - mMinimapBoxBaseRight) - (viewSize.width - mEffectBoxBaseRight);
 
         mMapVisible = mMinimapBox->getVisible ();
+        if (!mMapVisible)
+            mCellNameBox->setVisible(false);
+
         mEffectBox->setPosition((viewSize.width - mEffectBoxBaseRight) - mEffectBox->getWidth() + effectsDx, mEffectBox->getTop());
     }
 
     void HUD::updateEnemyHealthBar()
     {
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(mEnemy).getCreatureStats(mEnemy);
+        MWMechanics::CreatureStats& stats = mEnemy.getClass().getCreatureStats(mEnemy);
         mEnemyHealth->setProgressRange(100);
         // Health is usually cast to int before displaying. Actors die whenever they are < 1 health.
         // Therefore any value < 1 should show as an empty health bar. We do the same in statswindow :)
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index 718c6d991f..e1bc9d4daa 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -50,7 +50,7 @@ MWWorld::Ptr InventoryItemModel::copyItem (const ItemStack& item, size_t count,
 
 void InventoryItemModel::removeItem (const ItemStack& item, size_t count)
 {
-    MWWorld::ContainerStore& store = MWWorld::Class::get(mActor).getContainerStore(mActor);
+    MWWorld::ContainerStore& store = mActor.getClass().getContainerStore(mActor);
     int removed = store.remove(item.mBase, count, mActor);
 
     if (removed == 0)
@@ -77,7 +77,7 @@ MWWorld::Ptr InventoryItemModel::moveItem(const ItemStack &item, size_t count, I
 
 void InventoryItemModel::update()
 {
-    MWWorld::ContainerStore& store = MWWorld::Class::get(mActor).getContainerStore(mActor);
+    MWWorld::ContainerStore& store = mActor.getClass().getContainerStore(mActor);
 
     mItems.clear();
 
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index 4d52d59bb6..788f90f504 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -162,7 +162,7 @@ namespace MWGui
         }
 
         const ItemStack& item = mTradeModel->getItem(index);
-        std::string sound = MWWorld::Class::get(item.mBase).getDownSoundId(item.mBase);
+        std::string sound = item.mBase.getClass().getDownSoundId(item.mBase);
 
         MWWorld::Ptr object = item.mBase;
         int count = item.mCount;
@@ -176,35 +176,6 @@ namespace MWGui
             return;
         }
 
-        if (item.mType == ItemStack::Type_Equipped)
-        {
-            MWWorld::InventoryStore& invStore = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
-            MWWorld::Ptr newStack = *invStore.unequipItem(item.mBase, mPtr);
-
-            // The unequipped item was re-stacked. We have to update the index
-            // since the item pointed does not exist anymore.
-            if (item.mBase != newStack)
-            {
-                // newIndex will store the index of the ItemStack the item was stacked on
-                int newIndex = -1;
-                for (size_t i=0; i < mTradeModel->getItemCount(); ++i)
-                {
-                    if (mTradeModel->getItem(i).mBase == newStack)
-                    {
-                        newIndex = i;
-                        break;
-                    }
-                }
-
-                if (newIndex == -1)
-                    throw std::runtime_error("Can't find restacked item");
-
-                index = newIndex;
-                object = mTradeModel->getItem(index).mBase;
-            }
-
-        }
-
         bool shift = MyGUI::InputManager::getInstance().isShiftPressed();
         if (MyGUI::InputManager::getInstance().isControlPressed())
             count = 1;
@@ -213,7 +184,7 @@ namespace MWGui
         {
             // check if merchant accepts item
             int services = MWBase::Environment::get().getWindowManager()->getTradeWindow()->getMerchantServices();
-            if (!MWWorld::Class::get(object).canSell(object, services))
+            if (!object.getClass().canSell(object, services))
             {
                 MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
                 MWBase::Environment::get().getWindowManager()->
@@ -226,7 +197,7 @@ namespace MWGui
         {
             CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
             std::string message = mTrading ? "#{sQuanityMenuMessage01}" : "#{sTake}";
-            dialog->open(MWWorld::Class::get(object).getName(object), message, count);
+            dialog->open(object.getClass().getName(object), message, count);
             dialog->eventOkClicked.clear();
             if (mTrading)
                 dialog->eventOkClicked += MyGUI::newDelegate(this, &InventoryWindow::sellItem);
@@ -247,15 +218,48 @@ namespace MWGui
         notifyContentChanged();
     }
 
+    void InventoryWindow::ensureSelectedItemUnequipped()
+    {
+        const ItemStack& item = mTradeModel->getItem(mSelectedItem);
+        if (item.mType == ItemStack::Type_Equipped)
+        {
+            MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
+            MWWorld::Ptr newStack = *invStore.unequipItem(item.mBase, mPtr);
+
+            // The unequipped item was re-stacked. We have to update the index
+            // since the item pointed does not exist anymore.
+            if (item.mBase != newStack)
+            {
+                // newIndex will store the index of the ItemStack the item was stacked on
+                int newIndex = -1;
+                for (size_t i=0; i < mTradeModel->getItemCount(); ++i)
+                {
+                    if (mTradeModel->getItem(i).mBase == newStack)
+                    {
+                        newIndex = i;
+                        break;
+                    }
+                }
+
+                if (newIndex == -1)
+                    throw std::runtime_error("Can't find restacked item");
+
+                mSelectedItem = newIndex;
+            }
+        }
+    }
+
     void InventoryWindow::dragItem(MyGUI::Widget* sender, int count)
     {
+        ensureSelectedItemUnequipped();
         mDragAndDrop->startDrag(mSelectedItem, mSortModel, mTradeModel, mItemView, count);
     }
 
     void InventoryWindow::sellItem(MyGUI::Widget* sender, int count)
     {
+        ensureSelectedItemUnequipped();
         const ItemStack& item = mTradeModel->getItem(mSelectedItem);
-        std::string sound = MWWorld::Class::get(item.mBase).getDownSoundId(item.mBase);
+        std::string sound = item.mBase.getClass().getDownSoundId(item.mBase);
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
 
         if (item.mType == ItemStack::Type_Barter)
@@ -378,7 +382,7 @@ namespace MWGui
 
         if (script.empty() || ptr.getRefData().getLocals().getIntVar(script, "pcskipequip") == 0)
         {
-            boost::shared_ptr<MWWorld::Action> action = MWWorld::Class::get(ptr).use(ptr);
+            boost::shared_ptr<MWWorld::Action> action = ptr.getClass().use(ptr);
 
             action->execute (MWBase::Environment::get().getWorld()->getPlayerPtr());
 
@@ -443,7 +447,7 @@ namespace MWGui
         if (slot == -1)
             return MWWorld::Ptr();
 
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
+        MWWorld::InventoryStore& invStore = mPtr.getClass().getInventoryStore(mPtr);
         if(invStore.getSlot(slot) != invStore.end())
         {
             MWWorld::Ptr item = *invStore.getSlot(slot);
@@ -462,8 +466,8 @@ namespace MWGui
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-        float capacity = MWWorld::Class::get(player).getCapacity(player);
-        float encumbrance = MWWorld::Class::get(player).getEncumbrance(player);
+        float capacity = player.getClass().getCapacity(player);
+        float encumbrance = player.getClass().getEncumbrance(player);
         mEncumbranceBar->setValue(encumbrance, capacity);
     }
 
@@ -494,9 +498,9 @@ namespace MWGui
             mAvatarImage->setImageTile(MyGUI::IntSize(std::min(512, size.width), std::min(1024, size.height)));
 
             mArmorRating->setCaptionWithReplacing ("#{sArmor}: "
-                + boost::lexical_cast<std::string>(static_cast<int>(MWWorld::Class::get(mPtr).getArmorRating(mPtr))));
+                + boost::lexical_cast<std::string>(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
             if (mArmorRating->getTextSize().width > mArmorRating->getSize().width)
-                mArmorRating->setCaptionWithReplacing (boost::lexical_cast<std::string>(static_cast<int>(MWWorld::Class::get(mPtr).getArmorRating(mPtr))));
+                mArmorRating->setCaptionWithReplacing (boost::lexical_cast<std::string>(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
         }
     }
 
@@ -530,7 +534,7 @@ namespace MWGui
             && (type != typeid(ESM::Potion).name()))
             return;
 
-        if (MWWorld::Class::get(object).getName(object) == "") // objects without name presented to user can never be picked up
+        if (object.getClass().getName(object) == "") // objects without name presented to user can never be picked up
             return;
 
         int count = object.getRefData().getCount();
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index 17a25e5027..df563b3d46 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -102,6 +102,9 @@ namespace MWGui
             void notifyContentChanged();
 
             void adjustPanes();
+
+            /// Unequips mSelectedItem, if it is equipped, and then updates mSelectedItem in case it was re-stacked
+            void ensureSelectedItemUnequipped();
     };
 }
 
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 2cdd8a2e66..55317724e3 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -13,7 +13,7 @@ namespace MWGui
         , mType(Type_Normal)
         , mBase(base)
     {
-        if (MWWorld::Class::get(base).getEnchantment(base) != "")
+        if (base.getClass().getEnchantment(base) != "")
             mFlags |= Flag_Enchanted;
     }
 
diff --git a/apps/openmw/mwgui/itemview.cpp b/apps/openmw/mwgui/itemview.cpp
index 027c3201fc..24bc3fd630 100644
--- a/apps/openmw/mwgui/itemview.cpp
+++ b/apps/openmw/mwgui/itemview.cpp
@@ -81,7 +81,7 @@ void ItemView::update()
 
         /// \todo performance improvement: don't create/destroy all the widgets everytime the container window changes size, only reposition them
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(item.mBase).getInventoryIcon(item.mBase);
+        path += item.mBase.getClass().getInventoryIcon(item.mBase);
 
         // background widget (for the "equipped" frame and magic item background image)
         bool isMagic = (item.mFlags & ItemStack::Flag_Enchanted);
diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 5a3fc2855d..38995ac326 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -61,8 +61,8 @@ namespace MWGui
     void LevelupDialog::setAttributeValues()
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get(player).getCreatureStats (player);
-        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::CreatureStats& creatureStats = player.getClass().getCreatureStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
 
         for (int i=0; i<8; ++i)
         {
@@ -117,8 +117,8 @@ namespace MWGui
     {
         MWBase::World *world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
-        MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get(player).getCreatureStats (player);
-        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::CreatureStats& creatureStats = player.getClass().getCreatureStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
 
         mSpentAttributes.clear();
         resetCoins();
@@ -172,7 +172,7 @@ namespace MWGui
     void LevelupDialog::onOkButtonClicked (MyGUI::Widget* sender)
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
 
         if (mSpentAttributes.size() < 3)
             MWBase::Environment::get().getWindowManager ()->messageBox("#{sNotifyMessage36}");
diff --git a/apps/openmw/mwgui/list.cpp b/apps/openmw/mwgui/list.cpp
index eff7aea248..19f20eeee7 100644
--- a/apps/openmw/mwgui/list.cpp
+++ b/apps/openmw/mwgui/list.cpp
@@ -26,7 +26,7 @@ namespace MWGui
             if (mClient == 0)
                 mClient = this;
 
-            mScrollView = mClient->createWidgetReal<MWGui::Widgets::MWScrollView>(
+            mScrollView = mClient->createWidgetReal<MyGUI::ScrollView>(
                 "MW_ScrollView", MyGUI::FloatCoord(0.0, 0.0, 1.0, 1.0),
                 MyGUI::Align::Top | MyGUI::Align::Left | MyGUI::Align::Stretch, getName() + "_ScrollView");
         }
@@ -51,7 +51,7 @@ namespace MWGui
             const int _scrollBarWidth = 20; // fetch this from skin?
             const int scrollBarWidth = scrollbarShown ? _scrollBarWidth : 0;
             const int spacing = 3;
-            size_t scrollbarPosition = mScrollView->getScrollPosition();
+            size_t viewPosition = -mScrollView->getViewOffset().top;
 
             while (mScrollView->getChildCount())
             {
@@ -96,10 +96,10 @@ namespace MWGui
             if (!scrollbarShown && mItemHeight > mClient->getSize().height)
                 redraw(true);
 
-            size_t scrollbarRange = mScrollView->getScrollRange();
-            if(scrollbarPosition > scrollbarRange)
-                scrollbarPosition = scrollbarRange;
-            mScrollView->setScrollPosition(scrollbarPosition);
+            size_t viewRange = mScrollView->getCanvasSize().height;
+            if(viewPosition > viewRange)
+                viewPosition = viewRange;
+            mScrollView->setViewOffset(MyGUI::IntPoint(0, -viewPosition));
         }
 
         bool MWList::hasItem(const std::string& name)
@@ -151,19 +151,5 @@ namespace MWGui
             return mScrollView->findWidget (getName() + "_item_" + name);
         }
 
-        size_t MWScrollView::getScrollPosition()
-        {
-            return getVScroll()->getScrollPosition();
-        }
-
-        void MWScrollView::setScrollPosition(size_t position)
-        {
-            getVScroll()->setScrollPosition(position);
-        }
-        size_t MWScrollView::getScrollRange()
-        {
-            return getVScroll()->getScrollRange();
-        }
-
     }
 }
diff --git a/apps/openmw/mwgui/list.hpp b/apps/openmw/mwgui/list.hpp
index 956523c0dc..dcfe7931a0 100644
--- a/apps/openmw/mwgui/list.hpp
+++ b/apps/openmw/mwgui/list.hpp
@@ -7,18 +7,6 @@ namespace MWGui
 {
     namespace Widgets
     {
-        /**
-         * \brief a custom ScrollView which has access to scrollbar properties
-         */
-        class MWScrollView : public MyGUI::ScrollView
-        {
-            MYGUI_RTTI_DERIVED(MWScrollView)
-        public:
-            size_t getScrollPosition();
-            void setScrollPosition(size_t);
-            size_t getScrollRange();
-        };
-
         /**
          * \brief a very simple list widget that supports word-wrapping entries
          * \note if the width or height of the list changes, you must call adjustSize() method
@@ -70,7 +58,7 @@ namespace MWGui
             void onItemSelected(MyGUI::Widget* _sender);
 
         private:
-            MWGui::Widgets::MWScrollView* mScrollView;
+            MyGUI::ScrollView* mScrollView;
             MyGUI::Widget* mClient;
 
             std::vector<std::string> mItems;
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 2bd5e44cbd..29c065f3d5 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -89,10 +89,11 @@ namespace MWGui
         mChanged = true;
     }
 
-    void LocalMapBase::toggleFogOfWar()
+    bool LocalMapBase::toggleFogOfWar()
     {
         mFogOfWar = !mFogOfWar;
         applyFogOfWar();
+        return mFogOfWar;
     }
 
     void LocalMapBase::applyFogOfWar()
diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp
index 5251fac230..d23b0c2285 100644
--- a/apps/openmw/mwgui/mapwindow.hpp
+++ b/apps/openmw/mwgui/mapwindow.hpp
@@ -35,7 +35,7 @@ namespace MWGui
         void setPlayerDir(const float x, const float y);
         void setPlayerPos(const float x, const float y);
 
-        void toggleFogOfWar();
+        bool toggleFogOfWar();
 
         struct MarkerPosition
         {
diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp
index 2a48e62a94..83527a8845 100644
--- a/apps/openmw/mwgui/merchantrepair.cpp
+++ b/apps/openmw/mwgui/merchantrepair.cpp
@@ -39,19 +39,19 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor)
     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
     int playerGold = player.getClass().getContainerStore(player).count(MWWorld::ContainerStore::sGoldId);
 
-    MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
+    MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
     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))
+        if (iter->getClass().hasItemHealth(*iter))
         {
-            int maxDurability = MWWorld::Class::get(*iter).getItemMaxHealth(*iter);
+            int maxDurability = iter->getClass().getItemMaxHealth(*iter);
             int durability = (iter->getCellRef().mCharge == -1) ? maxDurability : iter->getCellRef().mCharge;
             if (maxDurability == durability)
                 continue;
 
-            int basePrice = MWWorld::Class::get(*iter).getValue(*iter);
+            int basePrice = iter->getClass().getValue(*iter);
             float fRepairMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                     .find("fRepairMult")->getFloat();
 
@@ -64,7 +64,7 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor)
             int price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mActor, x, true);
 
 
-            std::string name = MWWorld::Class::get(*iter).getName(*iter)
+            std::string name = iter->getClass().getName(*iter)
                     + " - " + boost::lexical_cast<std::string>(price)
                     + MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                     .find("sgp")->getString();;
@@ -114,7 +114,7 @@ void MerchantRepair::onRepairButtonClick(MyGUI::Widget *sender)
 {
     // repair
     MWWorld::Ptr item = *sender->getUserData<MWWorld::Ptr>();
-    item.getCellRef().mCharge = MWWorld::Class::get(item).getItemMaxHealth(item);
+    item.getCellRef().mCharge = item.getClass().getItemMaxHealth(item);
 
     MWBase::Environment::get().getSoundManager()->playSound("Repair",1,1);
 
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 51e24e29c8..5df2b12b8d 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -166,7 +166,7 @@ namespace MWGui
         frame->eventMouseButtonClick += MyGUI::newDelegate(this, &QuickKeysMenu::onQuickKeyButtonClicked);
         MyGUI::ImageBox* image = frame->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(item).getInventoryIcon(item);
+        path += item.getClass().getInventoryIcon(item);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
@@ -200,7 +200,7 @@ namespace MWGui
 
         MyGUI::ImageBox* image = frame->createWidget<MyGUI::ImageBox>("ImageBox", MyGUI::IntCoord(5, 5, 32, 32), MyGUI::Align::Default);
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(item).getInventoryIcon(item);
+        path += item.getClass().getInventoryIcon(item);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
@@ -265,7 +265,7 @@ namespace MWGui
         QuickKeyType type = *button->getUserData<QuickKeyType>();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
 
         if (type == Type_Item || type == Type_MagicItem)
         {
@@ -290,7 +290,7 @@ namespace MWGui
                 {
                     // No replacement was found
                     MWBase::Environment::get().getWindowManager ()->messageBox (
-                                "#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item));
+                                "#{sQuickMenu5} " + item.getClass().getName(item));
                     return;
                 }
             }
@@ -330,7 +330,7 @@ namespace MWGui
             assert(it != store.end());
 
             // equip, if it can be equipped
-            if (!MWWorld::Class::get(item).getEquipmentSlots(item).first.empty())
+            if (!item.getClass().getEquipmentSlots(item).first.empty())
             {
                 MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
             }
@@ -522,8 +522,8 @@ namespace MWGui
         const int spellHeight = 18;
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
 
         /// \todo lots of copy&pasted code from SpellWindow
@@ -566,7 +566,7 @@ namespace MWGui
         std::vector<MWWorld::Ptr> items;
         for (MWWorld::ContainerStoreIterator it(store.begin()); it != store.end(); ++it)
         {
-            std::string enchantId = MWWorld::Class::get(*it).getEnchantment(*it);
+            std::string enchantId = it->getClass().getEnchantment(*it);
             if (enchantId != "")
             {
                 // only add items with "Cast once" or "Cast on use"
@@ -645,7 +645,7 @@ namespace MWGui
 
             MyGUI::Button* t = mMagicList->createWidget<MyGUI::Button>(equipped ? "SpellText" : "SpellTextUnequipped",
                 MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
-            t->setCaption(MWWorld::Class::get(item).getName(item));
+            t->setCaption(item.getClass().getName(item));
             t->setTextAlign(MyGUI::Align::Left);
             t->setUserData(item);
             t->setUserString("ToolTipType", "ItemPtr");
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index 683406d9eb..313650bb64 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -41,7 +41,7 @@ void Recharge::open()
 void Recharge::start (const MWWorld::Ptr &item)
 {
     std::string path = std::string("icons\\");
-    path += MWWorld::Class::get(item).getInventoryIcon(item);
+    path += item.getClass().getInventoryIcon(item);
     int pos = path.rfind(".");
     path.erase(pos);
     path.append(".dds");
@@ -85,7 +85,7 @@ void Recharge::updateView()
     int currentY = 0;
 
     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-    MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
+    MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
     for (MWWorld::ContainerStoreIterator iter (store.begin());
          iter!=store.end(); ++iter)
     {
@@ -99,14 +99,14 @@ void Recharge::updateView()
 
         MyGUI::TextBox* text = mView->createWidget<MyGUI::TextBox> (
                     "SandText", MyGUI::IntCoord(8, currentY, mView->getWidth()-8, 18), MyGUI::Align::Default);
-        text->setCaption(MWWorld::Class::get(*iter).getName(*iter));
+        text->setCaption(iter->getClass().getName(*iter));
         text->setNeedMouseFocus(false);
         currentY += 19;
 
         MyGUI::ImageBox* icon = mView->createWidget<MyGUI::ImageBox> (
                     "ImageBox", MyGUI::IntCoord(16, currentY, 32, 32), MyGUI::Align::Default);
         std::string path = std::string("icons\\");
-        path += MWWorld::Class::get(*iter).getInventoryIcon(*iter);
+        path += iter->getClass().getInventoryIcon(*iter);
         int pos = path.rfind(".");
         path.erase(pos);
         path.append(".dds");
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index de96bcacd1..a3df2dfbea 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -40,7 +40,7 @@ void Repair::startRepairItem(const MWWorld::Ptr &item)
     mRepair.setTool(item);
 
     std::string path = std::string("icons\\");
-    path += MWWorld::Class::get(item).getInventoryIcon(item);
+    path += item.getClass().getInventoryIcon(item);
     int pos = path.rfind(".");
     path.erase(pos);
     path.append(".dds");
@@ -90,28 +90,28 @@ void Repair::updateRepairView()
     int currentY = 0;
 
     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-    MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
+    MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
     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))
+        if (iter->getClass().hasItemHealth(*iter))
         {
-            int maxDurability = MWWorld::Class::get(*iter).getItemMaxHealth(*iter);
+            int maxDurability = iter->getClass().getItemMaxHealth(*iter);
             int durability = (iter->getCellRef().mCharge == -1) ? maxDurability : iter->getCellRef().mCharge;
             if (maxDurability == durability)
                 continue;
 
             MyGUI::TextBox* text = mRepairView->createWidget<MyGUI::TextBox> (
                         "SandText", MyGUI::IntCoord(8, currentY, mRepairView->getWidth()-8, 18), MyGUI::Align::Default);
-            text->setCaption(MWWorld::Class::get(*iter).getName(*iter));
+            text->setCaption(iter->getClass().getName(*iter));
             text->setNeedMouseFocus(false);
             currentY += 19;
 
             MyGUI::ImageBox* icon = mRepairView->createWidget<MyGUI::ImageBox> (
                         "ImageBox", MyGUI::IntCoord(16, currentY, 32, 32), MyGUI::Align::Default);
             std::string path = std::string("icons\\");
-            path += MWWorld::Class::get(*iter).getInventoryIcon(*iter);
+            path += iter->getClass().getInventoryIcon(*iter);
             int pos = path.rfind(".");
             path.erase(pos);
             path.append(".dds");
diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp
index c0daa2c0ea..16e939eb24 100644
--- a/apps/openmw/mwgui/savegamedialog.cpp
+++ b/apps/openmw/mwgui/savegamedialog.cpp
@@ -222,12 +222,6 @@ namespace MWGui
                 MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, mCurrentSlot);
             }
         }
-
-        if (MWBase::Environment::get().getStateManager()->getState()==
-            MWBase::StateManager::State_NoGame)
-        {
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
-        }
     }
 
     void SaveGameDialog::onOkButtonClicked(MyGUI::Widget *sender)
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 74a4f88e79..475f73a072 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -47,8 +47,8 @@ namespace
 
         if (left.mBase.getTypeName() == right.mBase.getTypeName())
         {
-            int cmp = MWWorld::Class::get(left.mBase).getName(left.mBase).compare(
-                        MWWorld::Class::get(right.mBase).getName(right.mBase));
+            int cmp = left.mBase.getClass().getName(left.mBase).compare(
+                        right.mBase.getClass().getName(right.mBase));
             return cmp < 0;
         }
         else
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 77df465146..99b85c13cc 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -83,7 +83,7 @@ namespace MWGui
         mPtr = actor;
         clearSpells();
 
-        MWMechanics::Spells& merchantSpells = MWWorld::Class::get (actor).getCreatureStats (actor).getSpells();
+        MWMechanics::Spells& merchantSpells = actor.getClass().getCreatureStats (actor).getSpells();
 
         for (MWMechanics::Spells::TIterator iter = merchantSpells.begin(); iter!=merchantSpells.end(); ++iter)
         {
@@ -107,7 +107,7 @@ namespace MWGui
     bool SpellBuyingWindow::playerHasSpell(const std::string &id)
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::Spells& playerSpells = MWWorld::Class::get (player).getCreatureStats (player).getSpells();
+        MWMechanics::Spells& playerSpells = player.getClass().getCreatureStats (player).getSpells();
         for (MWMechanics::Spells::TIterator it = playerSpells.begin(); it != playerSpells.end(); ++it)
         {
             if (Misc::StringUtils::ciEqual(id, it->first))
@@ -121,7 +121,7 @@ namespace MWGui
         int price = *_sender->getUserData<int>();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
         spells.add (mSpellsWidgetMap.find(_sender)->second);
         player.getClass().getContainerStore(player).remove(MWWorld::ContainerStore::sGoldId, price, player);
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 469d7188ec..1ec4bd6da4 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -353,7 +353,7 @@ namespace MWGui
 
         const ESM::Spell* spell = MWBase::Environment::get().getWorld()->createRecord(mSpell);
 
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
         spells.add (spell->mId);
 
@@ -445,7 +445,7 @@ namespace MWGui
         // get the list of magic effects that are known to the player
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
 
         std::vector<short> knownEffects;
diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index d5ece298b0..1a9e418de6 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -40,14 +40,14 @@ namespace MWGui
         // TODO: Tracking add/remove/expire would be better than force updating every frame
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        const MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
 
 
         EffectSourceVisitor visitor;
 
         // permanent item enchantments & permanent spells
         visitor.mIsPermanent = true;
-        MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
         store.visitEffectSources(visitor);
         stats.getSpells().visitEffectSources(visitor);
 
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index a00c2480e2..16e4741432 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -84,8 +84,8 @@ namespace MWGui
         // retrieve all player spells, divide them into Powers and Spells and sort them
         std::vector<std::string> spellList;
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
 
         for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
@@ -122,7 +122,7 @@ namespace MWGui
         std::vector<MWWorld::Ptr> items;
         for (MWWorld::ContainerStoreIterator it(store.begin()); it != store.end(); ++it)
         {
-            std::string enchantId = MWWorld::Class::get(*it).getEnchantment(*it);
+            std::string enchantId = it->getClass().getEnchantment(*it);
             if (enchantId != "")
             {
                 // only add items with "Cast once" or "Cast on use"
@@ -203,7 +203,7 @@ namespace MWGui
             MWWorld::Ptr item = *it;
 
             const ESM::Enchantment* enchant =
-                esmStore.get<ESM::Enchantment>().find(MWWorld::Class::get(item).getEnchantment(item));
+                esmStore.get<ESM::Enchantment>().find(item.getClass().getEnchantment(item));
 
             // check if the item is currently equipped (will display in a different color)
             bool equipped = false;
@@ -218,7 +218,7 @@ namespace MWGui
 
             MyGUI::Button* t = mSpellView->createWidget<MyGUI::Button>(equipped ? "SpellText" : "SpellTextUnequipped",
                 MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
-            t->setCaption(MWWorld::Class::get(item).getName(item));
+            t->setCaption(item.getClass().getName(item));
             t->setTextAlign(MyGUI::Align::Left);
             t->setUserData(item);
             t->setUserString("ToolTipType", "ItemPtr");
@@ -300,7 +300,7 @@ namespace MWGui
     void SpellWindow::onEnchantedItemSelected(MyGUI::Widget* _sender)
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
         MWWorld::Ptr item = *_sender->getUserData<MWWorld::Ptr>();
 
         // retrieve ContainerStoreIterator to the item
@@ -316,7 +316,7 @@ namespace MWGui
 
         // equip, if it can be equipped and is not already equipped
         if (_sender->getUserString("Equipped") == "false"
-            && !MWWorld::Class::get(item).getEquipmentSlots(item).first.empty())
+            && !item.getClass().getEquipmentSlots(item).first.empty())
         {
             MWBase::Environment::get().getWindowManager()->getInventoryWindow()->useItem(item);
         }
@@ -330,7 +330,7 @@ namespace MWGui
     {
         std::string spellId = _sender->getUserString("Spell");
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::InventoryStore& store = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
 
         if (MyGUI::InputManager::getInstance().isShiftPressed())
         {
@@ -384,7 +384,7 @@ namespace MWGui
     void SpellWindow::onDeleteSpellAccept()
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         MWMechanics::Spells& spells = stats.getSpells();
 
         if (MWBase::Environment::get().getWindowManager()->getSelectedSpell() == mSpellToDelete)
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 31a3b6fdd0..6ae44e3146 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -228,7 +228,7 @@ namespace MWGui
         NoDrop::onFrame(dt);
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const MWMechanics::NpcStats &PCstats = MWWorld::Class::get(player).getNpcStats(player);
+        const MWMechanics::NpcStats &PCstats = player.getClass().getNpcStats(player);
 
         // level progress
         MyGUI::Widget* levelWidget;
@@ -459,7 +459,7 @@ namespace MWGui
                 addSeparator(coord1, coord2);
 
             MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            const MWMechanics::NpcStats &PCstats = MWWorld::Class::get(player).getNpcStats(player);
+            const MWMechanics::NpcStats &PCstats = player.getClass().getNpcStats(player);
             const std::set<std::string> &expelled = PCstats.getExpelled();
 
             addGroup(MWBase::Environment::get().getWindowManager()->getGameSettingString("sFaction", "Faction"), coord1, coord2);
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index f941c699b4..dd29f40ce4 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -89,7 +89,7 @@ namespace MWGui
                 if (mFocusObject.isEmpty ())
                     return;
 
-                const MWWorld::Class& objectclass = MWWorld::Class::get (mFocusObject);
+                const MWWorld::Class& objectclass = mFocusObject.getClass();
 
                 MyGUI::IntSize tooltipSize;
                 if ((!objectclass.hasToolTip(mFocusObject))&&(MWBase::Environment::get().getWindowManager()->getMode() == GM_Console))
@@ -305,7 +305,7 @@ namespace MWGui
 
         MyGUI::IntSize tooltipSize;
 
-        const MWWorld::Class& object = MWWorld::Class::get (mFocusObject);
+        const MWWorld::Class& object = mFocusObject.getClass();
         if (!object.hasToolTip(mFocusObject))
         {
             mDynamicToolTipBox->setVisible(false);
@@ -547,9 +547,10 @@ namespace MWGui
             return " (" + boost::lexical_cast<std::string>(value) + ")";
     }
 
-    void ToolTips::toggleFullHelp()
+    bool ToolTips::toggleFullHelp()
     {
         mFullHelp = !mFullHelp;
+        return mFullHelp;
     }
 
     bool ToolTips::getFullHelp() const
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index be5c631913..4e73cc5551 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -45,7 +45,7 @@ namespace MWGui
 
         void setEnabled(bool enabled);
 
-        void toggleFullHelp(); ///< show extra info in item tooltips (owner, script)
+        bool toggleFullHelp(); ///< show extra info in item tooltips (owner, script)
         bool getFullHelp() const;
 
         void setDelay(float delay);
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index ad18a13e81..18b0d5ae3f 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -138,7 +138,7 @@ namespace MWGui
 
         int services = 0;
         if (!mMerchant.isEmpty())
-            services = MWWorld::Class::get(mMerchant).getServices(mMerchant);
+            services = mMerchant.getClass().getServices(mMerchant);
 
         mItems.clear();
         // add regular items
@@ -150,7 +150,7 @@ namespace MWGui
                 MWWorld::Ptr base = item.mBase;
                 if(Misc::StringUtils::ciEqual(base.getCellRef().mRefID, MWWorld::ContainerStore::sGoldId))
                     continue;
-                if(!MWWorld::Class::get(base).canSell(base, services))
+                if(!base.getClass().canSell(base, services))
                     continue;
 
                 // Bound items may not be bought
@@ -164,7 +164,7 @@ namespace MWGui
                 if(mMerchant.getClass().hasInventoryStore(mMerchant))
                 {
                     bool isEquipped = false;
-                    MWWorld::InventoryStore& store = MWWorld::Class::get(mMerchant).getInventoryStore(mMerchant);
+                    MWWorld::InventoryStore& store = mMerchant.getClass().getInventoryStore(mMerchant);
                     for (int slot=0; slot<MWWorld::InventoryStore::Slots; ++slot)
                     {
                         MWWorld::ContainerStoreIterator equipped = store.getSlot(slot);
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 9cabab3e8e..4baa48e7cf 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -84,7 +84,7 @@ namespace MWGui
         mCurrentBalance = 0;
         mCurrentMerchantOffer = 0;
 
-        checkTradeTime();
+        restock();
 
         std::vector<MWWorld::Ptr> itemSources;
         MWBase::Environment::get().getWorld()->getContainersOwnedBy(actor, itemSources);
@@ -102,7 +102,7 @@ namespace MWGui
 
         // Careful here. setTitle may cause size updates, causing itemview redraw, so make sure to do it last
         // or we end up using a possibly invalid model.
-        setTitle(MWWorld::Class::get(actor).getName(actor));
+        setTitle(actor.getClass().getName(actor));
 
         onFilterChanged(mFilterAll);
     }
@@ -133,7 +133,7 @@ namespace MWGui
 
     int TradeWindow::getMerchantServices()
     {
-        return MWWorld::Class::get(mPtr).getServices(mPtr);
+        return mPtr.getClass().getServices(mPtr);
     }
 
     void TradeWindow::onItemSelected (int index)
@@ -150,7 +150,7 @@ namespace MWGui
         {
             CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
             std::string message = "#{sQuanityMenuMessage02}";
-            dialog->open(MWWorld::Class::get(object).getName(object), message, count);
+            dialog->open(object.getClass().getName(object), message, count);
             dialog->eventOkClicked.clear();
             dialog->eventOkClicked += MyGUI::newDelegate(this, &TradeWindow::sellItem);
             mItemToSell = mSortModel->mapToSource(index);
@@ -165,7 +165,7 @@ namespace MWGui
     void TradeWindow::sellItem(MyGUI::Widget* sender, int count)
     {
         const ItemStack& item = mTradeModel->getItem(mItemToSell);
-        std::string sound = MWWorld::Class::get(item.mBase).getDownSoundId(item.mBase);
+        std::string sound = item.mBase.getClass().getDownSoundId(item.mBase);
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
 
         TradeItemModel* playerTradeModel = MWBase::Environment::get().getWindowManager()->getInventoryWindow()->getTradeModel();
@@ -208,7 +208,7 @@ namespace MWGui
 
     void TradeWindow::addOrRemoveGold(int amount, const MWWorld::Ptr& actor)
     {
-        MWWorld::ContainerStore& store = MWWorld::Class::get(actor).getContainerStore(actor);
+        MWWorld::ContainerStore& store = actor.getClass().getContainerStore(actor);
 
         if (amount > 0)
         {
@@ -364,8 +364,6 @@ namespace MWGui
                         mPtr.getClass().getCreatureStats(mPtr).getGoldPool() - mCurrentBalance );
         }
 
-        updateTradeTime();
-
         MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addResponse(
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sBarterDialog5")->getString());
 
@@ -444,7 +442,7 @@ namespace MWGui
 
     void TradeWindow::sellToNpc(const MWWorld::Ptr& item, int count, bool boughtItem)
     {
-        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count, boughtItem);
+        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, item.getClass().getValue(item) * count, boughtItem);
 
         mCurrentBalance += diff;
         mCurrentMerchantOffer += diff;
@@ -454,7 +452,7 @@ namespace MWGui
 
     void TradeWindow::buyFromNpc(const MWWorld::Ptr& item, int count, bool soldItem)
     {
-        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count, !soldItem);
+        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, item.getClass().getValue(item) * count, !soldItem);
 
         mCurrentBalance -= diff;
         mCurrentMerchantOffer -= diff;
@@ -475,30 +473,26 @@ namespace MWGui
         return merchantGold;
     }
 
-    // Relates to NPC gold reset delay
-    void TradeWindow::checkTradeTime()
+    void TradeWindow::restock()
     {
         MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
-        double delay = boost::lexical_cast<double>(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getInt());
+        float delay = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getFloat();
 
-        // if time stamp longer than gold reset delay, reset gold.
-        if (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getTradeTime() + delay)
+        if (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getLastRestockTime() + delay)
         {
             sellerStats.setGoldPool(mPtr.getClass().getBaseGold(mPtr));
-        }
-    }
 
-    void TradeWindow::updateTradeTime()
-    {
-        MWWorld::ContainerStore store = mPtr.getClass().getContainerStore(mPtr);
-        MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
-        double delay = boost::lexical_cast<double>(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getInt());
+            mPtr.getClass().restock(mPtr);
 
-        // If trade timestamp is within reset delay don't set
-        if ( ! (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getTradeTime() &&
-                MWBase::Environment::get().getWorld()->getTimeStamp() < sellerStats.getTradeTime() + delay) )
-        {
-            sellerStats.setTradeTime(MWBase::Environment::get().getWorld()->getTimeStamp());
+            // Also restock any containers owned by this merchant, which are also available to buy in the trade window
+            std::vector<MWWorld::Ptr> itemSources;
+            MWBase::Environment::get().getWorld()->getContainersOwnedBy(mPtr, itemSources);
+            for (std::vector<MWWorld::Ptr>::iterator it = itemSources.begin(); it != itemSources.end(); ++it)
+            {
+                it->getClass().restock(*it);
+            }
+
+            sellerStats.setLastRestockTime(MWBase::Environment::get().getWorld()->getTimeStamp());
         }
     }
 }
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index 5c154d4259..2da58e72e1 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -101,9 +101,7 @@ namespace MWGui
 
             int getMerchantGold();
 
-            // Relates to NPC gold reset delay
-            void checkTradeTime();
-            void updateTradeTime(); 
+            void restock();
     };
 }
 
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
index bee76992af..34873b9bc7 100644
--- a/apps/openmw/mwgui/trainingwindow.cpp
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -44,7 +44,7 @@ namespace MWGui
 
         mPlayerGold->setCaptionWithReplacing("#{sGold}: " + boost::lexical_cast<std::string>(playerGold));
 
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(actor).getNpcStats (actor);
+        MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats (actor);
 
         // NPC can train you in his best 3 skills
         std::vector< std::pair<int, int> > bestSkills;
@@ -73,7 +73,7 @@ namespace MWGui
         MyGUI::EnumeratorWidgetPtr widgets = mTrainingOptions->getEnumerator ();
         MyGUI::Gui::getInstance ().destroyWidgets (widgets);
 
-        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
 
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
@@ -115,7 +115,7 @@ namespace MWGui
         int skillId = *sender->getUserData<int>();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::NpcStats& pcStats = player.getClass().getNpcStats (player);
 
         const MWWorld::ESMStore &store =
             MWBase::Environment::get().getWorld()->getStore();
@@ -123,7 +123,7 @@ namespace MWGui
         int price = pcStats.getSkill (skillId).getBase() * store.get<ESM::GameSetting>().find("iTrainingMod")->getInt ();
         price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr,price,true);
 
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(mPtr).getNpcStats (mPtr);
+        MWMechanics::NpcStats& npcStats = mPtr.getClass().getNpcStats (mPtr);
         if (npcStats.getSkill (skillId).getBase () <= pcStats.getSkill (skillId).getBase ())
         {
             MWBase::Environment::get().getWindowManager()->messageBox ("#{sServiceTrainingWords}");
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 89d73215d0..642e1a6449 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -161,7 +161,7 @@ namespace MWGui
             MWBase::Environment::get().getWorld()->changeToExteriorCell(pos);
         }
 
-        MWWorld::Class::get(player).adjustPosition(player);
+        player.getClass().adjustPosition(player);
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Travel);
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Dialogue);
         MWBase::Environment::get().getWorld ()->getFader ()->fadeOut(0);
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index ed1b9e0a90..6c07e14d36 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -171,11 +171,11 @@ namespace MWGui
     void WaitDialog::setCanRest (bool canRest)
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
         bool full = (stats.getFatigue().getCurrent() >= stats.getFatigue().getModified())
                 && (stats.getHealth().getCurrent() >= stats.getHealth().getModified())
                 && (stats.getMagicka().getCurrent() >= stats.getMagicka().getModified());
-        MWMechanics::NpcStats& npcstats = MWWorld::Class::get(player).getNpcStats(player);
+        MWMechanics::NpcStats& npcstats = player.getClass().getNpcStats(player);
         bool werewolf = npcstats.isWerewolf();
 
         mUntilHealedButton->setVisible(canRest && !full);
@@ -231,7 +231,7 @@ namespace MWGui
         mWaiting = false;
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const MWMechanics::NpcStats &pcstats = MWWorld::Class::get(player).getNpcStats(player);
+        const MWMechanics::NpcStats &pcstats = player.getClass().getNpcStats(player);
 
         // trigger levelup if possible
         const MWWorld::Store<ESM::GameSetting> &gmst =
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index ed6910221b..40fcc35300 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -158,7 +158,6 @@ namespace MWGui
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::AutoSizedButton>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::ImageButton>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::ExposedWindow>("Widget");
-        MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWScrollView>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWScrollBar>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<VideoWidget>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<BackgroundImage>("Widget");
@@ -299,6 +298,7 @@ namespace MWGui
             delete mCharGen;
             mCharGen = new CharacterCreation();
             mGuiModes.clear();
+            MWBase::Environment::get().getInputManager()->changeInputMode(false);
             mHud->unsetSelectedWeapon();
             mHud->unsetSelectedSpell();
             unsetForceHide(GW_ALL);
@@ -814,10 +814,10 @@ namespace MWGui
         mHud->setMinimapVisible (visible);
     }
 
-    void WindowManager::toggleFogOfWar()
+    bool WindowManager::toggleFogOfWar()
     {
         mMap->toggleFogOfWar();
-        mHud->toggleFogOfWar();
+        return mHud->toggleFogOfWar();
     }
 
     void WindowManager::setFocusObject(const MWWorld::Ptr& focus)
@@ -830,9 +830,9 @@ namespace MWGui
         mToolTips->setFocusObjectScreenCoords(min_x, min_y, max_x, max_y);
     }
 
-    void WindowManager::toggleFullHelp()
+    bool WindowManager::toggleFullHelp()
     {
-        mToolTips->toggleFullHelp();
+        return mToolTips->toggleFullHelp();
     }
 
     bool WindowManager::getFullHelp() const
@@ -1027,20 +1027,20 @@ namespace MWGui
     {
         mSelectedSpell = "";
         const ESM::Enchantment* ench = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>()
-                .find(MWWorld::Class::get(item).getEnchantment(item));
+                .find(item.getClass().getEnchantment(item));
 
         int chargePercent = (item.getCellRef().mEnchantmentCharge == -1) ? 100
                 : (item.getCellRef().mEnchantmentCharge / static_cast<float>(ench->mData.mCharge) * 100);
         mHud->setSelectedEnchantItem(item, chargePercent);
-        mSpellWindow->setTitle(MWWorld::Class::get(item).getName(item));
+        mSpellWindow->setTitle(item.getClass().getName(item));
     }
 
     void WindowManager::setSelectedWeapon(const MWWorld::Ptr& item)
     {
         int durabilityPercent = (item.getCellRef().mCharge == -1) ? 100
-                 : (item.getCellRef().mCharge / static_cast<float>(MWWorld::Class::get(item).getItemMaxHealth(item)) * 100);
+                 : (item.getCellRef().mCharge / static_cast<float>(item.getClass().getItemMaxHealth(item)) * 100);
         mHud->setSelectedWeapon(item, durabilityPercent);
-        mInventoryWindow->setTitle(MWWorld::Class::get(item).getName(item));
+        mInventoryWindow->setTitle(item.getClass().getName(item));
     }
 
     void WindowManager::unsetSelectedSpell()
@@ -1413,6 +1413,7 @@ namespace MWGui
         mConsole->resetReference();
 
         mGuiModes.clear();
+        MWBase::Environment::get().getInputManager()->changeInputMode(false);
         updateVisible();
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 7617a4463d..c98c32c524 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -188,8 +188,8 @@ namespace MWGui
     virtual void setDragDrop(bool dragDrop);
     virtual bool getWorldMouseOver();
 
-    virtual void toggleFogOfWar();
-    virtual void toggleFullHelp(); ///< show extra info in item tooltips (owner, script)
+    virtual bool toggleFogOfWar();
+    virtual bool toggleFullHelp(); ///< show extra info in item tooltips (owner, script)
     virtual bool getFullHelp() const;
 
     virtual void setActiveMap(int x, int y, bool interior);
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 8095b0d05d..cf71cc1aa4 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -172,7 +172,7 @@ namespace MWInput
 
         if (action == A_Use)
         {
-            MWWorld::Class::get(mPlayer->getPlayer()).getCreatureStats(mPlayer->getPlayer()).setAttackingOrSpell(currentValue);
+            mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).setAttackingOrSpell(currentValue);
         }
 
         if (currentValue == 1)
@@ -359,7 +359,7 @@ namespace MWInput
             {
                 MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
                 mOverencumberedMessageDelay -= dt;
-                if (MWWorld::Class::get(player).getEncumbrance(player) >= MWWorld::Class::get(player).getCapacity(player))
+                if (player.getClass().getEncumbrance(player) >= player.getClass().getCapacity(player))
                 {
                     mPlayer->setAutoMove (false);
                     if (mOverencumberedMessageDelay <= 0)
@@ -664,7 +664,7 @@ namespace MWInput
             return;
 
         // Not allowed if no spell selected
-        MWWorld::InventoryStore& inventory = MWWorld::Class::get(mPlayer->getPlayer()).getInventoryStore(mPlayer->getPlayer());
+        MWWorld::InventoryStore& inventory = mPlayer->getPlayer().getClass().getInventoryStore(mPlayer->getPlayer());
         if (MWBase::Environment::get().getWindowManager()->getSelectedSpell().empty() &&
             inventory.getSelectedEnchantItem() == inventory.end())
             return;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2c35404626..35667a23c4 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -187,7 +187,7 @@ namespace MWMechanics
 
     void Actors::engageCombat (const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, bool againstPlayer)
     {
-        CreatureStats& creatureStats = MWWorld::Class::get(actor1).getCreatureStats(actor1);
+        CreatureStats& creatureStats = actor1.getClass().getCreatureStats(actor1);
         
         if (againstPlayer && creatureStats.isHostile()) return; // already fighting against player
 
@@ -244,13 +244,13 @@ namespace MWMechanics
 
     void Actors::adjustMagicEffects (const MWWorld::Ptr& creature)
     {
-        CreatureStats& creatureStats =  MWWorld::Class::get (creature).getCreatureStats (creature);
+        CreatureStats& creatureStats =  creature.getClass().getCreatureStats (creature);
 
         MagicEffects now = creatureStats.getSpells().getMagicEffects();
 
         if (creature.getTypeName()==typeid (ESM::NPC).name())
         {
-            MWWorld::InventoryStore& store = MWWorld::Class::get (creature).getInventoryStore (creature);
+            MWWorld::InventoryStore& store = creature.getClass().getInventoryStore (creature);
             now += store.getMagicEffects();
         }
 
@@ -265,7 +265,7 @@ namespace MWMechanics
 
     void Actors::calculateDynamicStats (const MWWorld::Ptr& ptr)
     {
-        CreatureStats& creatureStats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
+        CreatureStats& creatureStats = ptr.getClass().getCreatureStats (ptr);
 
         int strength     = creatureStats.getAttribute(ESM::Attribute::Strength).getBase();
         int intelligence = creatureStats.getAttribute(ESM::Attribute::Intelligence).getBase();
@@ -333,7 +333,7 @@ namespace MWMechanics
 
     void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr, float duration)
     {
-        CreatureStats &creatureStats = MWWorld::Class::get(ptr).getCreatureStats(ptr);
+        CreatureStats &creatureStats = ptr.getClass().getCreatureStats(ptr);
         const MagicEffects &effects = creatureStats.getMagicEffects();
 
         // attributes
@@ -551,7 +551,7 @@ namespace MWMechanics
                         MWMechanics::CreatureStats& summonedCreatureStats = ref.getPtr().getClass().getCreatureStats(ref.getPtr());
 
                         // Make the summoned creature follow its master and help in fights
-                        AiFollow package(ptr);
+                        AiFollow package(ptr.getRefData().getHandle());
                         summonedCreatureStats.getAiSequence().stack(package, ref.getPtr());
                         int creatureActorId = summonedCreatureStats.getActorId();
 
@@ -600,7 +600,7 @@ namespace MWMechanics
 
     void Actors::calculateNpcStatModifiers (const MWWorld::Ptr& ptr)
     {
-        NpcStats &npcStats = MWWorld::Class::get(ptr).getNpcStats(ptr);
+        NpcStats &npcStats = ptr.getClass().getNpcStats(ptr);
         const MagicEffects &effects = npcStats.getMagicEffects();
 
         // skills
@@ -656,7 +656,7 @@ namespace MWMechanics
     {
         bool isPlayer = ptr.getRefData().getHandle()=="player";
 
-        MWWorld::InventoryStore &inventoryStore = MWWorld::Class::get(ptr).getInventoryStore(ptr);
+        MWWorld::InventoryStore &inventoryStore = ptr.getClass().getInventoryStore(ptr);
         MWWorld::ContainerStoreIterator heldIter =
                 inventoryStore.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
         /**
@@ -678,7 +678,7 @@ namespace MWMechanics
             {
                 if (torch != inventoryStore.end())
                 {
-                    if (!MWWorld::Class::get (ptr).getCreatureStats (ptr).isHostile())
+                    if (!ptr.getClass().getCreatureStats (ptr).isHostile())
                     {
                         // For non-hostile NPCs, unequip whatever is in the left slot in favor of a light.
                         if (heldIter != inventoryStore.end() && heldIter->getTypeName() != typeid(ESM::Light).name())
@@ -755,8 +755,8 @@ namespace MWMechanics
         if (ptr != player && ptr.getClass().isNpc())
         {
             // get stats of witness
-            CreatureStats& creatureStats = MWWorld::Class::get(ptr).getCreatureStats(ptr);
-            NpcStats& npcStats = MWWorld::Class::get(ptr).getNpcStats(ptr);
+            CreatureStats& creatureStats = ptr.getClass().getCreatureStats(ptr);
+            NpcStats& npcStats = ptr.getClass().getNpcStats(ptr);
 
             if (ptr.getClass().isClass(ptr, "Guard") && creatureStats.getAiSequence().getTypeId() != AiPackage::TypeIdPursue && !creatureStats.isHostile())
             {
@@ -796,7 +796,7 @@ namespace MWMechanics
                     // Update witness crime id
                     npcStats.setCrimeId(-1);
                 }
-                else if (!creatureStats.isHostile())
+                else if (!creatureStats.isHostile() && creatureStats.getAiSequence().getTypeId() != AiPackage::TypeIdPursue)
                 {
                     if (ptr.getClass().isClass(ptr, "Guard"))
                         creatureStats.getAiSequence().stack(AiPursue(player), ptr);
@@ -824,7 +824,7 @@ namespace MWMechanics
     void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
     {
         // erase previous death events since we are currently only tracking them while in an active cell
-        MWWorld::Class::get(ptr).getCreatureStats(ptr).clearHasDied();
+        ptr.getClass().getCreatureStats(ptr).clearHasDied();
 
         removeActor(ptr);
 
@@ -964,7 +964,7 @@ namespace MWMechanics
             // Kill dead actors, update some variables
             for(PtrControllerMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
-                const MWWorld::Class &cls = MWWorld::Class::get(iter->first);
+                const MWWorld::Class &cls = iter->first.getClass();
                 CreatureStats &stats = cls.getCreatureStats(iter->first);
 
                 //KnockedOutOneFrameLogic
@@ -1137,7 +1137,7 @@ namespace MWMechanics
         std::list<MWWorld::Ptr> list;
         for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();iter++)
         {
-            const MWWorld::Class &cls = MWWorld::Class::get(iter->first);
+            const MWWorld::Class &cls = iter->first.getClass();
             CreatureStats &stats = cls.getCreatureStats(iter->first);
             if(!stats.isDead() && stats.getAiSequence().getTypeId() == AiPackage::TypeIdFollow)
             {
@@ -1158,7 +1158,7 @@ namespace MWMechanics
             neighbors); //only care about those within the alarm disance
         for(std::vector<MWWorld::Ptr>::iterator iter(neighbors.begin());iter != neighbors.end();iter++)
         {
-            const MWWorld::Class &cls = MWWorld::Class::get(*iter);
+            const MWWorld::Class &cls = iter->getClass();
             CreatureStats &stats = cls.getCreatureStats(*iter);
             if(!stats.isDead() && stats.getAiSequence().getTypeId() == AiPackage::TypeIdCombat)
             {
diff --git a/apps/openmw/mwmechanics/aiactivate.cpp b/apps/openmw/mwmechanics/aiactivate.cpp
index 4b4b36ed65..3dfacb853d 100644
--- a/apps/openmw/mwmechanics/aiactivate.cpp
+++ b/apps/openmw/mwmechanics/aiactivate.cpp
@@ -32,7 +32,7 @@ bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor,float duration)
     if(distance(dest, pos.pos[0], pos.pos[1], pos.pos[2]) < 200) { //Stop when you get close
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
         MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(mObjectId,false);
-        MWWorld::Class::get(target).activate(target,actor).get()->execute(actor); //Arrest player
+        target.getClass().activate(target,actor).get()->execute(actor); //Arrest player
         return true;
     }
     else {
diff --git a/apps/openmw/mwmechanics/aiavoiddoor.cpp b/apps/openmw/mwmechanics/aiavoiddoor.cpp
index 44eacb0d1e..5045225828 100644
--- a/apps/openmw/mwmechanics/aiavoiddoor.cpp
+++ b/apps/openmw/mwmechanics/aiavoiddoor.cpp
@@ -63,7 +63,7 @@ bool MWMechanics::AiAvoidDoor::execute (const MWWorld::Ptr& actor,float duration
     MWBase::Environment::get().getMechanicsManager()->getActorsInRange(Ogre::Vector3(pos.pos[0],pos.pos[1],pos.pos[2]),100,actors);
     for(std::vector<MWWorld::Ptr>::iterator it = actors.begin(); it != actors.end(); it++) {
         if(*it != MWBase::Environment::get().getWorld()->getPlayerPtr()) { //Not the player
-            MWMechanics::AiSequence& seq = MWWorld::Class::get(*it).getCreatureStats(*it).getAiSequence();
+            MWMechanics::AiSequence& seq = it->getClass().getCreatureStats(*it).getAiSequence();
             if(seq.getTypeId() != MWMechanics::AiPackage::TypeIdAvoidDoor) { //Only add it once
                 seq.stack(MWMechanics::AiAvoidDoor(mDoorPtr),*it);
             }
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index f3ce7143a4..07bb9726ef 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -8,8 +8,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/timestamp.hpp"
 
-#include "../mwmechanics/creaturestats.hpp"
-
 #include "steering.hpp"
 #include "movement.hpp"
 
@@ -21,8 +19,8 @@
 
 namespace MWMechanics
 {
-    AiEscort::AiEscort(const MWWorld::Ptr& actor, int duration, float x, float y, float z)
-    : mActorId(actor.getClass().getCreatureStats(actor).getActorId()), mX(x), mY(y), mZ(z), mDuration(duration)
+    AiEscort::AiEscort(const std::string &actorId, int duration, float x, float y, float z)
+    : mActorId(actorId), mX(x), mY(y), mZ(z), mDuration(duration)
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
@@ -40,8 +38,8 @@ namespace MWMechanics
         }
     }
 
-    AiEscort::AiEscort(const MWWorld::Ptr& actor, const std::string &cellId,int duration, float x, float y, float z)
-    : mActorId(actor.getClass().getCreatureStats(actor).getActorId()), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration)
+    AiEscort::AiEscort(const std::string &actorId, const std::string &cellId,int duration, float x, float y, float z)
+    : mActorId(actorId), mCellId(cellId), mX(x), mY(y), mZ(z), mDuration(duration)
     , mCellX(std::numeric_limits<int>::max())
     , mCellY(std::numeric_limits<int>::max())
     {
@@ -77,14 +75,7 @@ namespace MWMechanics
                 return true;
         }
 
-        const MWWorld::Ptr follower = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mActorId);
-        if (follower.isEmpty())
-        {
-            // The follower disappeared
-            MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
-            return true;
-        }
-
+        const MWWorld::Ptr follower = MWBase::Environment::get().getWorld()->getPtr(mActorId, false);
         const float* const leaderPos = actor.getRefData().getPosition().pos;
         const float* const followerPos = follower.getRefData().getPosition().pos;
         double differenceBetween[3];
@@ -98,7 +89,7 @@ namespace MWMechanics
 
         if(distanceBetweenResult <= mMaxDist * mMaxDist)
         {
-            if(pathTo(actor,ESM::Pathgrid::Point(mX,mY,mZ),duration)) //Returns true on path complete
+            if(pathTo(actor,ESM::Pathgrid::Point(mX,mY,mZ),duration)) //Returns true on path complete
                 return true;
             mMaxDist = 470;
         }
@@ -106,7 +97,7 @@ namespace MWMechanics
         {
             // Stop moving if the player is to far away
             MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(actor, "idle3", 0, 1);
-            MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
+            actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
             mMaxDist = 330;
         }
 
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index b8dc9d6e0f..3771417fa2 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -15,11 +15,11 @@ namespace MWMechanics
             /// Implementation of AiEscort
             /** The Actor will escort the specified actor to the world position x, y, z until they reach their position, or they run out of time
                 \implement AiEscort **/
-            AiEscort(const MWWorld::Ptr& actor,int duration, float x, float y, float z);
+            AiEscort(const std::string &actorId,int duration, float x, float y, float z);
             /// Implementation of AiEscortCell
             /** The Actor will escort the specified actor to the cell position x, y, z until they reach their position, or they run out of time
                 \implement AiEscortCell **/
-            AiEscort(const MWWorld::Ptr& actor,const std::string &cellId,int duration, float x, float y, float z);
+            AiEscort(const std::string &actorId,const std::string &cellId,int duration, float x, float y, float z);
 
             virtual AiEscort *clone() const;
 
@@ -28,7 +28,7 @@ namespace MWMechanics
             virtual int getTypeId() const;
 
         private:
-            int mActorId;
+            std::string mActorId;
             std::string mCellId;
             float mX;
             float mY;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index d747781a38..f1296a9493 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -11,26 +11,23 @@
 
 #include "steering.hpp"
 
-MWMechanics::AiFollow::AiFollow(const MWWorld::Ptr& actor,float duration, float x, float y, float z)
-: mAlwaysFollow(false), mDuration(duration), mX(x), mY(y), mZ(z), mCellId(""), AiPackage()
+MWMechanics::AiFollow::AiFollow(const std::string &actorId,float duration, float x, float y, float z)
+: mAlwaysFollow(false), mDuration(duration), mX(x), mY(y), mZ(z), mActorId(actorId), mCellId(""), AiPackage()
 {
-    mActorId = actor.getClass().getCreatureStats(actor).getActorId();
 }
-MWMechanics::AiFollow::AiFollow(const MWWorld::Ptr& actor,const std::string &cellId,float duration, float x, float y, float z)
-: mAlwaysFollow(false), mDuration(duration), mX(x), mY(y), mZ(z), mCellId(cellId), AiPackage()
+MWMechanics::AiFollow::AiFollow(const std::string &actorId,const std::string &cellId,float duration, float x, float y, float z)
+: mAlwaysFollow(false), mDuration(duration), mX(x), mY(y), mZ(z), mActorId(actorId), mCellId(cellId), AiPackage()
 {
-    mActorId = actor.getClass().getCreatureStats(actor).getActorId();
 }
 
-MWMechanics::AiFollow::AiFollow(const MWWorld::Ptr& actor)
-: mAlwaysFollow(true), mDuration(0), mX(0), mY(0), mZ(0), mCellId(""), AiPackage()
+MWMechanics::AiFollow::AiFollow(const std::string &actorId)
+: mAlwaysFollow(true), mDuration(0), mX(0), mY(0), mZ(0), mActorId(actorId), mCellId(""), AiPackage()
 {
-    mActorId = actor.getClass().getCreatureStats(actor).getActorId();
 }
 
 bool MWMechanics::AiFollow::execute (const MWWorld::Ptr& actor,float duration)
 {
-    const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mActorId); //The target to follow
+    const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mActorId, false); //The target to follow
 
     if(target == MWWorld::Ptr()) return true;   //Target doesn't exist
 
@@ -78,8 +75,7 @@ bool MWMechanics::AiFollow::execute (const MWWorld::Ptr& actor,float duration)
 
 std::string MWMechanics::AiFollow::getFollowedActor()
 {
-    const MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mActorId); //The target to follow
-    return target.getCellRef().mRefID;
+    return mActorId;
 }
 
 MWMechanics::AiFollow *MWMechanics::AiFollow::clone() const
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index 91bdbdac2f..10a381410a 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -10,16 +10,16 @@ namespace MWMechanics
 {
     /// \brief AiPackage for an actor to follow another actor/the PC
     /** The AI will follow the target until a condition (time, or position) are set. Both can be disabled to cause the actor to follow the other indefinitely
-    **/
-    class AiFollow : public AiPackage
-    {
+    **/
+    class AiFollow : public AiPackage
+    {
         public:
             /// Follow Actor for duration or until you arrive at a world position
-            AiFollow(const MWWorld::Ptr& actor,float duration, float X, float Y, float Z);
+            AiFollow(const std::string &ActorId,float duration, float X, float Y, float Z);
             /// Follow Actor for duration or until you arrive at a position in a cell
-            AiFollow(const MWWorld::Ptr& actor,const std::string &CellId,float duration, float X, float Y, float Z);
+            AiFollow(const std::string &ActorId,const std::string &CellId,float duration, float X, float Y, float Z);
             /// Follow Actor indefinitively
-            AiFollow(const MWWorld::Ptr& actor);
+            AiFollow(const std::string &ActorId);
 
             virtual AiFollow *clone() const;
 
@@ -38,8 +38,8 @@ namespace MWMechanics
             float mX;
             float mY;
             float mZ;
-            int mActorId; // The actor we should follow
-            std::string mCellId;
-    };
-}
-#endif
+            std::string mActorId;
+            std::string mCellId;
+    };
+}
+#endif
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index 6d2c15549f..8a6a69b278 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -266,8 +266,7 @@ void AiSequence::fill(const ESM::AIPackageList &list)
         else if (it->mType == ESM::AI_Escort)
         {
             ESM::AITarget data = it->mTarget;
-            MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(data.mId.toString(), false);
-            package = new MWMechanics::AiEscort(target, data.mDuration, data.mX, data.mY, data.mZ);
+            package = new MWMechanics::AiEscort(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ);
         }
         else if (it->mType == ESM::AI_Travel)
         {
@@ -282,8 +281,7 @@ void AiSequence::fill(const ESM::AIPackageList &list)
         else //if (it->mType == ESM::AI_Follow)
         {
             ESM::AITarget data = it->mTarget;
-            MWWorld::Ptr target = MWBase::Environment::get().getWorld()->getPtr(data.mId.toString(), false);
-            package = new MWMechanics::AiFollow(target, data.mDuration, data.mX, data.mY, data.mZ);
+            package = new MWMechanics::AiFollow(data.mId.toString(), data.mDuration, data.mX, data.mY, data.mZ);
         }
         mPackages.push_back(package);
     }
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 7120ff5afc..1c870bda47 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -572,7 +572,7 @@ namespace MWMechanics
     void AiWander::stopWalking(const MWWorld::Ptr& actor)
     {
         mPathFinder.clearPath();
-        MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
+        actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
     }
 
     void AiWander::playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect)
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index af58e9ee0b..64b358b96c 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -292,13 +292,13 @@ void MWMechanics::Alchemy::addPotion (const std::string& name)
 
 void MWMechanics::Alchemy::increaseSkill()
 {
-    MWWorld::Class::get (mAlchemist).skillUsageSucceeded (mAlchemist, ESM::Skill::Alchemy, 0);
+    mAlchemist.getClass().skillUsageSucceeded (mAlchemist, ESM::Skill::Alchemy, 0);
 }
 
 float MWMechanics::Alchemy::getChance() const
 {
-    const CreatureStats& creatureStats = MWWorld::Class::get (mAlchemist).getCreatureStats (mAlchemist);
-    const NpcStats& npcStats = MWWorld::Class::get (mAlchemist).getNpcStats (mAlchemist);
+    const CreatureStats& creatureStats = mAlchemist.getClass().getCreatureStats (mAlchemist);
+    const NpcStats& npcStats = mAlchemist.getClass().getNpcStats (mAlchemist);
 
     return
         (npcStats.getSkill (ESM::Skill::Alchemy).getModified() +
@@ -331,7 +331,7 @@ void MWMechanics::Alchemy::setAlchemist (const MWWorld::Ptr& npc)
 
     mEffects.clear();
 
-    MWWorld::ContainerStore& store = MWWorld::Class::get (npc).getContainerStore (npc);
+    MWWorld::ContainerStore& store = npc.getClass().getContainerStore (npc);
 
     for (MWWorld::ContainerStoreIterator iter (store.begin (MWWorld::ContainerStore::Type_Apparatus));
         iter!=store.end(); ++iter)
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index b6d91db583..60bccb3f7e 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -459,7 +459,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     if(!mAnimation)
         return;
 
-    const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
+    const MWWorld::Class &cls = mPtr.getClass();
     if(cls.isActor())
     {
         /* Accumulate along X/Y only for now, until we can figure out how we should
@@ -549,7 +549,7 @@ bool CharacterController::updateCreatureState()
 
 bool CharacterController::updateWeaponState()
 {
-    const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
+    const MWWorld::Class &cls = mPtr.getClass();
     CreatureStats &stats = cls.getCreatureStats(mPtr);
     WeaponType weaptype = WeapType_None;
     MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
@@ -601,8 +601,8 @@ bool CharacterController::updateWeaponState()
         if(weapon != inv.end() && !(weaptype == WeapType_None && mWeaponType == WeapType_Spell))
         {
             std::string soundid = (weaptype == WeapType_None) ?
-                                   MWWorld::Class::get(*weapon).getDownSoundId(*weapon) :
-                                   MWWorld::Class::get(*weapon).getUpSoundId(*weapon);
+                                   weapon->getClass().getDownSoundId(*weapon) :
+                                   weapon->getClass().getUpSoundId(*weapon);
             if(!soundid.empty())
             {
                 MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
@@ -983,7 +983,7 @@ bool CharacterController::updateWeaponState()
 void CharacterController::update(float duration)
 {
     MWBase::World *world = MWBase::Environment::get().getWorld();
-    const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
+    const MWWorld::Class &cls = mPtr.getClass();
     Ogre::Vector3 movement(0.0f);
 
     updateVisibility();
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index d8dfa158db..3648877fdd 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -22,7 +22,7 @@ namespace MWMechanics
           mFallHeight(0), mRecalcDynamicStats(false), mKnockdown(false), mKnockdownOneFrame(false),
           mKnockdownOverOneFrame(false), mHitRecovery(false), mBlock(false),
           mMovementFlags(0), mDrawState (DrawState_Nothing), mAttackStrength(0.f),
-          mTradeTime(0,0), mGoldPool(0), mActorId(-1)
+          mLastRestock(0,0), mGoldPool(0), mActorId(-1)
     {
         for (int i=0; i<4; ++i)
             mAiSettings[i] = 0;
@@ -475,7 +475,7 @@ namespace MWMechanics
         for (int i=0; i<3; ++i)
             mDynamic[i].writeState (state.mDynamic[i]);
 
-        state.mTradeTime = mTradeTime.toEsm();
+        state.mTradeTime = mLastRestock.toEsm();
         state.mGoldPool = mGoldPool;
 
         state.mDead = mDead;
@@ -513,7 +513,7 @@ namespace MWMechanics
         for (int i=0; i<3; ++i)
             mDynamic[i].readState (state.mDynamic[i]);
 
-        mTradeTime = MWWorld::TimeStamp(state.mTradeTime);
+        mLastRestock = MWWorld::TimeStamp(state.mTradeTime);
         mGoldPool = state.mGoldPool;
         mFallHeight = state.mFallHeight;
 
@@ -544,15 +544,14 @@ namespace MWMechanics
         mActiveSpells.readState(state.mActiveSpells);
     }
 
-    // Relates to NPC gold reset delay
-    void CreatureStats::setTradeTime(MWWorld::TimeStamp tradeTime)
+    void CreatureStats::setLastRestockTime(MWWorld::TimeStamp tradeTime)
     {
-        mTradeTime = tradeTime;
+        mLastRestock = tradeTime;
     }
 
-    MWWorld::TimeStamp CreatureStats::getTradeTime() const
+    MWWorld::TimeStamp CreatureStats::getLastRestockTime() const
     {
-        return mTradeTime;
+        return mLastRestock;
     }
 
     void CreatureStats::setGoldPool(int pool)
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 7d2dc1a62a..70a86536a0 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -56,9 +56,12 @@ namespace MWMechanics
         // Do we need to recalculate stats derived from attributes or other factors?
         bool mRecalcDynamicStats;
 
-        MWWorld::TimeStamp mTradeTime; // Relates to NPC gold reset delay
+        // For merchants: the last time items were restocked and gold pool refilled.
+        MWWorld::TimeStamp mLastRestock;
+
+        // The pool of merchant gold (not in inventory)
+        int mGoldPool;
 
-        int mGoldPool; // the pool of merchant gold not in inventory
         int mActorId;
 
     protected:
@@ -241,9 +244,8 @@ namespace MWMechanics
         static void writeActorIdCounter (ESM::ESMWriter& esm);
         static void readActorIdCounter (ESM::ESMReader& esm);
 
-        // Relates to NPC gold reset delay
-        void setTradeTime(MWWorld::TimeStamp tradeTime);
-        MWWorld::TimeStamp getTradeTime() const;
+        void setLastRestockTime(MWWorld::TimeStamp tradeTime);
+        MWWorld::TimeStamp getLastRestockTime() const;
 
         void setGoldPool(int pool);
         int getGoldPool() const;
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 87337cdd70..23246c2945 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -52,7 +52,7 @@ namespace MWMechanics
     bool Enchanting::create()
     {
         const MWWorld::Ptr& player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
+        MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
         ESM::Enchantment enchantment;
         enchantment.mData.mCharge = getGemCharge();
 
@@ -67,7 +67,7 @@ namespace MWMechanics
             if(getEnchantChance()<std::rand()/static_cast<double> (RAND_MAX)*100)
                 return false;
 
-            MWWorld::Class::get (mEnchanter).skillUsageSucceeded (mEnchanter, ESM::Skill::Enchant, 2);
+            mEnchanter.getClass().skillUsageSucceeded (mEnchanter, ESM::Skill::Enchant, 2);
         }
 
         if(mCastStyle==ESM::Enchantment::ConstantEffect)
@@ -84,7 +84,7 @@ namespace MWMechanics
 
         // Apply the enchantment
         const ESM::Enchantment *enchantmentPtr = MWBase::Environment::get().getWorld()->createRecord (enchantment);
-        MWWorld::Class::get(newItemPtr).applyEnchantment(newItemPtr, enchantmentPtr->mId, getGemCharge(), mNewItemName);
+        newItemPtr.getClass().applyEnchantment(newItemPtr, enchantmentPtr->mId, getGemCharge(), mNewItemName);
 
         // Add the new item to player inventory and remove the old one
         store.remove(mOldItemPtr, 1, player);
@@ -212,7 +212,7 @@ namespace MWMechanics
 
         const float enchantCost = getEnchantPoints();
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWMechanics::NpcStats &stats = MWWorld::Class::get(player).getNpcStats(player);
+        MWMechanics::NpcStats &stats = player.getClass().getNpcStats(player);
         int eSkill = stats.getSkill(ESM::Skill::Enchant).getModified();
 
         /*
@@ -277,7 +277,7 @@ namespace MWMechanics
 
     float Enchanting::getEnchantChance() const
     {
-        const NpcStats& npcStats = MWWorld::Class::get (mEnchanter).getNpcStats (mEnchanter);
+        const NpcStats& npcStats = mEnchanter.getClass().getNpcStats (mEnchanter);
 
         float chance1 = (npcStats.getSkill (ESM::Skill::Enchant).getModified() + 
         (0.25 * npcStats.getAttribute (ESM::Attribute::Intelligence).getModified())
@@ -295,7 +295,7 @@ namespace MWMechanics
     void Enchanting::payForEnchantment() const
     {
         const MWWorld::Ptr& player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
+        MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
 
         store.remove(MWWorld::ContainerStore::sGoldId, getEnchantPrice(), player);
     }
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index bf9a11d6e5..5a72c88837 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -49,8 +49,8 @@ namespace MWMechanics
     {
         MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
-        MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get (ptr).getNpcStats (ptr);
+        MWMechanics::CreatureStats& creatureStats = ptr.getClass().getCreatureStats (ptr);
+        MWMechanics::NpcStats& npcStats = ptr.getClass().getNpcStats (ptr);
 
         const ESM::NPC *player = ptr.get<ESM::NPC>()->mBase;
 
@@ -215,7 +215,7 @@ namespace MWMechanics
 
     void MechanicsManager::add(const MWWorld::Ptr& ptr)
     {
-        if(MWWorld::Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
             mActors.addActor(ptr);
         else
             mObjects.addObject(ptr);
@@ -234,7 +234,7 @@ namespace MWMechanics
         if(old == mWatched)
             mWatched = ptr;
 
-        if(MWWorld::Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
             mActors.updateActor(old, ptr);
         else
             mObjects.updateObject(old, ptr);
@@ -475,13 +475,13 @@ namespace MWMechanics
 
     int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
     {
-        const MWMechanics::NpcStats& npcSkill = MWWorld::Class::get(ptr).getNpcStats(ptr);
+        const MWMechanics::NpcStats& npcSkill = ptr.getClass().getNpcStats(ptr);
         float x = npcSkill.getBaseDisposition();
 
         MWWorld::LiveCellRef<ESM::NPC>* npc = ptr.get<ESM::NPC>();
         MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
         MWWorld::LiveCellRef<ESM::NPC>* player = playerPtr.get<ESM::NPC>();
-        const MWMechanics::NpcStats &playerStats = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
+        const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
         if (Misc::StringUtils::ciEqual(npc->mBase->mRace, player->mBase->mRace))
             x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispRaceMod")->getFloat();
@@ -547,10 +547,10 @@ namespace MWMechanics
         if (ptr.getTypeName() == typeid(ESM::Creature).name())
             return basePrice;
 
-        const MWMechanics::NpcStats &sellerStats = MWWorld::Class::get(ptr).getNpcStats(ptr);
+        const MWMechanics::NpcStats &sellerStats = ptr.getClass().getNpcStats(ptr);
 
         MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const MWMechanics::NpcStats &playerStats = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
+        const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
         // I suppose the temporary disposition change _has_ to be considered here,
         // otherwise one would get different prices when exiting and re-entering the dialogue window...
@@ -592,10 +592,10 @@ namespace MWMechanics
         const MWWorld::Store<ESM::GameSetting> &gmst =
             MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(npc).getNpcStats(npc);
+        MWMechanics::NpcStats& npcStats = npc.getClass().getNpcStats(npc);
 
         MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const MWMechanics::NpcStats &playerStats = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
+        const MWMechanics::NpcStats &playerStats = playerPtr.getClass().getNpcStats(playerPtr);
 
         float persTerm = playerStats.getAttribute(ESM::Attribute::Personality).getModified()
                             / gmst.find("fPersonalityMod")->getFloat();
@@ -741,27 +741,27 @@ namespace MWMechanics
 
     void MechanicsManager::forceStateUpdate(const MWWorld::Ptr &ptr)
     {
-        if(MWWorld::Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
             mActors.forceStateUpdate(ptr);
     }
 
     void MechanicsManager::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number)
     {
-        if(MWWorld::Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
             mActors.playAnimationGroup(ptr, groupName, mode, number);
         else
             mObjects.playAnimationGroup(ptr, groupName, mode, number);
     }
     void MechanicsManager::skipAnimation(const MWWorld::Ptr& ptr)
     {
-        if(MWWorld::Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
             mActors.skipAnimation(ptr);
         else
             mObjects.skipAnimation(ptr);
     }
     bool MechanicsManager::checkAnimationPlaying(const MWWorld::Ptr& ptr, const std::string &groupName)
     {
-        if(MWWorld::Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
             return mActors.checkAnimationPlaying(ptr, groupName);
         else
             return false;
diff --git a/apps/openmw/mwmechanics/repair.cpp b/apps/openmw/mwmechanics/repair.cpp
index 48179d3442..dc8b567a9b 100644
--- a/apps/openmw/mwmechanics/repair.cpp
+++ b/apps/openmw/mwmechanics/repair.cpp
@@ -31,8 +31,8 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
     int uses = (mTool.getCellRef().mCharge != -1) ? mTool.getCellRef().mCharge : ref->mBase->mData.mUses;
     mTool.getCellRef().mCharge = uses-1;
 
-    MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
-    MWMechanics::NpcStats& npcStats = MWWorld::Class::get(player).getNpcStats(player);
+    MWMechanics::CreatureStats& stats = player.getClass().getCreatureStats(player);
+    MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats(player);
 
     float fatigueTerm = stats.getFatigueTerm();
     int pcStrength = stats.getAttribute(ESM::Attribute::Strength).getModified();
@@ -55,15 +55,15 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
         // repair by 'y' points
         itemToRepair.getCellRef().mCharge += y;
         itemToRepair.getCellRef().mCharge = std::min(itemToRepair.getCellRef().mCharge,
-                                                     MWWorld::Class::get(itemToRepair).getItemMaxHealth(itemToRepair));
+                                                     itemToRepair.getClass().getItemMaxHealth(itemToRepair));
 
         // set the OnPCRepair variable on the item's script
-        std::string script = MWWorld::Class::get(itemToRepair).getScript(itemToRepair);
+        std::string script = itemToRepair.getClass().getScript(itemToRepair);
         if(script != "")
             itemToRepair.getRefData().getLocals().setVarByInt(script, "onpcrepair", 1);
 
         // increase skill
-        MWWorld::Class::get(player).skillUsageSucceeded(player, ESM::Skill::Armorer, 0);
+        player.getClass().skillUsageSucceeded(player, ESM::Skill::Armorer, 0);
 
         MWBase::Environment::get().getSoundManager()->playSound("Repair",1,1);
         MWBase::Environment::get().getWindowManager()->messageBox("#{sRepairSuccess}");
@@ -78,14 +78,14 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
     if (mTool.getCellRef().mCharge == 0)
     {
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        MWWorld::ContainerStore& store = MWWorld::Class::get(player).getContainerStore(player);
+        MWWorld::ContainerStore& store = player.getClass().getContainerStore(player);
 
         store.remove(mTool, 1, player);
 
         std::string message = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
                 .find("sNotifyMessage51")->getString();
 
-        MWBase::Environment::get().getWindowManager()->messageBox((boost::format(message) % MWWorld::Class::get(mTool).getName(mTool)).str());
+        MWBase::Environment::get().getWindowManager()->messageBox((boost::format(message) % mTool.getClass().getName(mTool)).str());
 
         // try to find a new tool of the same ID
         for (MWWorld::ContainerStoreIterator iter (store.begin());
diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp
index 3751e58285..bb2e942238 100644
--- a/apps/openmw/mwmechanics/security.cpp
+++ b/apps/openmw/mwmechanics/security.cpp
@@ -18,8 +18,8 @@ namespace MWMechanics
     Security::Security(const MWWorld::Ptr &actor)
         : mActor(actor)
     {
-        CreatureStats& creatureStats = MWWorld::Class::get(actor).getCreatureStats(actor);
-        NpcStats& npcStats = MWWorld::Class::get(actor).getNpcStats(actor);
+        CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
+        NpcStats& npcStats = actor.getClass().getNpcStats(actor);
         mAgility = creatureStats.getAttribute(ESM::Attribute::Agility).getModified();
         mLuck = creatureStats.getAttribute(ESM::Attribute::Luck).getModified();
         mSecuritySkill = npcStats.getSkill(ESM::Skill::Security).getModified();
@@ -51,10 +51,10 @@ namespace MWMechanics
             int roll = static_cast<float> (std::rand()) / RAND_MAX * 100;
             if (roll <= x)
             {
-                MWWorld::Class::get(lock).unlock(lock);
+                lock.getClass().unlock(lock);
                 resultMessage = "#{sLockSuccess}";
                 resultSound = "Open Lock";
-                MWWorld::Class::get(mActor).skillUsageSucceeded(mActor, ESM::Skill::Security, 1);
+                mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, 1);
             }
             else
                 resultMessage = "#{sLockFail}";
@@ -97,7 +97,7 @@ namespace MWMechanics
 
                 resultSound = "Disarm Trap";
                 resultMessage = "#{sTrapSuccess}";
-                MWWorld::Class::get(mActor).skillUsageSucceeded(mActor, ESM::Skill::Security, 0);
+                mActor.getClass().skillUsageSucceeded(mActor, ESM::Skill::Security, 0);
             }
             else
                 resultMessage = "#{sTrapFail}";
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 0843e3e547..91a81c74be 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -21,6 +21,41 @@
 #include "magiceffects.hpp"
 #include "npcstats.hpp"
 
+namespace
+{
+
+    /// Get projectile properties (model, sound and speed) for a spell with the given effects
+    /// If \a model is empty, the spell has no ranged effects and should not spawn a projectile.
+    void getProjectileInfo (const ESM::EffectList& effects, std::string& model, std::string& sound, float& speed)
+    {
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
+            iter!=effects.mList.end(); ++iter)
+        {
+            if (iter->mRange != ESM::RT_Target)
+                continue;
+
+            const ESM::MagicEffect *magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find (
+                iter->mEffectID);
+
+            model = magicEffect->mBolt;
+            if (model.empty())
+                model = "VFX_DefaultBolt";
+
+            static const std::string schools[] = {
+                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+            };
+            if (!magicEffect->mBoltSound.empty())
+                sound = magicEffect->mBoltSound;
+            else
+                sound = schools[magicEffect->mData.mSchool] + " bolt";
+
+            speed = magicEffect->mData.mSpeed;
+            break;
+        }
+    }
+
+}
+
 namespace MWMechanics
 {
 
@@ -409,7 +444,7 @@ namespace MWMechanics
         }
 
         if (!exploded)
-            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, mTarget, effects, caster, mId, mSourceName);
+            MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, effects, caster, mId, mSourceName);
 
         if (!reflectedEffects.mList.empty())
             inflict(caster, target, reflectedEffects, range, true);
@@ -603,7 +638,13 @@ namespace MWMechanics
                 inflict(mTarget, mCaster, enchantment->mEffects, ESM::RT_Touch);
         }
 
-        MWBase::Environment::get().getWorld()->launchMagicBolt(mId, false, enchantment->mEffects, mCaster, mSourceName);
+        std::string projectileModel;
+        std::string sound;
+        float speed = 0;
+        getProjectileInfo(enchantment->mEffects, projectileModel, sound, speed);
+        if (!projectileModel.empty())
+            MWBase::Environment::get().getWorld()->launchMagicBolt(projectileModel, sound, mId, speed,
+                                                               false, enchantment->mEffects, mCaster, mSourceName);
 
         return true;
     }
@@ -682,7 +723,15 @@ namespace MWMechanics
             }
         }
 
-        MWBase::Environment::get().getWorld()->launchMagicBolt(mId, false, spell->mEffects, mCaster, mSourceName);
+
+        std::string projectileModel;
+        std::string sound;
+        float speed = 0;
+        getProjectileInfo(spell->mEffects, projectileModel, sound, speed);
+        if (!projectileModel.empty())
+            MWBase::Environment::get().getWorld()->launchMagicBolt(projectileModel, sound, mId, speed,
+                                                               false, spell->mEffects, mCaster, mSourceName);
+
         return true;
     }
 
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 013e3daf4f..5e88b22505 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -118,7 +118,7 @@ namespace MWRender
                                       0, true, (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));
 
         float scale=1.f;
-        MWWorld::Class::get(mCharacter).adjustScale(mCharacter, scale);
+        mCharacter.getClass().adjustScale(mCharacter, scale);
         mNode->setScale(Ogre::Vector3(scale));
 
         mCamera->setPosition(mPosition * mNode->getScale());
diff --git a/apps/openmw/mwrender/effectmanager.cpp b/apps/openmw/mwrender/effectmanager.cpp
index 1e6119daac..968be0f9e9 100644
--- a/apps/openmw/mwrender/effectmanager.cpp
+++ b/apps/openmw/mwrender/effectmanager.cpp
@@ -11,18 +11,6 @@
 namespace MWRender
 {
 
-class EffectAnimationTime : public Ogre::ControllerValue<Ogre::Real>
-{
-private:
-    float mTime;
-public:
-    EffectAnimationTime() : mTime(0) {  }
-    void addTime(float time) { mTime += time; }
-
-    virtual Ogre::Real getValue() const { return mTime; }
-    virtual void setValue(Ogre::Real value) {}
-};
-
 EffectManager::EffectManager(Ogre::SceneManager *sceneMgr)
     : mSceneMgr(sceneMgr)
 {
diff --git a/apps/openmw/mwrender/effectmanager.hpp b/apps/openmw/mwrender/effectmanager.hpp
index bc9e68d269..eb68636555 100644
--- a/apps/openmw/mwrender/effectmanager.hpp
+++ b/apps/openmw/mwrender/effectmanager.hpp
@@ -5,6 +5,20 @@
 
 namespace MWRender
 {
+
+    class EffectAnimationTime : public Ogre::ControllerValue<Ogre::Real>
+    {
+    private:
+        float mTime;
+    public:
+        EffectAnimationTime() : mTime(0) {  }
+        void addTime(float time) { mTime += time; }
+
+        virtual Ogre::Real getValue() const { return mTime; }
+        virtual void setValue(Ogre::Real value) {}
+    };
+
+
     // Note: effects attached to another object should be managed by MWRender::Animation::addEffect.
     // This class manages "free" effects, i.e. attached to a dedicated scene node in the world.
     class EffectManager
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 14f5cc4e7f..03ccde388b 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -237,7 +237,7 @@ void NpcAnimation::updateNpcBase()
 void NpcAnimation::updateParts()
 {    
     mAlpha = 1.f;
-    const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
+    const MWWorld::Class &cls = mPtr.getClass();
     MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
 
     NpcType curType = Type_Normal;
@@ -668,12 +668,12 @@ void NpcAnimation::showWeapons(bool showWeapon)
     mShowWeapons = showWeapon;
     if(showWeapon)
     {
-        MWWorld::InventoryStore &inv = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
+        MWWorld::InventoryStore &inv = mPtr.getClass().getInventoryStore(mPtr);
         MWWorld::ContainerStoreIterator weapon = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
         if(weapon != inv.end())
         {
             Ogre::Vector3 glowColor = getEnchantmentColor(*weapon);
-            std::string mesh = MWWorld::Class::get(*weapon).getModel(*weapon);
+            std::string mesh = weapon->getClass().getModel(*weapon);
             addOrReplaceIndividualPart(ESM::PRT_Weapon, MWWorld::InventoryStore::Slot_CarriedRight, 1,
                                        mesh, !weapon->getClass().getEnchantment(*weapon).empty(), &glowColor);
 
@@ -701,13 +701,13 @@ void NpcAnimation::showWeapons(bool showWeapon)
 void NpcAnimation::showCarriedLeft(bool show)
 {
     mShowCarriedLeft = show;
-    MWWorld::InventoryStore &inv = MWWorld::Class::get(mPtr).getInventoryStore(mPtr);
+    MWWorld::InventoryStore &inv = mPtr.getClass().getInventoryStore(mPtr);
     MWWorld::ContainerStoreIterator iter = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
 
     if(show && iter != inv.end())
     {
         Ogre::Vector3 glowColor = getEnchantmentColor(*iter);
-        std::string mesh = MWWorld::Class::get(*iter).getModel(*iter);
+        std::string mesh = iter->getClass().getModel(*iter);
         if (addOrReplaceIndividualPart(ESM::PRT_Shield, MWWorld::InventoryStore::Slot_CarriedLeft, 1,
                                    mesh, !iter->getClass().getEnchantment(*iter).empty(), &glowColor))
         {
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index a3c53dc444..882a3d09bf 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -234,9 +234,9 @@ void RenderingManager::removeWater ()
     mWater->setActive(false);
 }
 
-void RenderingManager::toggleWater()
+bool RenderingManager::toggleWater()
 {
-    mWater->toggle();
+    return mWater->toggle();
 }
 
 void RenderingManager::cellAdded (MWWorld::CellStore *store)
@@ -249,7 +249,7 @@ void RenderingManager::cellAdded (MWWorld::CellStore *store)
 
 void RenderingManager::addObject (const MWWorld::Ptr& ptr){
     const MWWorld::Class& class_ =
-            MWWorld::Class::get (ptr);
+            ptr.getClass();
     class_.insertObjectRendering(ptr, *this);
 }
 
@@ -279,7 +279,7 @@ void RenderingManager::rotateObject(const MWWorld::Ptr &ptr)
         mCamera->rotateCamera(-rot, false);
 
     Ogre::Quaternion newo = Ogre::Quaternion(Ogre::Radian(rot.z), Ogre::Vector3::NEGATIVE_UNIT_Z);
-    if(!MWWorld::Class::get(ptr).isActor())
+    if(!ptr.getClass().isActor())
         newo = Ogre::Quaternion(Ogre::Radian(rot.x), Ogre::Vector3::NEGATIVE_UNIT_X) *
                Ogre::Quaternion(Ogre::Radian(rot.y), Ogre::Vector3::NEGATIVE_UNIT_Y) * newo;
     ptr.getRefData().getBaseNode()->setOrientation(newo);
@@ -294,7 +294,7 @@ RenderingManager::updateObjectCell(const MWWorld::Ptr &old, const MWWorld::Ptr &
     Ogre::SceneNode *parent = child->getParentSceneNode();
     parent->removeChild(child);
 
-    if (MWWorld::Class::get(old).isActor()) {
+    if (old.getClass().isActor()) {
         mActors->updateObjectCell(old, cur);
     } else {
         mObjects->updateObjectCell(old, cur);
@@ -314,7 +314,7 @@ void RenderingManager::rebuildPtr(const MWWorld::Ptr &ptr)
     NpcAnimation *anim = NULL;
     if(ptr.getRefData().getHandle() == "player")
         anim = mPlayerAnimation;
-    else if(MWWorld::Class::get(ptr).isActor())
+    else if(ptr.getClass().isActor())
         anim = dynamic_cast<NpcAnimation*>(mActors->getAnimation(ptr));
     if(anim)
     {
@@ -337,7 +337,7 @@ void RenderingManager::update (float duration, bool paused)
 
     MWWorld::Ptr player = world->getPlayerPtr();
 
-    int blind = MWWorld::Class::get(player).getCreatureStats(player).getMagicEffects().get(ESM::MagicEffect::Blind).mMagnitude;
+    int blind = player.getClass().getCreatureStats(player).getMagicEffects().get(ESM::MagicEffect::Blind).mMagnitude;
     mRendering.getFader()->setFactor(std::max(0.f, 1.f-(blind / 100.f)));
     setAmbientMode();
 
@@ -599,7 +599,7 @@ void RenderingManager::setAmbientColour(const Ogre::ColourValue& colour)
     mAmbientColor = colour;
 
     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-    int nightEye = MWWorld::Class::get(player).getCreatureStats(player).getMagicEffects().get(ESM::MagicEffect::NightEye).mMagnitude;
+    int nightEye = player.getClass().getCreatureStats(player).getMagicEffects().get(ESM::MagicEffect::NightEye).mMagnitude;
     Ogre::ColourValue final = colour;
     final += Ogre::ColourValue(0.7,0.7,0.7,0) * std::min(1.f, (nightEye/100.f));
 
@@ -694,15 +694,8 @@ Shadows* RenderingManager::getShadows()
     return mShadows;
 }
 
-void RenderingManager::switchToInterior()
+void RenderingManager::notifyWorldSpaceChanged()
 {
-    // TODO: also do this when switching worldspace
-    mEffectManager->clear();
-}
-
-void RenderingManager::switchToExterior()
-{
-    // TODO: also do this when switching worldspace
     mEffectManager->clear();
 }
 
@@ -1061,6 +1054,7 @@ void RenderingManager::spawnEffect(const std::string &model, const std::string &
 void RenderingManager::clear()
 {
     mLocalMap->clear();
+    notifyWorldSpaceChanged();
 }
 
 } // namespace
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index eb68272925..f539f9270f 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -127,7 +127,7 @@ public:
     void rotateObject (const MWWorld::Ptr& ptr);
 
     void setWaterHeight(const float height);
-    void toggleWater();
+    bool toggleWater();
 
     /// Updates object rendering after cell change
     /// \param old Object reference in previous cell
@@ -163,8 +163,7 @@ public:
 
     Shadows* getShadows();
 
-    void switchToInterior();
-    void switchToExterior();
+    void notifyWorldSpaceChanged();
 
     void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches);
 
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 5368cbe687..2cbc4462c3 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -326,10 +326,11 @@ void Water::setHeight(const float height)
     sh::Factory::getInstance ().setSharedParameter ("waterLevel", sh::makeProperty<sh::FloatValue>(new sh::FloatValue(height)));
 }
 
-void Water::toggle()
+bool Water::toggle()
 {
     mToggled = !mToggled;
     updateVisible();
+    return mToggled;
 }
 
 void
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 481a412977..6a7b05a3aa 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -150,7 +150,7 @@ namespace MWRender {
 
         void setActive(bool active);
 
-        void toggle();
+        bool toggle();
         void update(float dt, Ogre::Vector3 player);
         void frameStarted(float dt);
 
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 695954bc20..cc17905df6 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -47,7 +47,7 @@ namespace MWScript
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     MWMechanics::AiActivate activatePackage(objectID);
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(activatePackage, ptr);
+                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(activatePackage, ptr);
                     std::cout << "AiActivate" << std::endl;
                 }
         };
@@ -74,7 +74,7 @@ namespace MWScript
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     MWMechanics::AiTravel travelPackage(x, y, z);
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(travelPackage, ptr);
+                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(travelPackage, ptr);
 
                     std::cout << "AiTravel: " << x << ", " << y << ", " << z << std::endl;
                 }
@@ -91,7 +91,6 @@ namespace MWScript
 
                     std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
-                    MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->getPtr(actorID, true);
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
                     runtime.pop();
@@ -108,8 +107,8 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
-                    MWMechanics::AiEscort escortPackage(actor, duration, x, y, z);
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
+                    MWMechanics::AiEscort escortPackage(actorID, duration, x, y, z);
+                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
 
                     std::cout << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration
                         << std::endl;
@@ -127,7 +126,6 @@ namespace MWScript
 
                     std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
-                    MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->getPtr(actorID, true);
 
                     std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
@@ -147,8 +145,8 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
-                    MWMechanics::AiEscort escortPackage(actor, cellID, duration, x, y, z);
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
+                    MWMechanics::AiEscort escortPackage(actorID, cellID, duration, x, y, z);
+                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(escortPackage, ptr);
 
                     std::cout << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration
                         << std::endl;
@@ -164,7 +162,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().isPackageDone();
+                    Interpreter::Type_Integer value = ptr.getClass().getCreatureStats (ptr).getAiSequence().isPackageDone();
 
                     runtime.push (value);
                 }
@@ -212,7 +210,7 @@ namespace MWScript
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
                     MWMechanics::AiWander wanderPackage(range, duration, time, idleList, repeat);
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(wanderPackage, ptr);
+                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(wanderPackage, ptr);
                 }
         };
 
@@ -227,7 +225,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSetting (
+                    runtime.push(ptr.getClass().getCreatureStats (ptr).getAiSetting (
                                      (MWMechanics::CreatureStats::AiSetting)mIndex).getModified());
                 }
         };
@@ -247,8 +245,8 @@ namespace MWScript
                     MWMechanics::CreatureStats::AiSetting setting
                             = MWMechanics::CreatureStats::AiSetting(mIndex);
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (setting,
-                        MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSetting (setting).getBase() + value);
+                    ptr.getClass().getCreatureStats (ptr).setAiSetting (setting,
+                        ptr.getClass().getCreatureStats (ptr).getAiSetting (setting).getBase() + value);
                 }
         };
         template<class R>
@@ -283,7 +281,6 @@ namespace MWScript
 
                     std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
-                    MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->getPtr(actorID, true);
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
                     runtime.pop();
@@ -300,8 +297,8 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
-                    MWMechanics::AiFollow followPackage(actor, duration, x, y ,z);
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
+                    MWMechanics::AiFollow followPackage(actorID, duration, x, y ,z);
+                    ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
 
                     std::cout << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration
                         << std::endl;
@@ -319,7 +316,6 @@ namespace MWScript
 
                     std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
-                    MWWorld::Ptr actor = MWBase::Environment::get().getWorld()->getPtr(actorID, true);
 
                     std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
@@ -339,7 +335,7 @@ namespace MWScript
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
-                    MWMechanics::AiFollow followPackage(actor, cellID, duration, x, y ,z);
+                    MWMechanics::AiFollow followPackage(actorID, cellID, duration, x, y ,z);
                     ptr.getClass().getCreatureStats (ptr).getAiSequence().stack(followPackage, ptr);
                     std::cout << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration
                         << std::endl;
@@ -355,7 +351,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().getLastRunTypeId();
+                    Interpreter::Type_Integer value = ptr.getClass().getCreatureStats (ptr).getAiSequence().getLastRunTypeId();
 
                     runtime.push (value);
                 }
@@ -415,7 +411,7 @@ namespace MWScript
                     std::string testedTargetId = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    const MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get(actor).getCreatureStats(actor);
+                    const MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
                     std::string currentTargetId;
 
                     bool targetsAreEqual = false;
@@ -451,7 +447,7 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr actor = R()(runtime);
-                    MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get(actor).getCreatureStats(actor);
+                    MWMechanics::CreatureStats& creatureStats = actor.getClass().getCreatureStats(actor);
                     creatureStats.getAiSequence().stopCombat();
                     creatureStats.setHostile(false);
                 }
diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp
index 903612258e..825d62efb5 100644
--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@@ -104,6 +104,11 @@ namespace MWScript
                     std::string name = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
+                    if (!MWBase::Environment::get().getWorld()->getPlayerPtr().isInCell())
+                    {
+                        runtime.push(0);
+                        return;
+                    }
                     const ESM::Cell *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell();
 
                     std::string current = cell->mName;
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 1b3e769bf1..3ff75eeae8 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -45,7 +45,7 @@ namespace MWScript
         {
             MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPtr (id, false);
 
-            script = MWWorld::Class::get (ptr).getScript (ptr);
+            script = ptr.getClass().getScript (ptr);
             reference = true;
         }
 
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 66c8d44687..6737d6a945 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -117,7 +117,7 @@ namespace MWScript
                     if (count == 0)
                         return;
 
-                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
 
                     std::string itemName;
                     for (MWWorld::ContainerStoreIterator iter(store.begin()); iter != store.end(); ++iter)
@@ -231,7 +231,7 @@ namespace MWScript
                             throw std::runtime_error ("armor index out of range");
                     }
 
-                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
 
                     MWWorld::ContainerStoreIterator it = invStore.getSlot (slot);
                     if (it == invStore.end() || it->getTypeName () != typeid(ESM::Armor).name())
@@ -240,7 +240,7 @@ namespace MWScript
                         return;
                     }
 
-                    int skill = MWWorld::Class::get(*it).getEquipmentSkill (*it) ;
+                    int skill = it->getClass().getEquipmentSkill (*it) ;
                     if (skill == ESM::Skill::HeavyArmor)
                         runtime.push(2);
                     else if (skill == ESM::Skill::MediumArmor)
@@ -264,7 +264,7 @@ namespace MWScript
                     std::string item = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
                     for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
                     {
                         MWWorld::ContainerStoreIterator it = invStore.getSlot (slot);
@@ -290,7 +290,7 @@ namespace MWScript
                     const std::string &name = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
                     for (MWWorld::ContainerStoreIterator it = invStore.begin(MWWorld::ContainerStore::Type_Miscellaneous);
                          it != invStore.end(); ++it)
                     {
@@ -314,7 +314,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore (ptr);
                     MWWorld::ContainerStoreIterator it = invStore.getSlot (MWWorld::InventoryStore::Slot_CarriedRight);
                     if (it == invStore.end() || it->getTypeName () != typeid(ESM::Weapon).name())
                     {
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index a882ae05e7..993e99c2e6 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -141,7 +141,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get(ptr).getNpcStats (ptr).setReputation (MWWorld::Class::get(ptr).getNpcStats (ptr).getReputation () + value);
+                    ptr.getClass().getNpcStats (ptr).setReputation (ptr.getClass().getNpcStats (ptr).getReputation () + value);
                 }
         };
 
@@ -156,7 +156,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get(ptr).getNpcStats (ptr).setReputation (value);
+                    ptr.getClass().getNpcStats (ptr).setReputation (value);
                 }
         };
 
@@ -169,7 +169,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).getReputation ());
+                    runtime.push (ptr.getClass().getNpcStats (ptr).getReputation ());
                 }
         };
 
@@ -184,7 +184,7 @@ namespace MWScript
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
 
-                    runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).isSameFaction (MWWorld::Class::get(player).getNpcStats (player)));
+                    runtime.push (ptr.getClass().getNpcStats (ptr).isSameFaction (player.getClass().getNpcStats (player)));
                 }
         };
 
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index 57fc2d4707..be241a5649 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -92,7 +92,8 @@ namespace MWScript
 
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
-                    MWBase::Environment::get().getWindowManager()->toggleFogOfWar();
+                    runtime.getContext().report(MWBase::Environment::get().getWindowManager()->toggleFogOfWar() ? "Fog of war -> On"
+                                                                                                                : "Fog of war -> Off");
                 }
         };
 
@@ -102,7 +103,8 @@ namespace MWScript
 
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
-                    MWBase::Environment::get().getWindowManager()->toggleFullHelp();
+                    runtime.getContext().report(MWBase::Environment::get().getWindowManager()->toggleFullHelp() ? "Full help -> On"
+                                                                                                                : "Full help -> Off");
                 }
         };
 
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 1f5ad5b071..6f7968fac8 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -66,7 +66,7 @@ namespace MWScript
         {
             const MWWorld::Ptr ptr = getReference (id, false);
 
-             id = MWWorld::Class::get (ptr).getScript (ptr);
+             id = ptr.getClass().getScript (ptr);
 
             ptr.getRefData().setLocals (
                 *MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find (id));
@@ -86,7 +86,7 @@ namespace MWScript
         {
             const MWWorld::Ptr ptr = getReference (id, false);
 
-            id = MWWorld::Class::get (ptr).getScript (ptr);
+            id = ptr.getClass().getScript (ptr);
 
             ptr.getRefData().setLocals (
                 *MWBase::Environment::get().getWorld()->getStore().get<ESM::Script>().find (id));
@@ -263,7 +263,7 @@ namespace MWScript
 
     std::string InterpreterContext::getNPCRank() const
     {
-        std::map<std::string, int> ranks = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks();
+        std::map<std::string, int> ranks = mReference.getClass().getNpcStats (mReference).getFactionRanks();
         std::map<std::string, int>::const_iterator it = ranks.begin();
 
         MWBase::World *world = MWBase::Environment::get().getWorld();
@@ -299,9 +299,9 @@ namespace MWScript
         MWBase::World *world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
 
-        std::string factionId = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks().begin()->first;
+        std::string factionId = mReference.getClass().getNpcStats (mReference).getFactionRanks().begin()->first;
 
-        std::map<std::string, int> ranks = MWWorld::Class::get (player).getNpcStats (player).getFactionRanks();
+        std::map<std::string, int> ranks = player.getClass().getNpcStats (player).getFactionRanks();
         std::map<std::string, int>::const_iterator it = ranks.find(factionId);
         int rank = -1;
         if (it != ranks.end())
@@ -326,9 +326,9 @@ namespace MWScript
         MWBase::World *world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
 
-        std::string factionId = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks().begin()->first;
+        std::string factionId = mReference.getClass().getNpcStats (mReference).getFactionRanks().begin()->first;
 
-        std::map<std::string, int> ranks = MWWorld::Class::get (player).getNpcStats (player).getFactionRanks();
+        std::map<std::string, int> ranks = player.getClass().getNpcStats (player).getFactionRanks();
         std::map<std::string, int>::const_iterator it = ranks.find(factionId);
         int rank = -1;
         if (it != ranks.end())
@@ -353,7 +353,7 @@ namespace MWScript
     {
         MWBase::World *world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayerPtr();
-        return MWWorld::Class::get (player).getNpcStats (player).getBounty();
+        return player.getClass().getNpcStats (player).getBounty();
     }
 
     std::string InterpreterContext::getCurrentCellName() const
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 20013493f2..b0d73253ff 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -142,7 +142,7 @@ namespace MWScript
                         runtime.pop();
                     }
 
-                    MWWorld::Class::get (ptr).lock (ptr, lockLevel);
+                    ptr.getClass().lock (ptr, lockLevel);
                 }
         };
 
@@ -155,7 +155,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    MWWorld::Class::get (ptr).unlock (ptr);
+                    ptr.getClass().unlock (ptr);
                 }
         };
 
@@ -275,7 +275,8 @@ namespace MWScript
 
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
-                    MWBase::Environment::get().getWorld()->toggleWater();
+                    runtime.getContext().report(MWBase::Environment::get().getWorld()->toggleWater() ? "Water -> On"
+                                                                                                     : "Water -> Off");
                 }
         };
 
@@ -344,7 +345,7 @@ namespace MWScript
                     if(key < 0 || key > 32767 || *end != '\0')
                         key = ESM::MagicEffect::effectStringToId(effect);
 
-                    runtime.push(MWWorld::Class::get(ptr).getCreatureStats(ptr).getMagicEffects().get(
+                    runtime.push(ptr.getClass().getCreatureStats(ptr).getMagicEffects().get(
                                       MWMechanics::EffectKey(key)).mMagnitude > 0);
                 }
         };
@@ -388,7 +389,7 @@ namespace MWScript
                     for (unsigned int i=0; i<arg0; ++i)
                         runtime.pop();
 
-                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
                     for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
                     {
                         if (::Misc::StringUtils::ciEqual(it->getCellRef().mSoul, soul))
@@ -423,7 +424,7 @@ namespace MWScript
                     if (amount == 0)
                         return;
 
-                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
 
 
                     int toRemove = amount;
@@ -456,7 +457,7 @@ namespace MWScript
                     std::string soul = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+                    MWWorld::ContainerStore& store = ptr.getClass().getContainerStore (ptr);
 
 
                     for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
@@ -480,7 +481,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push(MWWorld::Class::get(ptr).getCreatureStats (ptr).getAttacked ());
+                    runtime.push(ptr.getClass().getCreatureStats (ptr).getAttacked ());
                 }
         };
 
@@ -521,7 +522,7 @@ namespace MWScript
                     std::string id = runtime.getStringLiteral(runtime[0].mInteger);
                     runtime.pop();
 
-                    runtime.push(MWWorld::Class::get(ptr).getCreatureStats(ptr).getActiveSpells().isSpellActive(id));
+                    runtime.push(ptr.getClass().getCreatureStats(ptr).getActiveSpells().isSpellActive(id));
                 }
         };
 
@@ -620,7 +621,7 @@ namespace MWScript
                     std::string objectID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWMechanics::CreatureStats &stats = MWWorld::Class::get(ptr).getCreatureStats(ptr);
+                    MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
                     runtime.push(::Misc::StringUtils::ciEqual(objectID, stats.getLastHitObject()));
                 }
         };
@@ -656,7 +657,7 @@ namespace MWScript
             {
                 std::stringstream str;
 
-                const std::string script = MWWorld::Class::get(ptr).getScript(ptr);
+                const std::string script = ptr.getClass().getScript(ptr);
                 if(script.empty())
                     str<< ptr.getCellRef().mRefID<<" ("<<ptr.getRefData().getHandle()<<") does not have a script.";
                 else
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 2f584e7edf..d9c9e5e0b3 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -31,7 +31,7 @@ namespace
 {
     std::string getDialogueActorFaction(MWWorld::Ptr actor)
     {
-        const MWMechanics::NpcStats &stats = MWWorld::Class::get (actor).getNpcStats (actor);
+        const MWMechanics::NpcStats &stats = actor.getClass().getNpcStats (actor);
 
         if (stats.getFactionRanks().empty())
             throw std::runtime_error (
@@ -55,7 +55,7 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     Interpreter::Type_Integer value =
-                        MWWorld::Class::get (ptr)
+                        ptr.getClass()
                             .getCreatureStats (ptr)
                             .getLevel();
 
@@ -75,7 +75,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr)
+                    ptr.getClass()
                         .getCreatureStats (ptr)
                         .setLevel(value);
                 }
@@ -95,7 +95,7 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     Interpreter::Type_Integer value =
-                        MWWorld::Class::get (ptr)
+                        ptr.getClass()
                             .getCreatureStats (ptr)
                             .getAttribute(mIndex)
                             .getModified();
@@ -142,7 +142,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWMechanics::AttributeValue attribute = MWWorld::Class::get(ptr)
+                    MWMechanics::AttributeValue attribute = ptr.getClass()
                         .getCreatureStats(ptr)
                         .getAttribute(mIndex);
 
@@ -165,13 +165,13 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
                     Interpreter::Type_Float value;
 
-                    if (mIndex==0 && MWWorld::Class::get (ptr).hasItemHealth (ptr))
+                    if (mIndex==0 && ptr.getClass().hasItemHealth (ptr))
                     {
                         // health is a special case
-                        value = MWWorld::Class::get (ptr).getItemMaxHealth (ptr);
+                        value = ptr.getClass().getItemMaxHealth (ptr);
                     } else {
                         value =
-                            MWWorld::Class::get(ptr)
+                            ptr.getClass()
                                 .getCreatureStats(ptr)
                                 .getDynamic(mIndex)
                                 .getCurrent();
@@ -196,13 +196,13 @@ namespace MWScript
                     Interpreter::Type_Float value = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWMechanics::DynamicStat<float> stat (MWWorld::Class::get (ptr).getCreatureStats (ptr)
+                    MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
                         .getDynamic (mIndex));
 
                     stat.setModified (value, 0);
                     stat.setCurrent(value);
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setDynamic (mIndex, stat);
+                    ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
                 }
         };
 
@@ -222,18 +222,18 @@ namespace MWScript
                     Interpreter::Type_Float diff = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWMechanics::CreatureStats& stats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
+                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
 
                     Interpreter::Type_Float current = stats.getDynamic(mIndex).getCurrent();
 
-                    MWMechanics::DynamicStat<float> stat (MWWorld::Class::get (ptr).getCreatureStats (ptr)
+                    MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
                         .getDynamic (mIndex));
 
                     stat.setModified (diff + stat.getModified(), 0);
 
                     stat.setCurrent (diff + current);
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setDynamic (mIndex, stat);
+                    ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
                 }
         };
 
@@ -253,16 +253,16 @@ namespace MWScript
                     Interpreter::Type_Float diff = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWMechanics::CreatureStats& stats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
+                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
 
                     Interpreter::Type_Float current = stats.getDynamic(mIndex).getCurrent();
 
-                    MWMechanics::DynamicStat<float> stat (MWWorld::Class::get (ptr).getCreatureStats (ptr)
+                    MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
                         .getDynamic (mIndex));
 
                     stat.setCurrent (diff + current);
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setDynamic (mIndex, stat);
+                    ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
                 }
         };
 
@@ -279,7 +279,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    MWMechanics::CreatureStats& stats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
+                    MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats (ptr);
 
                     Interpreter::Type_Float value = 0;
 
@@ -327,7 +327,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWMechanics::NpcStats& stats = MWWorld::Class::get (ptr).getNpcStats (ptr);
+                    MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats (ptr);
 
                     MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
 
@@ -386,7 +386,7 @@ namespace MWScript
                 {
                     MWBase::World *world = MWBase::Environment::get().getWorld();
                     MWWorld::Ptr player = world->getPlayerPtr();
-                    runtime.push (static_cast <Interpreter::Type_Float> (MWWorld::Class::get (player).getNpcStats (player).getBounty()));
+                    runtime.push (static_cast <Interpreter::Type_Float> (player.getClass().getNpcStats (player).getBounty()));
                 }
         };
 
@@ -399,7 +399,7 @@ namespace MWScript
                     MWBase::World *world = MWBase::Environment::get().getWorld();
                     MWWorld::Ptr player = world->getPlayerPtr();
 
-                    MWWorld::Class::get (player).getNpcStats (player).setBounty(runtime[0].mFloat);
+                    player.getClass().getNpcStats (player).setBounty(runtime[0].mFloat);
                     runtime.pop();
                 }
         };
@@ -413,7 +413,7 @@ namespace MWScript
                     MWBase::World *world = MWBase::Environment::get().getWorld();
                     MWWorld::Ptr player = world->getPlayerPtr();
 
-                    MWWorld::Class::get (player).getNpcStats (player).setBounty(runtime[0].mFloat + MWWorld::Class::get (player).getNpcStats (player).getBounty());
+                    player.getClass().getNpcStats (player).setBounty(runtime[0].mFloat + player.getClass().getNpcStats (player).getBounty());
                     runtime.pop();
                 }
         };
@@ -433,7 +433,7 @@ namespace MWScript
                     // make sure a spell with this ID actually exists.
                     MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (id);
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().add (id);
+                    ptr.getClass().getCreatureStats (ptr).getSpells().add (id);
                 }
         };
 
@@ -449,7 +449,7 @@ namespace MWScript
                     std::string id = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().remove (id);
+                    ptr.getClass().getCreatureStats (ptr).getSpells().remove (id);
 
                     MWBase::WindowManager *wm = MWBase::Environment::get().getWindowManager();
 
@@ -473,7 +473,7 @@ namespace MWScript
                     std::string spellid = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getActiveSpells().removeEffects(spellid);
+                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().removeEffects(spellid);
                 }
         };
 
@@ -489,7 +489,7 @@ namespace MWScript
                     Interpreter::Type_Integer effectId = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getActiveSpells().purgeEffect(effectId);
+                    ptr.getClass().getCreatureStats (ptr).getActiveSpells().purgeEffect(effectId);
                 }
         };
 
@@ -509,8 +509,8 @@ namespace MWScript
                     Interpreter::Type_Integer value = 0;
 
                     for (MWMechanics::Spells::TIterator iter (
-                        MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().begin());
-                        iter!=MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().end(); ++iter)
+                        ptr.getClass().getCreatureStats (ptr).getSpells().begin());
+                        iter!=ptr.getClass().getCreatureStats (ptr).getSpells().end(); ++iter)
                         if (iter->first==id)
                         {
                             value = 1;
@@ -544,9 +544,9 @@ namespace MWScript
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                        if(MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().find(factionID) == MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().end())
+                        if(player.getClass().getNpcStats(player).getFactionRanks().find(factionID) == player.getClass().getNpcStats(player).getFactionRanks().end())
                         {
-                            MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID] = 0;
+                            player.getClass().getNpcStats(player).getFactionRanks()[factionID] = 0;
                         }
                     }
                 }
@@ -575,13 +575,13 @@ namespace MWScript
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                        if(MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().find(factionID) == MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().end())
+                        if(player.getClass().getNpcStats(player).getFactionRanks().find(factionID) == player.getClass().getNpcStats(player).getFactionRanks().end())
                         {
-                            MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID] = 0;
+                            player.getClass().getNpcStats(player).getFactionRanks()[factionID] = 0;
                         }
                         else
                         {
-                            MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID] = MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID] +1;
+                            player.getClass().getNpcStats(player).getFactionRanks()[factionID] = player.getClass().getNpcStats(player).getFactionRanks()[factionID] +1;
                         }
                     }
                 }
@@ -610,9 +610,9 @@ namespace MWScript
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                        if(MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().find(factionID) != MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().end())
+                        if(player.getClass().getNpcStats(player).getFactionRanks().find(factionID) != player.getClass().getNpcStats(player).getFactionRanks().end())
                         {
-                            MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID] = MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID] -1;
+                            player.getClass().getNpcStats(player).getFactionRanks()[factionID] = player.getClass().getNpcStats(player).getFactionRanks()[factionID] -1;
                         }
                     }
                 }
@@ -635,22 +635,22 @@ namespace MWScript
                     }
                     else
                     {
-                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        if(ptr.getClass().getNpcStats(ptr).getFactionRanks().empty())
                         {
                             factionID = "";
                         }
                         else
                         {
-                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                            factionID = ptr.getClass().getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
                     ::Misc::StringUtils::toLower(factionID);
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
                     if(factionID!="")
                     {
-                        if(MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().find(factionID) != MWWorld::Class::get(player).getNpcStats(player).getFactionRanks().end())
+                        if(player.getClass().getNpcStats(player).getFactionRanks().find(factionID) != player.getClass().getNpcStats(player).getFactionRanks().end())
                         {
-                            runtime.push(MWWorld::Class::get(player).getNpcStats(player).getFactionRanks()[factionID]);
+                            runtime.push(player.getClass().getNpcStats(player).getFactionRanks()[factionID]);
                         }
                         else
                         {
@@ -676,8 +676,8 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getNpcStats (ptr).setBaseDisposition
-                        (MWWorld::Class::get (ptr).getNpcStats (ptr).getBaseDisposition() + value);
+                    ptr.getClass().getNpcStats (ptr).setBaseDisposition
+                        (ptr.getClass().getNpcStats (ptr).getBaseDisposition() + value);
                 }
         };
 
@@ -693,7 +693,7 @@ namespace MWScript
                     Interpreter::Type_Integer value = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getNpcStats (ptr).setBaseDisposition (value);
+                    ptr.getClass().getNpcStats (ptr).setBaseDisposition (value);
                 }
         };
 
@@ -739,8 +739,8 @@ namespace MWScript
                     {
                         MWWorld::Ptr ptr = R()(runtime);
 
-                        if (!MWWorld::Class::get (ptr).getNpcStats (ptr).getFactionRanks().empty())
-                            factionId = MWWorld::Class::get (ptr).getNpcStats (ptr).getFactionRanks().begin()->first;
+                        if (!ptr.getClass().getNpcStats (ptr).getFactionRanks().empty())
+                            factionId = ptr.getClass().getNpcStats (ptr).getFactionRanks().begin()->first;
                     }
 
                     if (factionId.empty())
@@ -750,7 +750,7 @@ namespace MWScript
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
                     runtime.push (
-                        MWWorld::Class::get (player).getNpcStats (player).getFactionReputation (factionId));
+                        player.getClass().getNpcStats (player).getFactionReputation (factionId));
                 }
         };
 
@@ -775,8 +775,8 @@ namespace MWScript
                     {
                         MWWorld::Ptr ptr = R()(runtime);
 
-                        if (!MWWorld::Class::get (ptr).getNpcStats (ptr).getFactionRanks().empty())
-                            factionId = MWWorld::Class::get (ptr).getNpcStats (ptr).getFactionRanks().begin()->first;
+                        if (!ptr.getClass().getNpcStats (ptr).getFactionRanks().empty())
+                            factionId = ptr.getClass().getNpcStats (ptr).getFactionRanks().begin()->first;
                     }
 
                     if (factionId.empty())
@@ -785,7 +785,7 @@ namespace MWScript
                     ::Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                    MWWorld::Class::get (player).getNpcStats (player).setFactionReputation (factionId, value);
+                    player.getClass().getNpcStats (player).setFactionReputation (factionId, value);
                 }
         };
 
@@ -810,8 +810,8 @@ namespace MWScript
                     {
                         MWWorld::Ptr ptr = R()(runtime);
 
-                        if (!MWWorld::Class::get (ptr).getNpcStats (ptr).getFactionRanks().empty())
-                            factionId = MWWorld::Class::get (ptr).getNpcStats (ptr).getFactionRanks().begin()->first;
+                        if (!ptr.getClass().getNpcStats (ptr).getFactionRanks().empty())
+                            factionId = ptr.getClass().getNpcStats (ptr).getFactionRanks().begin()->first;
                     }
 
                     if (factionId.empty())
@@ -820,8 +820,8 @@ namespace MWScript
                     ::Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-                    MWWorld::Class::get (player).getNpcStats (player).setFactionReputation (factionId,
-                        MWWorld::Class::get (player).getNpcStats (player).getFactionReputation (factionId)+
+                    player.getClass().getNpcStats (player).setFactionReputation (factionId,
+                        player.getClass().getNpcStats (player).getFactionReputation (factionId)+
                         value);
                 }
         };
@@ -835,7 +835,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (MWWorld::Class::get (ptr).getCreatureStats (ptr).hasCommonDisease());
+                    runtime.push (ptr.getClass().getCreatureStats (ptr).hasCommonDisease());
                 }
         };
 
@@ -848,7 +848,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (MWWorld::Class::get (ptr).getCreatureStats (ptr).hasBlightDisease());
+                    runtime.push (ptr.getClass().getCreatureStats (ptr).hasBlightDisease());
                 }
         };
 
@@ -880,7 +880,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = MWBase::Environment::get().getWorld ()->getPlayerPtr();
 
-                    runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).getWerewolfKills ());
+                    runtime.push (ptr.getClass().getNpcStats (ptr).getWerewolfKills ());
                 }
         };
 
@@ -901,13 +901,13 @@ namespace MWScript
                     }
                     else
                     {
-                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        if(ptr.getClass().getNpcStats(ptr).getFactionRanks().empty())
                         {
                             factionID = "";
                         }
                         else
                         {
-                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                            factionID = ptr.getClass().getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
                     ::Misc::StringUtils::toLower(factionID);
@@ -939,13 +939,13 @@ namespace MWScript
                     else
                     {
                         MWWorld::Ptr ptr = R()(runtime);
-                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        if(ptr.getClass().getNpcStats(ptr).getFactionRanks().empty())
                         {
                             factionID = "";
                         }
                         else
                         {
-                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                            factionID = ptr.getClass().getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -972,13 +972,13 @@ namespace MWScript
                     else
                     {
                         MWWorld::Ptr ptr = R()(runtime);
-                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        if(ptr.getClass().getNpcStats(ptr).getFactionRanks().empty())
                         {
                             factionID = "";
                         }
                         else
                         {
-                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                            factionID = ptr.getClass().getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
@@ -997,11 +997,11 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     std::string factionID = "";
-                    if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                    if(ptr.getClass().getNpcStats(ptr).getFactionRanks().empty())
                         return;
                     else
                     {
-                        factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                        factionID = ptr.getClass().getNpcStats(ptr).getFactionRanks().begin()->first;
                     }
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
@@ -1009,7 +1009,7 @@ namespace MWScript
                     if (ptr == player)
                         return;
 
-                    std::map<std::string, int>& ranks = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks ();
+                    std::map<std::string, int>& ranks = ptr.getClass().getNpcStats(ptr).getFactionRanks ();
                     ranks[factionID] = ranks[factionID]+1;
                 }
         };
@@ -1024,11 +1024,11 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     std::string factionID = "";
-                    if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                    if(ptr.getClass().getNpcStats(ptr).getFactionRanks().empty())
                         return;
                     else
                     {
-                        factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                        factionID = ptr.getClass().getNpcStats(ptr).getFactionRanks().begin()->first;
                     }
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
 
@@ -1036,7 +1036,7 @@ namespace MWScript
                     if (ptr == player)
                         return;
 
-                    std::map<std::string, int>& ranks = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks ();
+                    std::map<std::string, int>& ranks = ptr.getClass().getNpcStats(ptr).getFactionRanks ();
                     ranks[factionID] = ranks[factionID]-1;
                 }
         };
@@ -1051,10 +1051,10 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     Interpreter::Type_Integer value =
-                        MWWorld::Class::get (ptr).getCreatureStats (ptr).hasDied();
+                        ptr.getClass().getCreatureStats (ptr).hasDied();
 
                     if (value)
-                        MWWorld::Class::get (ptr).getCreatureStats (ptr).clearHasDied();
+                        ptr.getClass().getCreatureStats (ptr).clearHasDied();
 
                     runtime.push (value);
                 }
@@ -1070,7 +1070,7 @@ namespace MWScript
                     MWWorld::Ptr ptr = R()(runtime);
 
                     Interpreter::Type_Integer value =
-                        MWWorld::Class::get (ptr).getCreatureStats (ptr).getKnockedDownOneFrame();
+                        ptr.getClass().getCreatureStats (ptr).getKnockedDownOneFrame();
 
                     runtime.push (value);
                 }
@@ -1084,7 +1084,7 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
-                    runtime.push(MWWorld::Class::get(ptr).getNpcStats(ptr).isWerewolf());
+                    runtime.push(ptr.getClass().getNpcStats(ptr).isWerewolf());
                 }
         };
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index 7051937989..fb27e73f44 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -271,7 +271,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    if (!ptr.isInCell())
+                    if (ptr.getContainerStore())
                         return;
 
                     if (ptr.getRefData().getHandle() == "player")
@@ -308,6 +308,7 @@ namespace MWScript
                     if(store)
                     {
                         MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z);
+                        ptr = MWWorld::Ptr(ptr.getBase(), store);
                         float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
                         float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
                         if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity
@@ -318,7 +319,7 @@ namespace MWScript
                         }
                         MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
 
-                        MWWorld::Class::get(ptr).adjustPosition(ptr);
+                        ptr.getClass().adjustPosition(ptr);
                     }
                     else
                     {
@@ -365,7 +366,7 @@ namespace MWScript
                         zRot = zRot/60.;
                     }
                     MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
-                    MWWorld::Class::get(ptr).adjustPosition(ptr);
+                    ptr.getClass().adjustPosition(ptr);
                 }
         };
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 6854358f59..4a3093b10d 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -356,6 +356,44 @@ namespace MWSound
         return sound;
     }
 
+    MWBase::SoundPtr SoundManager::playManualSound3D(const Ogre::Vector3& initialPos, const std::string& soundId,
+                                                     float volume, float pitch, PlayType type, PlayMode mode, float offset)
+    {
+        MWBase::SoundPtr sound;
+        if(!mOutput->isInitialized())
+            return sound;
+        try
+        {
+            // Look up the sound in the ESM data
+            float basevol = volumeFromType(type);
+            float min, max;
+            std::string file = lookup(soundId, volume, min, max);
+
+            sound = mOutput->playSound3D(file, initialPos, volume, basevol, pitch, min, max, mode|type, offset);
+            mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), soundId);
+        }
+        catch(std::exception &e)
+        {
+            //std::cout <<"Sound Error: "<<e.what()<< std::endl;
+        }
+        return sound;
+    }
+
+    void SoundManager::stopSound (MWBase::SoundPtr sound)
+    {
+        SoundMap::iterator snditer = mActiveSounds.begin();
+        while(snditer != mActiveSounds.end())
+        {
+            if(snditer->first == sound)
+            {
+                snditer->first->stop();
+                mActiveSounds.erase(snditer++);
+            }
+            else
+                ++snditer;
+        }
+    }
+
     void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId)
     {
         SoundMap::iterator snditer = mActiveSounds.begin();
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index 1454240b4a..ab9dcf7345 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -115,6 +115,13 @@ namespace MWSound
         virtual MWBase::SoundPtr playSound3D(const MWWorld::Ptr &reference, const std::string& soundId,
                                              float volume, float pitch, PlayType type=Play_TypeSfx,
                                              PlayMode mode=Play_Normal, float offset=0);
+        ///< Play a 3D sound attached to an MWWorld::Ptr. Will be updated automatically with the Ptr's position, unless Play_NoTrack is specified.
+        ///< @param offset Value from [0,1] meaning from which fraction the sound the playback starts.
+
+        virtual MWBase::SoundPtr playManualSound3D(const Ogre::Vector3& initialPos, const std::string& soundId,
+                                                         float volume, float pitch, PlayType type, PlayMode mode, float offset=0);
+        ///< Play a 3D sound at \a initialPos. If the sound should be moving, it must be updated manually using Sound::setPosition.
+
         ///< Play a sound from an object
         ///< @param offset value from [0,1], when to start playback. 0 is beginning, 1 is end.
 
@@ -124,6 +131,9 @@ namespace MWSound
         virtual void stopSound3D(const MWWorld::Ptr &reference);
         ///< Stop the given object from playing all sounds.
 
+        virtual void stopSound(MWBase::SoundPtr sound);
+        ///< Stop the given sound handle
+
         virtual void stopSound(const MWWorld::CellStore *cell);
         ///< Stop all sounds for the given cell.
 
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index f2cda5a018..dafb8323aa 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -12,6 +12,8 @@
 
 #include <OgreImage.h>
 
+#include <boost/filesystem/fstream.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/journal.hpp"
@@ -136,8 +138,6 @@ void MWState::StateManager::newGame (bool bypass)
     else
         MWBase::Environment::get().getWorld()->setGlobalInt ("chargenstate", -1);
 
-    MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
-
     mState = State_Running;
 }
 
@@ -187,7 +187,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     else
         slot = mCharacterManager.getCurrentCharacter()->updateSlot (slot, profile);
 
-    std::ofstream stream (slot->mPath.string().c_str(), std::ios::binary);
+    boost::filesystem::ofstream stream (slot->mPath, std::ios::binary);
 
     ESM::ESMWriter writer;
 
@@ -319,6 +319,8 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
                 case ESM::REC_WTHR:
                 case ESM::REC_DYNA:
                 case ESM::REC_ACTC:
+                case ESM::REC_PROJ:
+                case ESM::REC_MPRJ:
 
                     MWBase::Environment::get().getWorld()->readRecord (reader, n.val, contentFileMap);
                     break;
@@ -361,12 +363,18 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
 
         ESM::CellId cellId = ptr.getCell()->getCell()->getCellId();
 
-        MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition());
+        // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
+        MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false);
+
+        // Do not trigger erroneous cellChanged events
+        MWBase::Environment::get().getWorld()->markCellAsUnchanged();
     }
     catch (const std::exception& e)
     {
         std::cerr << "failed to load saved game: " << e.what() << std::endl;
         cleanup (true);
+
+        MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
     }
 }
 
diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp
index bd3e875484..6b12cc3e65 100644
--- a/apps/openmw/mwworld/actionapply.cpp
+++ b/apps/openmw/mwworld/actionapply.cpp
@@ -16,7 +16,7 @@ namespace MWWorld
     {
         MWBase::Environment::get().getWorld()->breakInvisibility(actor);
 
-        MWWorld::Class::get (getTarget()).apply (getTarget(), mId, actor);
+        getTarget().getClass().apply (getTarget(), mId, actor);
     }
 
 
@@ -29,7 +29,7 @@ namespace MWWorld
     {
         MWBase::Environment::get().getWorld()->breakInvisibility(actor);
 
-        if (MWWorld::Class::get (getTarget()).apply (getTarget(), mId, actor) && mUsageType!=-1)
-            MWWorld::Class::get (getTarget()).skillUsageSucceeded (actor, mSkillIndex, mUsageType);
+        if (getTarget().getClass().apply (getTarget(), mId, actor) && mUsageType!=-1)
+            getTarget().getClass().skillUsageSucceeded (actor, mSkillIndex, mUsageType);
     }
 }
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index 020bdb0ff7..6609155236 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -20,10 +20,10 @@ namespace MWWorld
         getTarget().getContainerStore()->remove(getTarget(), 1, actor);
 
         // apply to actor
-        std::string id = Class::get (getTarget()).getId (getTarget());
+        std::string id = getTarget().getClass().getId (getTarget());
 
-        if (Class::get (actor).apply (actor, id, actor))
-            Class::get (actor).skillUsageSucceeded (actor, ESM::Skill::Alchemy, 1);
+        if (actor.getClass().apply (actor, id, actor))
+            actor.getClass().skillUsageSucceeded (actor, ESM::Skill::Alchemy, 1);
     }
 
     ActionEat::ActionEat (const MWWorld::Ptr& object) : Action (false, object) {}
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index 2a1b7a3aa4..05677cdc7f 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -40,7 +40,7 @@ namespace MWWorld
         }
 
         // slots that this item can be equipped in
-        std::pair<std::vector<int>, bool> slots_ = MWWorld::Class::get(getTarget()).getEquipmentSlots(getTarget());
+        std::pair<std::vector<int>, bool> slots_ = getTarget().getClass().getEquipmentSlots(getTarget());
 
         // retrieve ContainerStoreIterator to the item
         MWWorld::ContainerStoreIterator it = invStore.begin();
diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 60af3d9b9e..0a4e2d6c9c 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -47,7 +47,7 @@ namespace MWWorld
         }
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(player).getNpcStats (player);
+        MWMechanics::NpcStats& npcStats = player.getClass().getNpcStats (player);
 
         // Skill gain from books
         if (ref->mBase->mData.mSkillID >= 0 && ref->mBase->mData.mSkillID < ESM::Skill::Length
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index 5d2d8a5175..04d733e2c4 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -36,7 +36,7 @@ namespace
             MWWorld::Ptr container (&*iter, 0);
 
             MWWorld::Ptr ptr =
-                MWWorld::Class::get (container).getContainerStore (container).search (id);
+                container.getClass().getContainerStore (container).search (id);
 
             if (!ptr.isEmpty())
                 return ptr;
@@ -169,7 +169,7 @@ namespace MWWorld
     }
 
     CellStore::CellStore (const ESM::Cell *cell)
-      : mCell (cell), mState (State_Unloaded), mHasState (false)
+      : mCell (cell), mState (State_Unloaded), mHasState (false), mLastRespawn(0,0)
     {
         mWaterLevel = cell->mWater;
     }
@@ -555,6 +555,7 @@ namespace MWWorld
             mWaterLevel = state.mWaterLevel;
 
         mWaterLevel = state.mWaterLevel;
+        mLastRespawn = MWWorld::TimeStamp(state.mLastRespawn);
     }
 
     void CellStore::saveState (ESM::CellState& state) const
@@ -566,6 +567,7 @@ namespace MWWorld
 
         state.mWaterLevel = mWaterLevel;
         state.mHasFogOfWar = (mFogState.get() ? 1 : 0);
+        state.mLastRespawn = mLastRespawn.toEsm();
     }
 
     void CellStore::writeFog(ESM::ESMWriter &writer) const
@@ -754,4 +756,36 @@ namespace MWWorld
     {
         return mFogState.get();
     }
+
+    void CellStore::respawn()
+    {
+        if (mState == State_Loaded)
+        {
+            static int iMonthsToRespawn = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("iMonthsToRespawn")->getInt();
+            if (MWBase::Environment::get().getWorld()->getTimeStamp() - mLastRespawn > 24*30*iMonthsToRespawn)
+            {
+                mLastRespawn = MWBase::Environment::get().getWorld()->getTimeStamp();
+                for (CellRefList<ESM::Container>::List::iterator it (mContainers.mList.begin()); it!=mContainers.mList.end(); ++it)
+                {
+                    Ptr ptr (&*it, this);
+                    ptr.getClass().respawn(ptr);
+                }
+                for (CellRefList<ESM::Creature>::List::iterator it (mCreatures.mList.begin()); it!=mCreatures.mList.end(); ++it)
+                {
+                    Ptr ptr (&*it, this);
+                    ptr.getClass().respawn(ptr);
+                }
+                for (CellRefList<ESM::NPC>::List::iterator it (mNpcs.mList.begin()); it!=mNpcs.mList.end(); ++it)
+                {
+                    Ptr ptr (&*it, this);
+                    ptr.getClass().respawn(ptr);
+                }
+                for (CellRefList<ESM::CreatureLevList>::List::iterator it (mCreatureLists.mList.begin()); it!=mCreatureLists.mList.end(); ++it)
+                {
+                    Ptr ptr (&*it, this);
+                    ptr.getClass().respawn(ptr);
+                }
+            }
+        }
+    }
 }
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index 91c536b430..ba6fad7baa 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -13,6 +13,8 @@
 
 #include "../mwmechanics/pathgrid.hpp"  // TODO: maybe belongs in mwworld
 
+#include "timestamp.hpp"
+
 namespace ESM
 {
     struct CellState;
@@ -48,6 +50,8 @@ namespace MWWorld
             std::vector<std::string> mIds;
             float mWaterLevel;
 
+            MWWorld::TimeStamp mLastRespawn;
+
             CellRefList<ESM::Activator>         mActivators;
             CellRefList<ESM::Potion>            mPotions;
             CellRefList<ESM::Apparatus>         mAppas;
@@ -161,6 +165,9 @@ namespace MWWorld
 
             void readReferences (ESM::ESMReader& reader, const std::map<int, int>& contentFileMap);
 
+            void respawn ();
+            ///< Check mLastRespawn and respawn references if necessary. This is a no-op if the cell is not loaded.
+
             template <class T>
             CellRefList<T>& get() {
                 throw std::runtime_error ("Storage for this type not exist in cells");
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 951ba7865e..6629f84f91 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -323,7 +323,7 @@ namespace MWWorld
         if(!MWBase::Environment::get().getWindowManager()->isAllowed(MWGui::GW_Inventory))
             return boost::shared_ptr<Action>(new NullAction());
 
-        if(get(actor).isNpc() && get(actor).getNpcStats(actor).isWerewolf())
+        if(actor.getClass().isNpc() && actor.getClass().getNpcStats(actor).isWerewolf())
         {
             const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
             const ESM::Sound *sound = store.get<ESM::Sound>().searchRandom("WolfItem");
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 057bc906ef..b47028e01f 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -325,12 +325,6 @@ namespace MWWorld
             static const Class& get (const std::string& key);
             ///< If there is no class for this \a key, an exception is thrown.
 
-            static const Class& get (const Ptr& ptr)
-            {
-                return ptr.getClass();
-            }
-            ///< If there is no class for this pointer, an exception is thrown.
-
             static void registerClass (const std::string& key,  boost::shared_ptr<Class> instance);
 
             virtual int getBaseGold(const MWWorld::Ptr& ptr) const;
@@ -341,6 +335,10 @@ namespace MWWorld
             virtual int getDoorState (const MWWorld::Ptr &ptr) const;
             /// This does not actually cause the door to move. Use World::activateDoor instead.
             virtual void setDoorState (const MWWorld::Ptr &ptr, int state) const;
+
+            virtual void respawn (const MWWorld::Ptr& ptr) const {}
+
+            virtual void restock (const MWWorld::Ptr& ptr) const {}
     };
 }
 
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index eb6760d14c..d816f993bd 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -142,8 +142,8 @@ void MWWorld::ContainerStore::unstack(const Ptr &ptr, const Ptr& container)
 
 bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
 {
-    const MWWorld::Class& cls1 = MWWorld::Class::get(ptr1);
-    const MWWorld::Class& cls2 = MWWorld::Class::get(ptr2);
+    const MWWorld::Class& cls1 = ptr1.getClass();
+    const MWWorld::Class& cls2 = ptr2.getClass();
 
     if (!Misc::StringUtils::ciEqual(ptr1.getCellRef().mRefID, ptr2.getCellRef().mRefID))
         return false;
@@ -226,14 +226,14 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
     item.getCellRef().mPos.pos[1] = 0;
     item.getCellRef().mPos.pos[2] = 0;
 
-    std::string script = MWWorld::Class::get(item).getScript(item);
+    std::string script = item.getClass().getScript(item);
     if(script != "")
     {
         CellStore *cell;
 
         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, item);
 
-        if(&(MWWorld::Class::get (player).getContainerStore (player)) == this)
+        if(&(player.getClass().getContainerStore (player)) == this)
         {
             cell = 0; // Items in player's inventory have cell set to 0, so their scripts will never be removed
 
@@ -366,7 +366,7 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const std::
     for (std::vector<ESM::ContItem>::const_iterator iter (items.mList.begin()); iter!=items.mList.end();
         ++iter)
     {
-        std::string id = iter->mItem.toString();
+        std::string id = Misc::StringUtils::lowerCase(iter->mItem.toString());
         addInitialItem(id, owner, faction, iter->mCount);
     }
 
@@ -374,20 +374,18 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const std::
 }
 
 void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::string& owner, const std::string& faction,
-                                              int count, bool topLevel)
+                                              int count, bool topLevel, const std::string& levItem)
 {
-    count = std::abs(count); /// \todo implement item restocking (indicated by negative count)
-
     ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), id, count);
 
     if (ref.getPtr().getTypeName()==typeid (ESM::ItemLevList).name())
     {
         const ESM::ItemLevList* levItem = ref.getPtr().get<ESM::ItemLevList>()->mBase;
 
-        if (topLevel && count > 1 && levItem->mFlags & ESM::ItemLevList::Each)
+        if (topLevel && std::abs(count) > 1 && levItem->mFlags & ESM::ItemLevList::Each)
         {
-            for (int i=0; i<count; ++i)
-                addInitialItem(id, owner, faction, 1);
+            for (int i=0; i<std::abs(count); ++i)
+                addInitialItem(id, owner, faction, count > 0 ? 1 : -1, true, levItem->mId);
             return;
         }
         else
@@ -395,17 +393,58 @@ void MWWorld::ContainerStore::addInitialItem (const std::string& id, const std::
             std::string id = MWMechanics::getLevelledItem(ref.getPtr().get<ESM::ItemLevList>()->mBase, false);
             if (id.empty())
                 return;
-            addInitialItem(id, owner, faction, count, false);
+            addInitialItem(id, owner, faction, count, false, levItem->mId);
         }
     }
     else
     {
+        // A negative count indicates restocking items
+        // For a restocking levelled item, remember what we spawned so we can delete it later when the merchant restocks
+        if (!levItem.empty() && count < 0)
+        {
+            if (mLevelledItemMap.find(id) == mLevelledItemMap.end())
+                mLevelledItemMap[id] = 0;
+            mLevelledItemMap[id] += std::abs(count);
+        }
+        count = std::abs(count);
+
         ref.getPtr().getCellRef().mOwner = owner;
         ref.getPtr().getCellRef().mFaction = faction;
         addImp (ref.getPtr(), count);
     }
 }
 
+void MWWorld::ContainerStore::restock (const ESM::InventoryList& items, const MWWorld::Ptr& ptr, const std::string& owner, const std::string& faction)
+{
+    // Remove the items already spawned by levelled items that will restock
+    for (std::map<std::string, int>::iterator it = mLevelledItemMap.begin(); it != mLevelledItemMap.end(); ++it)
+    {
+        if (count(it->first) >= it->second)
+            remove(it->first, it->second, ptr);
+    }
+    mLevelledItemMap.clear();
+
+    for (std::vector<ESM::ContItem>::const_iterator it = items.mList.begin(); it != items.mList.end(); ++it)
+    {
+        if (it->mCount >= 0)
+            continue;
+
+        std::string item = Misc::StringUtils::lowerCase(it->mItem.toString());
+
+        if (MWBase::Environment::get().getWorld()->getStore().get<ESM::ItemLevList>().search(it->mItem.toString()))
+        {
+            addInitialItem(item, owner, faction, it->mCount, true);
+        }
+        else
+        {
+            int currentCount = count(item);
+            if (currentCount < std::abs(it->mCount))
+                add (item, std::abs(it->mCount) - currentCount, ptr);
+        }
+    }
+    flagAsModified();
+}
+
 void MWWorld::ContainerStore::clear()
 {
     for (ContainerStoreIterator iter (begin()); iter!=end(); ++iter)
@@ -584,6 +623,8 @@ void MWWorld::ContainerStore::writeState (ESM::InventoryState& state) const
 
     state.mLights.clear();
 
+    state.mLevelledItemMap = mLevelledItemMap;
+
     for (MWWorld::CellRefList<ESM::Light>::List::const_iterator iter (lights.mList.begin());
         iter!=lights.mList.end(); ++iter)
     {
@@ -627,6 +668,8 @@ void MWWorld::ContainerStore::readState (const ESM::InventoryState& state)
     {
         getState (lights, iter->first);
     }
+
+    mLevelledItemMap = state.mLevelledItemMap;
 }
 
 
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index dd0c1b0024..7c81bdb6e7 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -2,6 +2,7 @@
 #define GAME_MWWORLD_CONTAINERSTORE_H
 
 #include <iterator>
+#include <map>
 
 #include <components/esm/loadalch.hpp>
 #include <components/esm/loadappa.hpp>
@@ -65,10 +66,15 @@ namespace MWWorld
             MWWorld::CellRefList<ESM::Probe>             probes;
             MWWorld::CellRefList<ESM::Repair>            repairs;
             MWWorld::CellRefList<ESM::Weapon>            weapons;
+
+            std::map<std::string, int> mLevelledItemMap;
+            ///< Stores result of levelled item spawns. <refId, count>
+            /// This is used to remove the spawned item(s) if the levelled item is restocked.
+
             mutable float mCachedWeight;
             mutable bool mWeightUpToDate;
             ContainerStoreIterator addImp (const Ptr& ptr, int count);
-            void addInitialItem (const std::string& id, const std::string& owner, const std::string& faction, int count, bool topLevel=true);
+            void addInitialItem (const std::string& id, const std::string& owner, const std::string& faction, int count, bool topLevel=true, const std::string& levItem = "");
 
             template<typename T>
             ContainerStoreIterator getState (CellRefList<T>& collection,
@@ -145,6 +151,8 @@ namespace MWWorld
             void fill (const ESM::InventoryList& items, const std::string& owner, const std::string& faction, const MWWorld::ESMStore& store);
             ///< Insert items into *this.
 
+            void restock (const ESM::InventoryList& items, const MWWorld::Ptr& ptr, const std::string& owner, const std::string& faction);
+
             virtual void clear();
             ///< Empty container.
 
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index ed140434b5..1fdf3c5a50 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -27,8 +27,6 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
 {
     listener->setProgressRange(1000);
 
-    std::set<std::string> missing;
-
     ESM::Dialogue *dialogue = 0;
 
     /// \todo Move this to somewhere else. ESMReader?
@@ -72,9 +70,10 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
             if (n.val == ESM::REC_INFO) {
                 std::string id = esm.getHNOString("INAM");
                 if (dialogue) {
-                    dialogue->mInfo.push_back(ESM::DialInfo());
-                    dialogue->mInfo.back().mId = id;
-                    dialogue->mInfo.back().load(esm);
+                    ESM::DialInfo info;
+                    info.mId = id;
+                    info.load(esm);
+                    dialogue->addInfo(info, esm.getIndex() != 0);
                 } else {
                     std::cerr << "error: info record without dialog" << std::endl;
                     esm.skipRecord();
@@ -84,9 +83,9 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
             } else if (n.val == ESM::REC_SKIL) {
                 mSkills.load (esm);
             } else {
-                // Not found (this would be an error later)
-                esm.skipRecord();
-                missing.insert(n.toString());
+                std::stringstream error;
+                error << "Unknown record: " << n.toString();
+                throw std::runtime_error(error.str());
             }
         } else {
             // Load it
@@ -113,19 +112,6 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
         }
         listener->setProgress(esm.getFileOffset() / (float)esm.getFileSize() * 1000);
     }
-
-  /* This information isn't needed on screen. But keep the code around
-     for debugging purposes later.
-
-  cout << "\n" << mStores.size() << " record types:\n";
-  for(RecListList::iterator it = mStores.begin(); it != mStores.end(); it++)
-    cout << "  " << toStr(it->first) << ": " << it->second->getSize() << endl;
-  cout << "\nNot implemented yet: ";
-  for(set<string>::iterator it = missing.begin();
-      it != missing.end(); it++ )
-    cout << *it << " ";
-  cout << endl;
-  */
 }
 
 void ESMStore::setUp()
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index 7127c92f3f..78a2950304 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -129,7 +129,7 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
 
     std::pair<std::vector<int>, bool> slots_;
 
-    slots_ = Class::get (*iterator).getEquipmentSlots (*iterator);
+    slots_ = iterator->getClass().getEquipmentSlots (*iterator);
 
     if (std::find (slots_.first.begin(), slots_.first.end(), slot)==slots_.first.end())
         throw std::runtime_error ("invalid slot");
@@ -258,7 +258,7 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
                 }
             }
 
-            switch(MWWorld::Class::get (test).canBeEquipped (test, actor).first)
+            switch(test.getClass().canBeEquipped (test, actor).first)
             {
                 case 0:
                     continue;
@@ -325,7 +325,7 @@ void MWWorld::InventoryStore::updateMagicEffects(const Ptr& actor)
         if (*iter==end())
             continue;
 
-        std::string enchantmentId = MWWorld::Class::get (**iter).getEnchantment (**iter);
+        std::string enchantmentId = (*iter)->getClass().getEnchantment (**iter);
 
         if (!enchantmentId.empty())
         {
@@ -441,7 +441,7 @@ bool MWWorld::InventoryStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
     {
         if (*iter != end() && (ptr1 == **iter || ptr2 == **iter))
         {
-            bool stackWhenEquipped = MWWorld::Class::get(**iter).getEquipmentSlots(**iter).second;
+            bool stackWhenEquipped = (*iter)->getClass().getEquipmentSlots(**iter).second;
             if (!stackWhenEquipped)
                 return false;
         }
@@ -527,7 +527,7 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
         if (actor.getRefData().getHandle() == "player")
         {
             // Unset OnPCEquip Variable on item's script, if it has a script with that variable declared
-            const std::string& script = Class::get(*it).getScript(*it);
+            const std::string& script = it->getClass().getScript(*it);
             if (script != "")
                 (*it).getRefData().getLocals().setVarByInt(script, "onpcequip", 0);
 
@@ -579,7 +579,7 @@ void MWWorld::InventoryStore::visitEffectSources(MWMechanics::EffectSourceVisito
         if (*iter==end())
             continue;
 
-        std::string enchantmentId = MWWorld::Class::get (**iter).getEnchantment (**iter);
+        std::string enchantmentId = (*iter)->getClass().getEnchantment (**iter);
         if (enchantmentId.empty())
             continue;
 
diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp
index 4a610b45ca..1b13e38038 100644
--- a/apps/openmw/mwworld/livecellref.cpp
+++ b/apps/openmw/mwworld/livecellref.cpp
@@ -10,6 +10,11 @@
 #include "class.hpp"
 #include "esmstore.hpp"
 
+MWWorld::LiveCellRefBase::LiveCellRefBase(std::string type, const ESM::CellRef &cref)
+  : mClass(&Class::get(type)), mRef(cref), mData(mRef)
+{
+}
+
 void MWWorld::LiveCellRefBase::loadImp (const ESM::ObjectState& state)
 {
     mRef = state.mRef;
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 844e2b18ba..8a671cea8c 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -36,10 +36,10 @@ namespace
 
             MWWorld::Ptr containerPtr (&*iter, cell);
 
-            MWWorld::ContainerStore& container = MWWorld::Class::get(containerPtr).getContainerStore(containerPtr);
+            MWWorld::ContainerStore& container = containerPtr.getClass().getContainerStore(containerPtr);
             for(MWWorld::ContainerStoreIterator it3 = container.begin(); it3 != container.end(); ++it3)
             {
-                std::string script = MWWorld::Class::get(*it3).getScript(*it3);
+                std::string script = it3->getClass().getScript(*it3);
                 if(script != "")
                 {
                     MWWorld::Ptr item = *it3;
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 6477a8bcfc..039fce0caa 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -33,7 +33,7 @@ using namespace Ogre;
 namespace MWWorld
 {
 
-    static const float sMaxSlope = 60.0f;
+    static const float sMaxSlope = 49.0f;
     static const float sStepSize = 32.0f;
     // Arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
     static const int sMaxIterations = 8;
@@ -538,7 +538,7 @@ namespace MWWorld
 
     void PhysicsSystem::addObject (const Ptr& ptr, bool placeable)
     {
-        std::string mesh = MWWorld::Class::get(ptr).getModel(ptr);
+        std::string mesh = ptr.getClass().getModel(ptr);
         Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
         handleToMesh[node->getName()] = mesh;
         OEngine::Physic::RigidBody* body = mEngine->createAndAdjustRigidBody(
@@ -550,7 +550,7 @@ namespace MWWorld
 
     void PhysicsSystem::addActor (const Ptr& ptr)
     {
-        std::string mesh = MWWorld::Class::get(ptr).getModel(ptr);
+        std::string mesh = ptr.getClass().getModel(ptr);
         Ogre::SceneNode* node = ptr.getRefData().getBaseNode();
         //TODO:optimize this. Searching the std::map isn't very efficient i think.
         mEngine->addCharacter(node->getName(), mesh, node->getPosition(), node->getScale().x, node->getOrientation());
@@ -651,7 +651,7 @@ namespace MWWorld
 
     bool PhysicsSystem::getObjectAABB(const MWWorld::Ptr &ptr, Ogre::Vector3 &min, Ogre::Vector3 &max)
     {
-        std::string model = MWWorld::Class::get(ptr).getModel(ptr);
+        std::string model = ptr.getClass().getModel(ptr);
         if (model.empty()) {
             return false;
         }
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 1f994d013d..5ca8f29525 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -75,7 +75,7 @@ namespace MWWorld
     void Player::setDrawState (MWMechanics::DrawState_ state)
     {
          MWWorld::Ptr ptr = getPlayer();
-         MWWorld::Class::get(ptr).getNpcStats(ptr).setDrawState (state);
+         ptr.getClass().getNpcStats(ptr).setDrawState (state);
     }
 
     bool Player::getAutoMove() const
@@ -94,13 +94,13 @@ namespace MWWorld
         if (mAutoMove)
             value = 1;
 
-        MWWorld::Class::get (ptr).getMovementSettings (ptr).mPosition[1] = value;
+        ptr.getClass().getMovementSettings (ptr).mPosition[1] = value;
     }
 
     void Player::setLeftRight (int value)
     {
         MWWorld::Ptr ptr = getPlayer();
-        MWWorld::Class::get (ptr).getMovementSettings (ptr).mPosition[0] = value;
+        ptr.getClass().getMovementSettings (ptr).mPosition[0] = value;
     }
 
     void Player::setForwardBackward (int value)
@@ -112,13 +112,13 @@ namespace MWWorld
         if (mAutoMove)
             value = 1;
 
-        MWWorld::Class::get (ptr).getMovementSettings (ptr).mPosition[1] = value;
+        ptr.getClass().getMovementSettings (ptr).mPosition[1] = value;
     }
 
     void Player::setUpDown(int value)
     {
         MWWorld::Ptr ptr = getPlayer();
-        MWWorld::Class::get (ptr).getMovementSettings (ptr).mPosition[2] = value;
+        ptr.getClass().getMovementSettings (ptr).mPosition[2] = value;
     }
 
     void Player::setRunState(bool run)
@@ -136,23 +136,23 @@ namespace MWWorld
     void Player::yaw(float yaw)
     {
         MWWorld::Ptr ptr = getPlayer();
-        MWWorld::Class::get(ptr).getMovementSettings(ptr).mRotation[2] += yaw;
+        ptr.getClass().getMovementSettings(ptr).mRotation[2] += yaw;
     }
     void Player::pitch(float pitch)
     {
         MWWorld::Ptr ptr = getPlayer();
-        MWWorld::Class::get(ptr).getMovementSettings(ptr).mRotation[0] += pitch;
+        ptr.getClass().getMovementSettings(ptr).mRotation[0] += pitch;
     }
     void Player::roll(float roll)
     {
         MWWorld::Ptr ptr = getPlayer();
-        MWWorld::Class::get(ptr).getMovementSettings(ptr).mRotation[1] += roll;
+        ptr.getClass().getMovementSettings(ptr).mRotation[1] += roll;
     }
 
     MWMechanics::DrawState_ Player::getDrawState()
     {
          MWWorld::Ptr ptr = getPlayer();
-         return MWWorld::Class::get(ptr).getNpcStats(ptr).getDrawState();
+         return ptr.getClass().getNpcStats(ptr).getDrawState();
     }
 
     bool Player::wasTeleported() const
diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
new file mode 100644
index 0000000000..266b566f70
--- /dev/null
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -0,0 +1,400 @@
+#include "projectilemanager.hpp"
+
+#include <OgreSceneManager.h>
+
+#include <libs/openengine/bullet/physic.hpp>
+
+#include <components/esm/projectilestate.hpp>
+
+#include "../mwworld/manualref.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/inventorystore.hpp"
+
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
+#include "../mwmechanics/combat.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+
+#include "../mwrender/effectmanager.hpp"
+
+#include "../mwsound/sound.hpp"
+
+namespace MWWorld
+{
+
+    ProjectileManager::ProjectileManager(Ogre::SceneManager* sceneMgr, OEngine::Physic::PhysicEngine &engine)
+        : mPhysEngine(engine)
+        , mSceneMgr(sceneMgr)
+    {
+
+    }
+
+    void ProjectileManager::createModel(State &state, const std::string &model)
+    {
+        state.mObject = NifOgre::Loader::createObjects(state.mNode, model);
+        for(size_t i = 0;i < state.mObject->mControllers.size();i++)
+        {
+            if(state.mObject->mControllers[i].getSource().isNull())
+                state.mObject->mControllers[i].setSource(Ogre::SharedPtr<MWRender::EffectAnimationTime> (new MWRender::EffectAnimationTime()));
+        }
+    }
+
+    void ProjectileManager::update(NifOgre::ObjectScenePtr object, float duration)
+    {
+        for(size_t i = 0; i < object->mControllers.size() ;i++)
+        {
+            MWRender::EffectAnimationTime* value = dynamic_cast<MWRender::EffectAnimationTime*>(object->mControllers[i].getSource().get());
+            if (value)
+                value->addTime(duration);
+
+            object->mControllers[i].update();
+        }
+    }
+
+    void ProjectileManager::launchMagicBolt(const std::string &model, const std::string &sound,
+                                            const std::string &spellId, float speed, bool stack,
+                                            const ESM::EffectList &effects, const Ptr &actor, const std::string &sourceName)
+    {
+        // Spawn at 0.75 * ActorHeight
+        float height = mPhysEngine.getCharacter(actor.getRefData().getHandle())->getHalfExtents().z * 2 * 0.75;
+
+        Ogre::Vector3 pos(actor.getRefData().getPosition().pos);
+        pos.z += height;
+
+        Ogre::Quaternion orient = Ogre::Quaternion(Ogre::Radian(actor.getRefData().getPosition().rot[2]), Ogre::Vector3::NEGATIVE_UNIT_Z) *
+                Ogre::Quaternion(Ogre::Radian(actor.getRefData().getPosition().rot[0]), Ogre::Vector3::NEGATIVE_UNIT_X);
+
+        MagicBoltState state;
+        state.mSourceName = sourceName;
+        state.mId = model;
+        state.mSpellId = spellId;
+        state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
+        state.mSpeed = speed;
+        state.mStack = stack;
+        state.mSoundId = sound;
+
+        // Only interested in "on target" effects
+        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
+            iter!=effects.mList.end(); ++iter)
+        {
+            if (iter->mRange == ESM::RT_Target)
+                state.mEffects.mList.push_back(*iter);
+        }
+
+        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), model);
+        MWWorld::Ptr ptr = ref.getPtr();
+
+        state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(pos, orient);
+        createModel(state, ptr.getClass().getModel(ptr));
+
+        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+        state.mSound = sndMgr->playManualSound3D(pos, sound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
+
+        mMagicBolts.push_back(state);
+    }
+
+    void ProjectileManager::launchProjectile(Ptr actor, Ptr projectile, const Ogre::Vector3 &pos,
+                                             const Ogre::Quaternion &orient, Ptr bow, float speed)
+    {
+        ProjectileState state;
+        state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
+        state.mBowId = bow.getCellRef().mRefID;
+        state.mVelocity = orient.yAxis() * speed;
+        state.mId = projectile.getCellRef().mRefID;
+
+        MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), projectile.getCellRef().mRefID);
+        MWWorld::Ptr ptr = ref.getPtr();
+
+        state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(pos, orient);
+        createModel(state, ptr.getClass().getModel(ptr));
+
+        mProjectiles.push_back(state);
+    }
+
+    void ProjectileManager::update(float dt)
+    {
+        moveProjectiles(dt);
+        moveMagicBolts(dt);
+    }
+
+    void ProjectileManager::moveMagicBolts(float duration)
+    {
+        for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end();)
+        {
+            Ogre::Quaternion orient = it->mNode->getOrientation();
+            static float fTargetSpellMaxSpeed = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
+                        .find("fTargetSpellMaxSpeed")->getFloat();
+            float speed = fTargetSpellMaxSpeed * it->mSpeed;
+
+            Ogre::Vector3 direction = orient.yAxis();
+            direction.normalise();
+            Ogre::Vector3 pos(it->mNode->getPosition());
+            Ogre::Vector3 newPos = pos + direction * duration * speed;
+
+            it->mSound->setPosition(newPos);
+
+            it->mNode->setPosition(newPos);
+
+            update(it->mObject, duration);
+
+            // Check for impact
+            // TODO: use a proper btRigidBody / btGhostObject?
+            btVector3 from(pos.x, pos.y, pos.z);
+            btVector3 to(newPos.x, newPos.y, newPos.z);
+            std::vector<std::pair<float, std::string> > collisions = mPhysEngine.rayTest2(from, to);
+            bool hit=false;
+
+            for (std::vector<std::pair<float, std::string> >::iterator cIt = collisions.begin(); cIt != collisions.end() && !hit; ++cIt)
+            {
+                MWWorld::Ptr obstacle = MWBase::Environment::get().getWorld()->searchPtrViaHandle(cIt->second);
+
+                MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->mActorId);
+                if (caster.isEmpty())
+                    caster = obstacle;
+
+                if (obstacle.isEmpty())
+                {
+                    // Terrain
+                }
+                else
+                {
+                    MWMechanics::CastSpell cast(caster, obstacle);
+                    cast.mHitPosition = pos;
+                    cast.mId = it->mSpellId;
+                    cast.mSourceName = it->mSourceName;
+                    cast.mStack = it->mStack;
+                    cast.inflict(obstacle, caster, it->mEffects, ESM::RT_Target, false, true);
+                }
+
+                hit = true;
+            }
+            if (hit)
+            {
+                MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->mActorId);
+                MWBase::Environment::get().getWorld()->explodeSpell(pos, it->mEffects, caster, it->mSpellId, it->mSourceName);
+
+                MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
+
+                mSceneMgr->destroySceneNode(it->mNode);
+
+                it = mMagicBolts.erase(it);
+                continue;
+            }
+            else
+                ++it;
+        }
+    }
+
+    void ProjectileManager::moveProjectiles(float duration)
+    {
+        for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end();)
+        {
+            // gravity constant - must be way lower than the gravity affecting actors, since we're not
+            // simulating aerodynamics at all
+            it->mVelocity -= Ogre::Vector3(0, 0, 627.2f * 0.1f) * duration;
+
+            Ogre::Vector3 pos(it->mNode->getPosition());
+            Ogre::Vector3 newPos = pos + it->mVelocity * duration;
+
+            Ogre::Quaternion orient = Ogre::Vector3::UNIT_Y.getRotationTo(it->mVelocity);
+            it->mNode->setOrientation(orient);
+            it->mNode->setPosition(newPos);
+
+            update(it->mObject, duration);
+
+            // Check for impact
+            // TODO: use a proper btRigidBody / btGhostObject?
+            btVector3 from(pos.x, pos.y, pos.z);
+            btVector3 to(newPos.x, newPos.y, newPos.z);
+            std::vector<std::pair<float, std::string> > collisions = mPhysEngine.rayTest2(from, to);
+            bool hit=false;
+
+            for (std::vector<std::pair<float, std::string> >::iterator cIt = collisions.begin(); cIt != collisions.end() && !hit; ++cIt)
+            {
+                MWWorld::Ptr obstacle = MWBase::Environment::get().getWorld()->searchPtrViaHandle(cIt->second);
+
+                MWWorld::Ptr caster = MWBase::Environment::get().getWorld()->searchPtrViaActorId(it->mActorId);
+
+                // Arrow intersects with player immediately after shooting :/
+                if (obstacle == caster)
+                    continue;
+
+                if (obstacle.isEmpty())
+                {
+                    // Terrain
+                }
+                else if (obstacle.getClass().isActor())
+                {                    
+                    MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mId);
+
+                    // Try to get a Ptr to the bow that was used. It might no longer exist.
+                    MWWorld::Ptr bow = projectileRef.getPtr();
+                    if (!caster.isEmpty())
+                    {
+                        MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
+                        MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
+                        if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().mRefID, it->mBowId))
+                            bow = *invIt;
+                    }
+
+                    if (caster.isEmpty())
+                        caster = obstacle;
+
+                    MWMechanics::projectileHit(caster, obstacle, bow, projectileRef.getPtr(), pos + (newPos - pos) * cIt->first);
+                }
+                hit = true;
+            }
+            if (hit)
+            {
+                mSceneMgr->destroySceneNode(it->mNode);
+
+                it = mProjectiles.erase(it);
+                continue;
+            }
+            else
+                ++it;
+        }
+    }
+
+    void ProjectileManager::clear()
+    {
+        for (std::vector<ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
+        {
+            mSceneMgr->destroySceneNode(it->mNode);
+        }
+        mProjectiles.clear();
+        for (std::vector<MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
+        {
+            MWBase::Environment::get().getSoundManager()->stopSound(it->mSound);
+            mSceneMgr->destroySceneNode(it->mNode);
+        }
+        mMagicBolts.clear();
+    }
+
+    void ProjectileManager::write(ESM::ESMWriter &writer, Loading::Listener &progress) const
+    {
+        for (std::vector<ProjectileState>::const_iterator it = mProjectiles.begin(); it != mProjectiles.end(); ++it)
+        {
+            writer.startRecord(ESM::REC_PROJ);
+
+            ESM::ProjectileState state;
+            state.mId = it->mId;
+            state.mPosition = it->mNode->getPosition();
+            state.mOrientation = it->mNode->getOrientation();
+            state.mActorId = it->mActorId;
+
+            state.mBowId = it->mBowId;
+            state.mVelocity = it->mVelocity;
+
+            state.save(writer);
+
+            writer.endRecord(ESM::REC_PROJ);
+
+            progress.increaseProgress();
+        }
+
+        for (std::vector<MagicBoltState>::const_iterator it = mMagicBolts.begin(); it != mMagicBolts.end(); ++it)
+        {
+            writer.startRecord(ESM::REC_MPRJ);
+
+            ESM::MagicBoltState state;
+            state.mId = it->mId;
+            state.mPosition = it->mNode->getPosition();
+            state.mOrientation = it->mNode->getOrientation();
+            state.mActorId = it->mActorId;
+
+            state.mSpellId = it->mSpellId;
+            state.mEffects = it->mEffects;
+            state.mSound = it->mSoundId;
+            state.mSourceName = it->mSourceName;
+            state.mSpeed = it->mSpeed;
+            state.mStack = it->mStack;
+
+            state.save(writer);
+
+            writer.endRecord(ESM::REC_MPRJ);
+
+            progress.increaseProgress();
+        }
+    }
+
+    bool ProjectileManager::readRecord(ESM::ESMReader &reader, int32_t type)
+    {
+        if (type == ESM::REC_PROJ)
+        {
+            ESM::ProjectileState esm;
+            esm.load(reader);
+
+            ProjectileState state;
+            state.mActorId = esm.mActorId;
+            state.mBowId = esm.mBowId;
+            state.mVelocity = esm.mVelocity;
+            state.mId = esm.mId;
+
+            std::string model;
+            try
+            {
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), esm.mId);
+                MWWorld::Ptr ptr = ref.getPtr();
+                model = ptr.getClass().getModel(ptr);
+            }
+            catch(...)
+            {
+                return true;
+            }
+
+            state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(esm.mPosition, esm.mOrientation);
+            createModel(state, model);
+
+            mProjectiles.push_back(state);
+            return true;
+        }
+        else if (type == ESM::REC_MPRJ)
+        {
+            ESM::MagicBoltState esm;
+            esm.load(reader);
+
+            MagicBoltState state;
+            state.mSourceName = esm.mSourceName;
+            state.mId = esm.mId;
+            state.mSpellId = esm.mSpellId;
+            state.mActorId = esm.mActorId;
+            state.mSpeed = esm.mSpeed;
+            state.mStack = esm.mStack;
+            state.mEffects = esm.mEffects;
+
+            std::string model;
+            try
+            {
+                MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), esm.mId);
+                MWWorld::Ptr ptr = ref.getPtr();
+                model = ptr.getClass().getModel(ptr);
+            }
+            catch(...)
+            {
+                return true;
+            }
+
+            state.mNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(esm.mPosition, esm.mOrientation);
+            createModel(state, model);
+
+            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+            state.mSound = sndMgr->playManualSound3D(esm.mPosition, esm.mSound, 1.0f, 1.0f,
+                                                     MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
+
+            mMagicBolts.push_back(state);
+            return true;
+        }
+
+        return false;
+    }
+
+    int ProjectileManager::countSavedGameRecords() const
+    {
+        return mMagicBolts.size() + mProjectiles.size();
+    }
+
+}
diff --git a/apps/openmw/mwworld/projectilemanager.hpp b/apps/openmw/mwworld/projectilemanager.hpp
new file mode 100644
index 0000000000..da965a4cff
--- /dev/null
+++ b/apps/openmw/mwworld/projectilemanager.hpp
@@ -0,0 +1,111 @@
+#ifndef OPENMW_MWWORLD_PROJECTILEMANAGER_H
+#define OPENMW_MWWORLD_PROJECTILEMANAGER_H
+
+#include <string>
+
+#include <OgreVector3.h>
+
+#include <components/esm/effectlist.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
+
+#include "../mwbase/soundmanager.hpp"
+
+#include "ptr.hpp"
+
+namespace OEngine
+{
+namespace Physic
+{
+    class PhysicEngine;
+}
+}
+
+namespace Loading
+{
+    class Listener;
+}
+
+namespace Ogre
+{
+    class SceneManager;
+}
+
+namespace MWWorld
+{
+
+    class ProjectileManager
+    {
+    public:
+        ProjectileManager (Ogre::SceneManager* sceneMgr,
+                OEngine::Physic::PhysicEngine& engine);
+
+        void launchMagicBolt (const std::string& model, const std::string &sound, const std::string &spellId,
+                                     float speed, bool stack, const ESM::EffectList& effects,
+                                       const MWWorld::Ptr& actor, const std::string& sourceName);
+
+        void launchProjectile (MWWorld::Ptr actor, MWWorld::Ptr projectile,
+                                       const Ogre::Vector3& pos, const Ogre::Quaternion& orient, MWWorld::Ptr bow, float speed);
+
+        void update(float dt);
+
+        /// Removes all current projectiles. Should be called when switching to a new worldspace.
+        void clear();
+
+        void write (ESM::ESMWriter& writer, Loading::Listener& progress) const;
+        bool readRecord (ESM::ESMReader& reader, int32_t type);
+        int countSavedGameRecords() const;
+
+    private:
+        OEngine::Physic::PhysicEngine& mPhysEngine;
+        Ogre::SceneManager* mSceneMgr;
+
+        struct State
+        {
+            NifOgre::ObjectScenePtr mObject;
+            Ogre::SceneNode* mNode;
+
+            // Actor who shot this projectile
+            int mActorId;
+
+            // MW-id of this projectile
+            std::string mId;
+        };
+
+        struct MagicBoltState : public State
+        {
+            std::string mSpellId;
+
+            // Name of item to display as effect source in magic menu (in case we casted an enchantment)
+            std::string mSourceName;
+
+            ESM::EffectList mEffects;
+
+            float mSpeed;
+
+            bool mStack;
+
+            MWBase::SoundPtr mSound;
+            std::string mSoundId;
+        };
+
+        struct ProjectileState : public State
+        {
+            // RefID of the bow or crossbow the actor was using when this projectile was fired (may be empty)
+            std::string mBowId;
+
+            Ogre::Vector3 mVelocity;
+        };
+
+        std::vector<MagicBoltState> mMagicBolts;
+        std::vector<ProjectileState> mProjectiles;
+
+        void moveProjectiles(float dt);
+        void moveMagicBolts(float dt);
+
+        void createModel (State& state, const std::string& model);
+        void update (NifOgre::ObjectScenePtr object, float duration);
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwworld/ptr.cpp b/apps/openmw/mwworld/ptr.cpp
index 3920a3e794..b047ba47ca 100644
--- a/apps/openmw/mwworld/ptr.cpp
+++ b/apps/openmw/mwworld/ptr.cpp
@@ -5,14 +5,7 @@
 
 #include "containerstore.hpp"
 #include "class.hpp"
-
-
-/* This shouldn't really be here. */
-MWWorld::LiveCellRefBase::LiveCellRefBase(std::string type, const ESM::CellRef &cref)
-  : mClass(&Class::get(type)), mRef(cref), mData(mRef)
-{
-}
-
+#include "livecellref.hpp"
 
 const std::string& MWWorld::Ptr::getTypeName() const
 {
@@ -59,4 +52,4 @@ MWWorld::ContainerStore *MWWorld::Ptr::getContainerStore() const
 MWWorld::Ptr::operator const void *()
 {
     return mRef;
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index b830692831..f4696d3b3b 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -7,12 +7,12 @@
 #include <sstream>
 
 #include "cellreflist.hpp"
-#include "livecellref.hpp"
 
 namespace MWWorld
 {
     class ContainerStore;
     class CellStore;
+    class LiveCellRefBase;
 
     /// \brief Pointer to a LiveCellRef
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 4b92a920bd..122a6f9bf5 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -165,6 +165,8 @@ namespace MWWorld
                 }
             }
 
+            cell->respawn();
+
             // ... then references. This is important for adjustPosition to work correctly.
             /// \todo rescale depending on the state of a new GMST
             insertCell (*cell, true, loadingListener);
@@ -196,7 +198,7 @@ namespace MWWorld
             float z = Ogre::Radian(pos.rot[2]).valueDegrees();
             world->rotateObject(player, x, y, z);
 
-            MWWorld::Class::get(player).adjustPosition(player);
+            player.getClass().adjustPosition(player);
         }
 
         MWBase::MechanicsManager *mechMgr =
@@ -344,8 +346,6 @@ namespace MWWorld
         // Sky system
         MWBase::Environment::get().getWorld()->adjustSky();
 
-        mRendering.switchToExterior();
-
         mCellChanged = true;
 
         loadingListener->removeWallpaper();
@@ -399,7 +399,7 @@ namespace MWWorld
             float z = Ogre::Radian(position.rot[2]).valueDegrees();
             world->rotateObject(world->getPlayerPtr(), x, y, z);
 
-            MWWorld::Class::get(world->getPlayerPtr()).adjustPosition(world->getPlayerPtr());
+            world->getPlayerPtr().getClass().adjustPosition(world->getPlayerPtr());
             world->getFader()->fadeIn(0.5f);
             return;
         }
@@ -439,7 +439,6 @@ namespace MWWorld
         mCurrentCell = cell;
 
         // adjust fog
-        mRendering.switchToInterior();
         mRendering.configureFog(*mCurrentCell);
 
         // adjust player
@@ -483,7 +482,7 @@ namespace MWWorld
     void Scene::addObjectToScene (const Ptr& ptr)
     {
         mRendering.addObject(ptr);
-        MWWorld::Class::get(ptr).insertObject(ptr, *mPhysics);
+        ptr.getClass().insertObject(ptr, *mPhysics);
         MWBase::Environment::get().getWorld()->rotateObject(ptr, 0, 0, 0, true);
         MWBase::Environment::get().getWorld()->scaleObject(ptr, ptr.getCellRef().mScale);
     }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2b1cbe4c72..5a83a5bc74 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -6,7 +6,8 @@
 #else
 #include <tr1/unordered_map>
 #endif
-
+#include "../mwbase/scriptmanager.hpp"
+#include "../mwscript/globalscripts.hpp"
 #include <OgreSceneNode.h>
 
 #include <libs/openengine/bullet/trace.h>
@@ -43,6 +44,7 @@
 #include "containerstore.hpp"
 #include "inventorystore.hpp"
 #include "actionteleport.hpp"
+#include "projectilemanager.hpp"
 
 #include "contentloader.hpp"
 #include "esmloader.hpp"
@@ -124,18 +126,20 @@ namespace MWWorld
         const std::vector<std::string>& contentFiles,
         const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir,
         ToUTF8::Utf8Encoder* encoder, const std::map<std::string,std::string>& fallbackMap,
-        int activationDistanceOverride, const std::string& startCell)
+        int activationDistanceOverride, const std::string& startCell, const std::string& startupScript)
     : mPlayer (0), mLocalScripts (mStore),
       mSky (true), mCells (mStore, mEsm),
       mActivationDistanceOverride (activationDistanceOverride),
-      mFallback(fallbackMap), mPlayIntro(0), mTeleportEnabled(true), mLevitationEnabled(true),
+      mFallback(fallbackMap), mTeleportEnabled(true), mLevitationEnabled(true),
       mFacedDistance(FLT_MAX), mGodMode(false), mContentFiles (contentFiles),
       mGoToJail(false),
-      mStartCell (startCell)
+      mStartCell (startCell), mStartupScript(startupScript)
     {
         mPhysics = new PhysicsSystem(renderer);
         mPhysEngine = mPhysics->getEngine();
 
+        mProjectileManager.reset(new ProjectileManager(renderer.getScene(), *mPhysEngine));
+
         mRendering = new MWRender::RenderingManager(renderer, resDir, cacheDir, mPhysEngine,&mFallback);
 
         mPhysEngine->setSceneManager(renderer.getScene());
@@ -185,6 +189,15 @@ namespace MWWorld
 
         MWBase::Environment::get().getWindowManager()->updatePlayer();
 
+        if (!bypass)
+        {
+            // set new game mark
+            mGlobalVariables["chargenstate"].setInteger (1);
+            mGlobalVariables["pcrace"].setInteger (3);
+
+            MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
+        }
+
         if (bypass && !mStartCell.empty())
         {
             ESM::Position pos;
@@ -201,46 +214,46 @@ namespace MWWorld
         }
         else
         {
-            /// \todo if !bypass, do not add player location to global map for the duration of one
-            /// frame
-            ESM::Position pos;
-            const int cellSize = 8192;
-            pos.pos[0] = cellSize/2;
-            pos.pos[1] = cellSize/2;
-            pos.pos[2] = 0;
-            pos.rot[0] = 0;
-            pos.rot[1] = 0;
-            pos.rot[2] = 0;
-            mWorldScene->changeToExteriorCell(pos);
+            for (int i=0; i<5; ++i)
+                MWBase::Environment::get().getScriptManager()->getGlobalScripts().run();
+            if (!getPlayerPtr().isInCell())
+            {
+                ESM::Position pos;
+                const int cellSize = 8192;
+                pos.pos[0] = cellSize/2;
+                pos.pos[1] = cellSize/2;
+                pos.pos[2] = 0;
+                pos.rot[0] = 0;
+                pos.rot[1] = 0;
+                pos.rot[2] = 0;
+                mWorldScene->changeToExteriorCell(pos);
+            }
         }
 
         if (!bypass)
-        {
-            // FIXME: should be set to 1, but the sound manager won't pause newly started sounds
-            mPlayIntro = 2;
+            MWBase::Environment::get().getWindowManager()->playVideo(mFallback.getFallbackString("Movies_New_Game"), true);
 
-            // set new game mark
-            mGlobalVariables["chargenstate"].setInteger (1);
-            mGlobalVariables["pcrace"].setInteger (3);
-        }
+        // enable collision
+        if (!mPhysics->toggleCollisionMode())
+            mPhysics->toggleCollisionMode();
 
         // we don't want old weather to persist on a new game
         delete mWeatherManager;
         mWeatherManager = 0;
         mWeatherManager = new MWWorld::WeatherManager(mRendering,&mFallback);
+
+        MWBase::Environment::get().getWindowManager()->executeInConsole(mStartupScript);
     }
 
     void World::clear()
     {
         mRendering->clear();
 
+        mProjectileManager->clear();
+
         mLocalScripts.clear();
         mPlayer->clear();
 
-        // enable collision
-        if (!mPhysics->toggleCollisionMode())
-            mPhysics->toggleCollisionMode();
-
         mWorldScene->changeToVoid();
 
         mStore.clearDynamic();
@@ -255,14 +268,11 @@ namespace MWWorld
 
         mCells.clear();
 
-        mMagicBolts.clear();
-        mProjectiles.clear();
         mDoorStates.clear();
 
         mGodMode = false;
         mSky = true;
         mTeleportEnabled = true;
-        mPlayIntro = 0;
         mFacedDistance = FLT_MAX;
 
         mGlobalVariables.fill (mStore);
@@ -274,6 +284,7 @@ namespace MWWorld
             mCells.countSavedGameRecords()
             +mStore.countSavedGameRecords()
             +mGlobalVariables.countSavedGameRecords()
+            +mProjectileManager->countSavedGameRecords()
             +1 // player record
             +1 // weather record
             +1; // actorId counter
@@ -297,6 +308,7 @@ namespace MWWorld
         mGlobalVariables.write (writer, progress);
         mPlayer->write (writer, progress);
         mWeatherManager->write (writer, progress);
+        mProjectileManager->write (writer, progress);
     }
 
     void World::readRecord (ESM::ESMReader& reader, int32_t type,
@@ -312,7 +324,8 @@ namespace MWWorld
             !mGlobalVariables.readRecord (reader, type) &&
             !mPlayer->readRecord (reader, type) &&
             !mWeatherManager->readRecord (reader, type) &&
-            !mCells.readRecord (reader, type, contentFileMap))
+            !mCells.readRecord (reader, type, contentFileMap) &&
+            !mProjectileManager->readRecord (reader, type))
         {
             throw std::runtime_error ("unknown record in saved game");
         }
@@ -524,8 +537,8 @@ namespace MWWorld
                 return ptr;
         }
 
-        Ptr ptr = Class::get (mPlayer->getPlayer()).
-            getContainerStore (mPlayer->getPlayer()).search (lowerCaseName);
+        Ptr ptr = mPlayer->getPlayer().getClass()
+            .getContainerStore(mPlayer->getPlayer()).search(lowerCaseName);
 
         if (!ptr.isEmpty())
             return ptr;
@@ -576,10 +589,10 @@ namespace MWWorld
             reference.getTypeName()==typeid (ESM::NPC).name() ||
             reference.getTypeName()==typeid (ESM::Creature).name())
         {
-            MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+            MWWorld::ContainerStore& container = reference.getClass().getContainerStore(reference);
             for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
             {
-                std::string script = MWWorld::Class::get(*it).getScript(*it);
+                std::string script = it->getClass().getScript(*it);
                 if(script != "")
                 {
                     MWWorld::Ptr item = *it;
@@ -611,10 +624,10 @@ namespace MWWorld
             reference.getTypeName()==typeid (ESM::NPC).name() ||
             reference.getTypeName()==typeid (ESM::Creature).name())
         {
-            MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+            MWWorld::ContainerStore& container = reference.getClass().getContainerStore(reference);
             for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
             {
-                std::string script = MWWorld::Class::get(*it).getScript(*it);
+                std::string script = it->getClass().getScript(*it);
                 if(script != "")
                 {
                     MWWorld::Ptr item = *it;
@@ -807,6 +820,14 @@ namespace MWWorld
 
     void World::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
     {
+        if (mCurrentWorldSpace != cellName)
+        {
+            // changed worldspace
+            mProjectileManager->clear();
+            mRendering->notifyWorldSpaceChanged();
+            mCurrentWorldSpace = cellName;
+        }
+
         removeContainerScripts(getPlayerPtr());
         mWorldScene->changeToInteriorCell(cellName, position);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
@@ -814,13 +835,22 @@ namespace MWWorld
 
     void World::changeToExteriorCell (const ESM::Position& position)
     {
+        if (mCurrentWorldSpace != "sys::default") // FIXME
+        {
+            // changed worldspace
+            mProjectileManager->clear();
+            mRendering->notifyWorldSpaceChanged();
+        }
         removeContainerScripts(getPlayerPtr());
         mWorldScene->changeToExteriorCell(position);
         addContainerScripts(getPlayerPtr(), getPlayerPtr().getCell());
     }
 
-    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position)
+    void World::changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange)
     {
+        if (!detectWorldSpaceChange)
+            mCurrentWorldSpace = cellId.mWorldspace;
+
         if (cellId.mPaged)
             changeToExteriorCell (position);
         else
@@ -915,7 +945,7 @@ namespace MWWorld
 
         Ogre::Vector3 vec(x, y, z);
 
-        CellStore *currCell = ptr.getCell();
+        CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL;
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = isPlayer || mWorldScene->isCellActive(*currCell);
 
@@ -946,16 +976,14 @@ namespace MWWorld
                     removeContainerScripts (ptr);
                     haveToMove = false;
 
-                    MWWorld::Ptr newPtr = MWWorld::Class::get(ptr)
+                    MWWorld::Ptr newPtr = ptr.getClass()
                             .copyToCell(ptr, *newCell);
                     newPtr.getRefData().setBaseNode(0);
-
-                    objectLeftActiveCell(ptr, newPtr);
                 }
                 else
                 {
                     MWWorld::Ptr copy =
-                        MWWorld::Class::get(ptr).copyToCell(ptr, *newCell, pos);
+                        ptr.getClass().copyToCell(ptr, *newCell, pos);
 
                     mRendering->updateObjectCell(ptr, copy);
                     MWBase::Environment::get().getSoundManager()->updatePtr (ptr, copy);
@@ -964,7 +992,7 @@ namespace MWWorld
                     mechMgr->updateCell(ptr, copy);
 
                     std::string script =
-                        MWWorld::Class::get(ptr).getScript(ptr);
+                        ptr.getClass().getScript(ptr);
                     if (!script.empty())
                     {
                         mLocalScripts.remove(ptr);
@@ -1007,7 +1035,7 @@ namespace MWWorld
     void World::scaleObject (const Ptr& ptr, float scale)
     {
         ptr.getCellRef().mScale = scale;
-        MWWorld::Class::get(ptr).adjustScale(ptr,scale);
+        ptr.getClass().adjustScale(ptr,scale);
 
         if(ptr.getRefData().getBaseNode() == 0)
             return;
@@ -1034,7 +1062,7 @@ namespace MWWorld
             objRot[2] = rot.z;
         }
 
-        if(Class::get(ptr).isActor())
+        if(ptr.getClass().isActor())
         {
             /* HACK? Actors shouldn't really be rotating around X (or Y), but
              * currently it's done so for rotating the camera, which needs
@@ -1172,8 +1200,7 @@ namespace MWWorld
     {
         processDoors(duration);
 
-        moveMagicBolts(duration);
-        moveProjectiles(duration);
+        mProjectileManager->update(duration);
 
         const PtrVelocityList &results = mPhysics->applyQueuedMovement(duration);
         PtrVelocityList::const_iterator player(results.end());
@@ -1343,13 +1370,6 @@ namespace MWWorld
 
     void World::update (float duration, bool paused)
     {
-        if (mPlayIntro)
-        {
-            --mPlayIntro;
-            if (mPlayIntro == 0)
-                MWBase::Environment::get().getWindowManager()->playVideo(mFallback.getFallbackString("Movies_New_Game"), true);
-        }
-
         if (mGoToJail && !paused)
             goToJail();
 
@@ -1553,26 +1573,26 @@ namespace MWWorld
         mRendering->setWaterHeight(height);
     }
 
-    void World::toggleWater()
+    bool World::toggleWater()
     {
-        mRendering->toggleWater();
+        return mRendering->toggleWater();
     }
 
     void World::PCDropped (const Ptr& item)
     {
-        std::string script = MWWorld::Class::get(item).getScript(item);
+        std::string script = item.getClass().getScript(item);
 
         // Set OnPCDrop Variable on item's script, if it has a script with that variable declared
         if(script != "")
             item.getRefData().getLocals().setVarByInt(script, "onpcdrop", 1);
     }
 
-    bool World::placeObject (const MWWorld::Ptr& object, float cursorX, float cursorY, int amount)
+    MWWorld::Ptr World::placeObject (const MWWorld::Ptr& object, float cursorX, float cursorY, int amount)
     {
         std::pair<bool, Ogre::Vector3> result = mPhysics->castRay(cursorX, cursorY);
 
         if (!result.first)
-            return false;
+            return MWWorld::Ptr();
 
         CellStore* cell = getPlayerPtr().getCell();
 
@@ -1593,7 +1613,7 @@ namespace MWWorld
         // only the player place items in the world, so no need to check actor
         PCDropped(dropped);
 
-        return true;
+        return dropped;
     }
 
     bool World::canPlaceObject(float cursorX, float cursorY)
@@ -1628,13 +1648,13 @@ namespace MWWorld
         }
 
         MWWorld::Ptr dropped =
-            MWWorld::Class::get(object).copyToCell(object, *cell, pos);
+            object.getClass().copyToCell(object, *cell, pos);
 
         if (mWorldScene->isCellActive(*cell)) {
             if (dropped.getRefData().isEnabled()) {
                 mWorldScene->addObjectToScene(dropped);
             }
-            std::string script = MWWorld::Class::get(dropped).getScript(dropped);
+            std::string script = dropped.getClass().getScript(dropped);
             if (!script.empty()) {
                 mLocalScripts.add(script, dropped);
             }
@@ -1644,7 +1664,7 @@ namespace MWWorld
         return dropped;
     }
 
-    void World::dropObjectOnGround (const Ptr& actor, const Ptr& object, int amount)
+    MWWorld::Ptr World::dropObjectOnGround (const Ptr& actor, const Ptr& object, int amount)
     {
         MWWorld::CellStore* cell = actor.getCell();
 
@@ -1673,6 +1693,7 @@ namespace MWWorld
 
         if(actor == mPlayer->getPlayer()) // Only call if dropped by player
             PCDropped(dropped);
+        return dropped;
     }
 
     void World::processChangedSettings(const Settings::CategorySettingVector& settings)
@@ -1842,7 +1863,7 @@ namespace MWWorld
         if((!physactor->getOnGround()&&physactor->getCollisionMode()) || isUnderwater(currentCell, playerPos))
             return 2;
         if((currentCell->getCell()->mData.mFlags&ESM::Cell::NoSleep) ||
-           Class::get(player).getNpcStats(player).isWerewolf())
+           player.getClass().getNpcStats(player).isWerewolf())
             return 1;
 
         return 0;
@@ -2086,7 +2107,7 @@ namespace MWWorld
 
     void World::setWerewolf(const MWWorld::Ptr& actor, bool werewolf)
     {
-        MWMechanics::NpcStats& npcStats = Class::get(actor).getNpcStats(actor);
+        MWMechanics::NpcStats& npcStats = actor.getClass().getNpcStats(actor);
 
         // The actor does not have to change state
         if (npcStats.isWerewolf() == werewolf)
@@ -2098,7 +2119,7 @@ namespace MWWorld
         // bones that do not even exist with the werewolf object root.
         // Therefore, make sure to unequip everything at once, and only fire the change event
         // (which will rebuild the animation parts) afterwards. unequipAll will do this for us.
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
+        MWWorld::InventoryStore& invStore = actor.getClass().getInventoryStore(actor);
         invStore.unequipAll(actor);
 
         if(werewolf)
@@ -2137,7 +2158,7 @@ namespace MWWorld
     void World::applyWerewolfAcrobatics(const Ptr &actor)
     {
         const Store<ESM::GameSetting> &gmst = getStore().get<ESM::GameSetting>();
-        MWMechanics::NpcStats &stats = Class::get(actor).getNpcStats(actor);
+        MWMechanics::NpcStats &stats = actor.getClass().getNpcStats(actor);
 
         stats.getSkill(ESM::Skill::Acrobatics).setBase(gmst.find("fWerewolfAcrobatics")->getFloat());
     }
@@ -2253,306 +2274,14 @@ namespace MWWorld
     void World::launchProjectile (MWWorld::Ptr actor, MWWorld::Ptr projectile,
                                    const Ogre::Vector3& worldPos, const Ogre::Quaternion& orient, MWWorld::Ptr bow, float speed)
     {
-        ProjectileState state;
-        state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
-        state.mBow = bow;
-        state.mVelocity = orient.yAxis() * speed;
-
-        MWWorld::ManualRef ref(getStore(), projectile.getCellRef().mRefID);
-
-        ESM::Position pos;
-        pos.pos[0] = worldPos.x;
-        pos.pos[1] = worldPos.y;
-        pos.pos[2] = worldPos.z;
-
-        // Do NOT copy actor rotation! actors use a different rotation order, and this will not produce the same facing direction.
-        Ogre::Matrix3 mat;
-        orient.ToRotationMatrix(mat);
-        Ogre::Radian xr,yr,zr;
-        mat.ToEulerAnglesXYZ(xr, yr, zr);
-        pos.rot[0] = -xr.valueRadians();
-        pos.rot[1] = -yr.valueRadians();
-        pos.rot[2] = -zr.valueRadians();
-
-        MWWorld::Ptr ptr = copyObjectToCell(ref.getPtr(), actor.getCell(), pos, false);
-        ptr.getRefData().setCount(1);
-
-        mProjectiles[ptr] = state;
+        mProjectileManager->launchProjectile(actor, projectile, worldPos, orient, bow, speed);
     }
 
-    void World::launchMagicBolt (const std::string& id, bool stack, const ESM::EffectList& effects,
+    void World::launchMagicBolt (const std::string& model, const std::string &sound, const std::string &spellId,
+                                 float speed, bool stack, const ESM::EffectList& effects,
                                    const MWWorld::Ptr& actor, const std::string& sourceName)
     {
-        std::string projectileModel;
-        std::string sound;
-        float speed = 0;
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
-            iter!=effects.mList.end(); ++iter)
-        {
-            if (iter->mRange != ESM::RT_Target)
-                continue;
-
-            const ESM::MagicEffect *magicEffect = getStore().get<ESM::MagicEffect>().find (
-                iter->mEffectID);
-
-            projectileModel = magicEffect->mBolt;
-            if (projectileModel.empty())
-                projectileModel = "VFX_DefaultBolt";
-
-            static const std::string schools[] = {
-                "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-            };
-
-            if (!magicEffect->mBoltSound.empty())
-                sound = magicEffect->mBoltSound;
-            else
-                sound = schools[magicEffect->mData.mSchool] + " bolt";
-
-            speed = magicEffect->mData.mSpeed;
-            break;
-        }
-        if (projectileModel.empty())
-            return;
-
-        // Spawn at 0.75 * ActorHeight
-        float height = mPhysEngine->getCharacter(actor.getRefData().getHandle())->getHalfExtents().z * 2 * 0.75;
-
-        MWWorld::ManualRef ref(getStore(), projectileModel);
-        ESM::Position pos;
-        pos.pos[0] = actor.getRefData().getPosition().pos[0];
-        pos.pos[1] = actor.getRefData().getPosition().pos[1];
-        pos.pos[2] = actor.getRefData().getPosition().pos[2] + height;
-
-        // Do NOT copy rotation directly! actors use a different rotation order, and this will not produce the same facing direction.
-        Ogre::Quaternion orient = Ogre::Quaternion(Ogre::Radian(actor.getRefData().getPosition().rot[2]), Ogre::Vector3::NEGATIVE_UNIT_Z) *
-                Ogre::Quaternion(Ogre::Radian(actor.getRefData().getPosition().rot[0]), Ogre::Vector3::NEGATIVE_UNIT_X);
-        Ogre::Matrix3 mat;
-        orient.ToRotationMatrix(mat);
-        Ogre::Radian xr,yr,zr;
-        mat.ToEulerAnglesXYZ(xr, yr, zr);
-        pos.rot[0] = -xr.valueRadians();
-        pos.rot[1] = -yr.valueRadians();
-        pos.rot[2] = -zr.valueRadians();
-
-        ref.getPtr().getCellRef().mPos = pos;
-        CellStore* cell = actor.getCell();
-        MWWorld::Ptr ptr = copyObjectToCell(ref.getPtr(), cell, pos);
-
-        MagicBoltState state;
-        state.mSourceName = sourceName;
-        state.mId = id;
-        state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
-        state.mSpeed = speed;
-        state.mStack = stack;
-
-        // Only interested in "on target" effects
-        for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
-            iter!=effects.mList.end(); ++iter)
-        {
-            if (iter->mRange == ESM::RT_Target)
-                state.mEffects.mList.push_back(*iter);
-        }
-
-        MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-        sndMgr->playSound3D(ptr, sound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
-
-        mMagicBolts[ptr] = state;
-    }
-
-    void World::moveProjectiles(float duration)
-    {
-        std::map<std::string, ProjectileState> moved;
-        for (std::map<MWWorld::Ptr, ProjectileState>::iterator it = mProjectiles.begin(); it != mProjectiles.end();)
-        {
-            if (!mWorldScene->isCellActive(*it->first.getCell()))
-            {
-                deleteObject(it->first);
-                mProjectiles.erase(it++);
-                continue;
-            }
-
-            MWWorld::Ptr ptr = it->first;
-
-            // gravity constant - must be way lower than the gravity affecting actors, since we're not
-            // simulating aerodynamics at all
-            it->second.mVelocity -= Ogre::Vector3(0, 0, 627.2f * 0.1f) * duration;
-
-            Ogre::Vector3 pos(ptr.getRefData().getPosition().pos);
-            Ogre::Vector3 newPos = pos + it->second.mVelocity * duration;
-
-            Ogre::Quaternion orient = Ogre::Vector3::UNIT_Y.getRotationTo(it->second.mVelocity);
-            Ogre::Matrix3 mat;
-            orient.ToRotationMatrix(mat);
-            Ogre::Radian xr,yr,zr;
-            mat.ToEulerAnglesXYZ(xr, yr, zr);
-            rotateObject(ptr, -xr.valueDegrees(), -yr.valueDegrees(), -zr.valueDegrees());
-
-            // Check for impact
-            btVector3 from(pos.x, pos.y, pos.z);
-            btVector3 to(newPos.x, newPos.y, newPos.z);
-            std::vector<std::pair<float, std::string> > collisions = mPhysEngine->rayTest2(from, to);
-            bool hit=false;
-
-            // HACK: query against the shape as well, since the ray does not take the volume into account
-            // really, this should be a convex cast, but the whole physics system needs a rewrite
-            std::vector<std::string> col2 = mPhysEngine->getCollisions(ptr.getRefData().getHandle());
-            for (std::vector<std::string>::iterator ci = col2.begin(); ci != col2.end(); ++ci)
-                 collisions.push_back(std::make_pair(0.f,*ci));
-
-            for (std::vector<std::pair<float, std::string> >::iterator cIt = collisions.begin(); cIt != collisions.end() && !hit; ++cIt)
-            {
-                MWWorld::Ptr obstacle = searchPtrViaHandle(cIt->second);
-                if (obstacle == ptr)
-                    continue;
-
-                MWWorld::Ptr caster = searchPtrViaActorId(it->second.mActorId);
-
-                // Arrow intersects with player immediately after shooting :/
-                if (obstacle == caster)
-                    continue;
-
-                if (caster.isEmpty())
-                    caster = obstacle;
-
-                if (obstacle.isEmpty())
-                {
-                    // Terrain
-                }
-                else if (obstacle.getClass().isActor())
-                {
-                    MWMechanics::projectileHit(caster, obstacle, it->second.mBow, ptr, pos + (newPos - pos) * cIt->first);
-                }
-                hit = true;
-            }
-            if (hit)
-            {
-                deleteObject(ptr);
-                mProjectiles.erase(it++);
-                continue;
-            }
-
-            std::string handle = ptr.getRefData().getHandle();
-
-            moveObject(ptr, newPos.x, newPos.y, newPos.z);
-
-            // HACK: Re-fetch Ptrs if necessary, since the cell might have changed
-            if (!ptr.getRefData().getCount())
-            {
-                moved[handle] = it->second;
-                mProjectiles.erase(it++);
-            }
-            else
-                ++it;
-        }
-
-        // HACK: Re-fetch Ptrs if necessary, since the cell might have changed
-        for (std::map<std::string, ProjectileState>::iterator it = moved.begin(); it != moved.end(); ++it)
-        {
-            MWWorld::Ptr newPtr = searchPtrViaHandle(it->first);
-            if (newPtr.isEmpty()) // The projectile went into an inactive cell and was deleted
-                continue;
-            mProjectiles[getPtrViaHandle(it->first)] = it->second;
-        }
-    }
-
-    void World::moveMagicBolts(float duration)
-    {
-        std::map<std::string, MagicBoltState> moved;
-        for (std::map<MWWorld::Ptr, MagicBoltState>::iterator it = mMagicBolts.begin(); it != mMagicBolts.end();)
-        {
-            if (!mWorldScene->isCellActive(*it->first.getCell()))
-            {
-                deleteObject(it->first);
-                mMagicBolts.erase(it++);
-                continue;
-            }
-
-            MWWorld::Ptr ptr = it->first;
-
-            Ogre::Vector3 rot(ptr.getRefData().getPosition().rot);
-
-            Ogre::Quaternion orient = ptr.getRefData().getBaseNode()->getOrientation();
-            static float fTargetSpellMaxSpeed = getStore().get<ESM::GameSetting>().find("fTargetSpellMaxSpeed")->getFloat();
-            float speed = fTargetSpellMaxSpeed * it->second.mSpeed;
-
-            Ogre::Vector3 direction = orient.yAxis();
-            direction.normalise();
-            Ogre::Vector3 pos(ptr.getRefData().getPosition().pos);
-            Ogre::Vector3 newPos = pos + direction * duration * speed;
-
-            // Check for impact
-            btVector3 from(pos.x, pos.y, pos.z);
-            btVector3 to(newPos.x, newPos.y, newPos.z);
-            std::vector<std::pair<float, std::string> > collisions = mPhysEngine->rayTest2(from, to);
-            bool explode = false;
-            for (std::vector<std::pair<float, std::string> >::iterator cIt = collisions.begin(); cIt != collisions.end() && !explode; ++cIt)
-            {
-                MWWorld::Ptr obstacle = searchPtrViaHandle(cIt->second);
-                if (obstacle == ptr)
-                    continue;
-
-                MWWorld::Ptr caster = searchPtrViaActorId(it->second.mActorId);
-                if (caster.isEmpty())
-                    caster = obstacle;
-
-                if (obstacle.isEmpty())
-                {
-                    // Terrain
-                }
-                else
-                {
-                    MWMechanics::CastSpell cast(caster, obstacle);
-                    cast.mHitPosition = pos;
-                    cast.mId = it->second.mId;
-                    cast.mSourceName = it->second.mSourceName;
-                    cast.mStack = it->second.mStack;
-                    cast.inflict(obstacle, caster, it->second.mEffects, ESM::RT_Target, false, true);
-                }
-
-                explode = true;
-            }
-
-            if (explode)
-            {
-                MWWorld::Ptr caster = searchPtrViaActorId(it->second.mActorId);
-                explodeSpell(Ogre::Vector3(ptr.getRefData().getPosition().pos), ptr, it->second.mEffects, caster, it->second.mId, it->second.mSourceName);
-
-                deleteObject(ptr);
-                mMagicBolts.erase(it++);
-                continue;
-            }
-
-            std::string handle = ptr.getRefData().getHandle();
-
-            moveObject(ptr, newPos.x, newPos.y, newPos.z);
-
-            // HACK: Re-fetch Ptrs if necessary, since the cell might have changed
-            if (!ptr.getRefData().getCount())
-            {
-                moved[handle] = it->second;
-                mMagicBolts.erase(it++);
-            }
-            else
-                ++it;
-        }
-
-        // HACK: Re-fetch Ptrs if necessary, since the cell might have changed
-        for (std::map<std::string, MagicBoltState>::iterator it = moved.begin(); it != moved.end(); ++it)
-        {
-            MWWorld::Ptr newPtr = searchPtrViaHandle(it->first);
-            if (newPtr.isEmpty()) // The projectile went into an inactive cell and was deleted
-                continue;
-            mMagicBolts[getPtrViaHandle(it->first)] = it->second;
-        }
-    }
-
-    void World::objectLeftActiveCell(Ptr object, Ptr movedPtr)
-    {
-        // For now, projectiles moved to an inactive cell are just deleted, because there's no reliable way to hold on to the meta information
-        if (mMagicBolts.find(object) != mMagicBolts.end())
-            deleteObject(movedPtr);
-        if (mProjectiles.find(object) != mProjectiles.end())
-            deleteObject(movedPtr);
+        mProjectileManager->launchMagicBolt(model, sound, spellId, speed, stack, effects, actor, sourceName);
     }
 
     const std::vector<std::string>& World::getContentFiles() const
@@ -2934,7 +2663,7 @@ namespace MWWorld
         mRendering->spawnEffect(model, texture, worldPosition);
     }
 
-    void World::explodeSpell(const Vector3 &origin, const MWWorld::Ptr& object, const ESM::EffectList &effects, const Ptr &caster,
+    void World::explodeSpell(const Vector3 &origin, const ESM::EffectList &effects, const Ptr &caster,
                              const std::string& id, const std::string& sourceName)
     {
         std::map<MWWorld::Ptr, std::vector<ESM::ENAMstruct> > toApply;
@@ -2959,12 +2688,13 @@ namespace MWWorld
             static const std::string schools[] = {
                 "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
             };
-            MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-            if(!effect->mAreaSound.empty())
-                sndMgr->playSound3D(object, effect->mAreaSound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_NoTrack);
-            else
-                sndMgr->playSound3D(object, schools[effect->mData.mSchool]+" area", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_NoTrack);
-
+            {
+                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+                if(!effect->mAreaSound.empty())
+                    sndMgr->playManualSound3D(origin, effect->mAreaSound, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_NoTrack);
+                else
+                    sndMgr->playManualSound3D(origin, schools[effect->mData.mSchool]+" area", 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_NoTrack);
+            }
             // Get the actors in range of the effect
             std::vector<MWWorld::Ptr> objects;
             MWBase::Environment::get().getMechanicsManager()->getObjectsInRange(
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 7b85c3ed87..0a396ef5c6 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -3,6 +3,8 @@
 
 #include "../mwrender/debugging.hpp"
 
+#include <boost/shared_ptr.hpp>
+
 #include "ptr.hpp"
 #include "scene.hpp"
 #include "esmstore.hpp"
@@ -51,6 +53,7 @@ namespace MWWorld
 {
     class WeatherManager;
     class Player;
+    class ProjectileManager;
 
     /// \brief The game world and its visual representation
 
@@ -72,8 +75,12 @@ namespace MWWorld
 
             Cells mCells;
 
+            std::string mCurrentWorldSpace;
+
             OEngine::Physic::PhysicEngine* mPhysEngine;
 
+            boost::shared_ptr<ProjectileManager> mProjectileManager;
+
             bool mGodMode;
             std::vector<std::string> mContentFiles;
 
@@ -87,40 +94,11 @@ namespace MWWorld
             std::string mFacedHandle;
             float mFacedDistance;
 
+            std::string mStartupScript;
+
             std::map<MWWorld::Ptr, int> mDoorStates;
             ///< only holds doors that are currently moving. 1 = opening, 2 = closing
 
-            struct MagicBoltState
-            {
-                // Id of spell or enchantment to apply when it hits
-                std::string mId;
-
-                // Actor who casted this projectile
-                int mActorId;
-
-                // Name of item to display as effect source in magic menu (in case we casted an enchantment)
-                std::string mSourceName;
-
-                ESM::EffectList mEffects;
-
-                float mSpeed;
-
-                bool mStack;
-            };
-
-            struct ProjectileState
-            {
-                // Actor who shot this projectile
-                int mActorId;
-
-                MWWorld::Ptr mBow; // bow or crossbow the projectile was fired from
-
-                Ogre::Vector3 mVelocity;
-            };
-
-            std::map<MWWorld::Ptr, MagicBoltState> mMagicBolts;
-            std::map<MWWorld::Ptr, ProjectileState> mProjectiles;
-
             std::string mStartCell;
 
             void updateWeather(float duration);
@@ -148,9 +126,6 @@ namespace MWWorld
             void processDoors(float duration);
             ///< Run physics simulation and modify \a world accordingly.
 
-            void moveMagicBolts(float duration);
-            void moveProjectiles(float duration);
-
             void doPhysics(float duration);
             ///< Run physics simulation and modify \a world accordingly.
 
@@ -165,15 +140,10 @@ namespace MWWorld
             void loadContentFiles(const Files::Collections& fileCollections,
                 const std::vector<std::string>& content, ContentLoader& contentLoader);
 
-            int mPlayIntro;
-
             bool mTeleportEnabled;
             bool mLevitationEnabled;
             bool mGoToJail;
 
-            /// Called when \a object is moved to an inactive cell
-            void objectLeftActiveCell (MWWorld::Ptr object, MWWorld::Ptr movedPtr);
-
             float feetToGameUnits(float feet);
 
         public:
@@ -183,7 +153,7 @@ namespace MWWorld
                 const std::vector<std::string>& contentFiles,
                 const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir,
                 ToUTF8::Utf8Encoder* encoder, const std::map<std::string,std::string>& fallbackMap,
-                int activationDistanceOverride, const std::string& startCell);
+                int activationDistanceOverride, const std::string& startCell, const std::string& startupScript);
 
             virtual ~World();
 
@@ -213,7 +183,7 @@ namespace MWWorld
 
             virtual void setWaterHeight(const float height);
 
-            virtual void toggleWater();
+            virtual bool toggleWater();
 
             virtual void adjustSky();
 
@@ -343,7 +313,8 @@ namespace MWWorld
             virtual void changeToExteriorCell (const ESM::Position& position);
             ///< Move to exterior cell.
 
-            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position);
+            virtual void changeToCell (const ESM::CellId& cellId, const ESM::Position& position, bool detectWorldSpaceChange=true);
+            ///< @param detectWorldSpaceChange if true, clean up worldspace-specific data when the world space changes
 
             virtual const ESM::Cell *getExterior (const std::string& cellName) const;
             ///< Return a cell matching the given name or a 0-pointer, if there is no such cell.
@@ -439,15 +410,14 @@ namespace MWWorld
 
             virtual void update (float duration, bool paused);
 
-            virtual bool placeObject (const MWWorld::Ptr& object, float cursorX, float cursorY, int amount);
+            virtual MWWorld::Ptr placeObject (const MWWorld::Ptr& object, float cursorX, float cursorY, int amount);
             ///< copy and place an object into the gameworld at the specified cursor position
             /// @param object
             /// @param cursor X (relative 0-1)
             /// @param cursor Y (relative 0-1)
             /// @param number of objects to place
-            /// @return true if the object was placed, or false if it was rejected because the position is too far away
 
-            virtual void dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::Ptr& object, int amount);
+            virtual MWWorld::Ptr dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::Ptr& object, int amount);
             ///< copy and place an object into the gameworld at the given actor's position
             /// @param actor giving the dropped object position
             /// @param object
@@ -573,7 +543,8 @@ namespace MWWorld
              */
             virtual void castSpell (const MWWorld::Ptr& actor);
 
-            virtual void launchMagicBolt (const std::string& id, bool stack, const ESM::EffectList& effects,
+            virtual void launchMagicBolt (const std::string& model, const std::string& sound, const std::string& spellId,
+                                          float speed, bool stack, const ESM::EffectList& effects,
                                            const MWWorld::Ptr& actor, const std::string& sourceName);
             virtual void launchProjectile (MWWorld::Ptr actor, MWWorld::Ptr projectile,
                                            const Ogre::Vector3& worldPos, const Ogre::Quaternion& orient, MWWorld::Ptr bow, float speed);
@@ -613,7 +584,7 @@ namespace MWWorld
             /// Spawn a blood effect for \a ptr at \a worldPosition
             virtual void spawnBloodEffect (const MWWorld::Ptr& ptr, const Ogre::Vector3& worldPosition);
 
-            virtual void explodeSpell (const Ogre::Vector3& origin, const MWWorld::Ptr& object, const ESM::EffectList& effects,
+            virtual void explodeSpell (const Ogre::Vector3& origin, const ESM::EffectList& effects,
                                        const MWWorld::Ptr& caster, const std::string& id, const std::string& sourceName);
     };
 }
diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 6820103402..9fe7890acc 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -12,7 +12,6 @@ if (GTEST_FOUND AND GMOCK_FOUND)
 
     file(GLOB UNITTEST_SRC_FILES
         components/misc/test_*.cpp
-        components/file_finder/test_*.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/components/file_finder/test_filefinder.cpp b/apps/openmw_test_suite/components/file_finder/test_filefinder.cpp
deleted file mode 100644
index 2d151988b9..0000000000
--- a/apps/openmw_test_suite/components/file_finder/test_filefinder.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <gtest/gtest.h>
-#include <fstream>
-#include "components/file_finder/file_finder.hpp"
-
-struct FileFinderTest : public ::testing::Test
-{
-  protected:
-    FileFinderTest()
-      : mTestDir("./filefinder_test_dir/")
-      , mTestFile("test.txt")
-      , mTestFileUppercase("TEST.TXT")
-      , mTestFileNotFound("foobarbaz.txt")
-    {
-    }
-
-    virtual void SetUp()
-    {
-      boost::filesystem::create_directory(boost::filesystem::path(mTestDir));
-
-      std::ofstream ofs(std::string(mTestDir + mTestFile).c_str(), std::ofstream::out);
-      ofs << std::endl;
-      ofs.close();
-    }
-
-    virtual void TearDown()
-    {
-      boost::filesystem::remove_all(boost::filesystem::path(mTestDir));
-    }
-
-    std::string mTestDir;
-    std::string mTestFile;
-    std::string mTestFileUppercase;
-    std::string mTestFileNotFound;
-};
-
-TEST_F(FileFinderTest, FileFinder_has_file)
-{
-  FileFinder::FileFinder fileFinder(mTestDir);
-  ASSERT_TRUE(fileFinder.has(mTestFile));
-  ASSERT_TRUE(fileFinder.has(mTestFileUppercase));
-  ASSERT_TRUE(fileFinder.lookup(mTestFile) == std::string(mTestDir + mTestFile));
-  ASSERT_TRUE(fileFinder.lookup(mTestFileUppercase) == std::string(mTestDir + mTestFile));
-}
-
-TEST_F(FileFinderTest, FileFinder_does_not_have_file)
-{
-  FileFinder::FileFinder fileFinder(mTestDir);
-  ASSERT_FALSE(fileFinder.has(mTestFileNotFound));
-  ASSERT_TRUE(fileFinder.lookup(mTestFileNotFound).empty());
-}
-
-TEST_F(FileFinderTest, FileFinderStrict_has_file)
-{
-  FileFinder::FileFinderStrict fileFinder(mTestDir);
-  ASSERT_TRUE(fileFinder.has(mTestFile));
-  ASSERT_FALSE(fileFinder.has(mTestFileUppercase));
-  ASSERT_TRUE(fileFinder.lookup(mTestFile) == std::string(mTestDir + mTestFile));
-  ASSERT_FALSE(fileFinder.lookup(mTestFileUppercase) == std::string(mTestDir + mTestFile));
-}
-
-TEST_F(FileFinderTest, FileFinderStrict_does_not_have_file)
-{
-  FileFinder::FileFinderStrict fileFinder(mTestDir);
-  ASSERT_FALSE(fileFinder.has(mTestFileNotFound));
-  ASSERT_TRUE(fileFinder.lookup(mTestFileNotFound).empty());
-}
diff --git a/apps/openmw_test_suite/components/file_finder/test_search.cpp b/apps/openmw_test_suite/components/file_finder/test_search.cpp
deleted file mode 100644
index 63745b6256..0000000000
--- a/apps/openmw_test_suite/components/file_finder/test_search.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include <gtest/gtest.h>
-#include <boost/filesystem.hpp>
-#include <fstream>
-
-#include "components/file_finder/search.hpp"
-
-struct SearchTest : public ::testing::Test
-{
-  protected:
-    SearchTest()
-      : mTestDir("./search_test_dir/")
-    {
-    }
-
-    virtual void SetUp()
-    {
-      boost::filesystem::create_directory(boost::filesystem::path(mTestDir));
-
-      std::ofstream ofs(std::string(mTestDir + "test2.txt").c_str(), std::ofstream::out);
-      ofs << std::endl;
-      ofs.close();
-    }
-
-    virtual void TearDown()
-    {
-      boost::filesystem::remove_all(boost::filesystem::path(mTestDir));
-    }
-
-    std::string mTestDir;
-};
-
-TEST_F(SearchTest, file_not_found)
-{
-  struct Result : public FileFinder::ReturnPath
-  {
-    Result(const boost::filesystem::path& expectedPath)
-      : mExpectedPath(expectedPath)
-    {
-    }
-
-    void add(const boost::filesystem::path& p)
-    {
-      ASSERT_FALSE(p == mExpectedPath);
-    }
-
-    private:
-      boost::filesystem::path mExpectedPath;
-
-  } r(boost::filesystem::path(mTestDir  + "test.txt"));
-
-  FileFinder::find(mTestDir, r, false);
-}
-
-TEST_F(SearchTest, file_found)
-{
-  struct Result : public FileFinder::ReturnPath
-  {
-    Result(const boost::filesystem::path& expectedPath)
-      : mExpectedPath(expectedPath)
-    {
-    }
-
-    void add(const boost::filesystem::path& p)
-    {
-      ASSERT_TRUE(p == mExpectedPath);
-    }
-
-    private:
-      boost::filesystem::path mExpectedPath;
-
-  } r(boost::filesystem::path(mTestDir  + "test2.txt"));
-
-  FileFinder::find(mTestDir, r, false);
-}
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index d7bdaf36cd..e0166138e4 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -34,10 +34,6 @@ add_component_dir (to_utf8
     to_utf8
     )
 
-add_component_dir (file_finder
-    file_finder filename_less search
-    )
-
 add_component_dir (esm
     attr defs esmcommon esmreader esmwriter loadacti loadalch loadappa loadarmo loadbody loadbook loadbsgn loadcell
     loadclas loadclot loadcont loadcrea loadcrec loaddial loaddoor loadench loadfact loadglob loadgmst
@@ -45,7 +41,7 @@ add_component_dir (esm
     loadnpc loadpgrd loadrace loadregn loadscpt loadskil loadsndg loadsoun loadspel loadsscr loadstat
     loadweap records aipackage effectlist spelllist variant variantimp loadtes3 cellref filter
     savedgame journalentry queststate locals globalscript player objectstate cellid cellstate globalmap lightstate inventorystate containerstate npcstate creaturestate dialoguestate statstate
-    npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate
+    npcstats creaturestats weatherstate quickkeys fogstate spellstate activespells creaturelevliststate doorstate projectilestate
     )
 
 add_component_dir (misc
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 25b006fb3e..0958c8f0c2 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -25,6 +25,9 @@
 
 #include <stdexcept>
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+
 #include "../files/constrainedfiledatastream.hpp"
 
 using namespace std;
@@ -72,7 +75,8 @@ void BSAFile::readHeader()
      */
     assert(!isLoaded);
 
-    std::ifstream input(filename.c_str(), std::ios_base::binary);
+    namespace bfs = boost::filesystem;
+    bfs::ifstream input(bfs::path(filename), std::ios_base::binary);
 
     // Total archive size
     size_t fsize = 0;
diff --git a/components/esm/cellstate.cpp b/components/esm/cellstate.cpp
index 541a359c6a..4df04d0e52 100644
--- a/components/esm/cellstate.cpp
+++ b/components/esm/cellstate.cpp
@@ -11,6 +11,10 @@ void ESM::CellState::load (ESMReader &esm)
 
     mHasFogOfWar = false;
     esm.getHNOT (mHasFogOfWar, "HFOW");
+
+    mLastRespawn.mDay = 0;
+    mLastRespawn.mHour = 0;
+    esm.getHNOT (mLastRespawn, "RESP");
 }
 
 void ESM::CellState::save (ESMWriter &esm) const
@@ -18,5 +22,7 @@ void ESM::CellState::save (ESMWriter &esm) const
     if (!mId.mPaged)
         esm.writeHNT ("WLVL", mWaterLevel);
 
-    esm.writeHNT("HFOW", mHasFogOfWar);
+    esm.writeHNT ("HFOW", mHasFogOfWar);
+
+    esm.writeHNT ("RESP", mLastRespawn);
 }
diff --git a/components/esm/cellstate.hpp b/components/esm/cellstate.hpp
index 88918a3abf..55c1e51550 100644
--- a/components/esm/cellstate.hpp
+++ b/components/esm/cellstate.hpp
@@ -3,6 +3,8 @@
 
 #include "cellid.hpp"
 
+#include "defs.hpp"
+
 namespace ESM
 {
     class ESMReader;
@@ -19,6 +21,8 @@ namespace ESM
 
         int mHasFogOfWar; // Do we have fog of war state (0 or 1)? (see fogstate.hpp)
 
+        ESM::TimeStamp mLastRespawn;
+
         void load (ESMReader &esm);
         void save (ESMWriter &esm) const;
     };
diff --git a/components/esm/creaturelevliststate.cpp b/components/esm/creaturelevliststate.cpp
index 164dae96e9..21cc73b89c 100644
--- a/components/esm/creaturelevliststate.cpp
+++ b/components/esm/creaturelevliststate.cpp
@@ -12,6 +12,9 @@ namespace ESM
 
         mSpawnActorId = -1;
         esm.getHNOT (mSpawnActorId, "SPAW");
+
+        mSpawn = false;
+        esm.getHNOT (mSpawn, "RESP");
     }
 
     void CreatureLevListState::save(ESMWriter &esm, bool inInventory) const
@@ -20,6 +23,9 @@ namespace ESM
 
         if (mSpawnActorId != -1)
             esm.writeHNT ("SPAW", mSpawnActorId);
+
+        if (mSpawn)
+            esm.writeHNT ("RESP", mSpawn);
     }
 
 }
diff --git a/components/esm/creaturelevliststate.hpp b/components/esm/creaturelevliststate.hpp
index 99b5a7fa2a..da64cd7c2b 100644
--- a/components/esm/creaturelevliststate.hpp
+++ b/components/esm/creaturelevliststate.hpp
@@ -10,6 +10,7 @@ namespace ESM
     struct CreatureLevListState : public ObjectState
     {
         int mSpawnActorId;
+        bool mSpawn;
 
         virtual void load (ESMReader &esm);
         virtual void save (ESMWriter &esm, bool inInventory = false) const;
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 6c388de08c..bdeb95291f 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -109,6 +109,8 @@ enum RecNameInts
     REC_DYNA = FourCC<'D','Y','N','A'>::value,
     REC_ASPL = FourCC<'A','S','P','L'>::value,
     REC_ACTC = FourCC<'A','C','T','C'>::value,
+    REC_MPRJ = FourCC<'M','P','R','J'>::value,
+    REC_PROJ = FourCC<'P','R','O','J'>::value,
 
     // format 1
     REC_FILT = 0x544C4946
diff --git a/components/esm/inventorystate.cpp b/components/esm/inventorystate.cpp
index 4d8cbc6228..1b0bc772e9 100644
--- a/components/esm/inventorystate.cpp
+++ b/components/esm/inventorystate.cpp
@@ -47,6 +47,14 @@ void ESM::InventoryState::load (ESMReader &esm)
             mItems.push_back (std::make_pair (state, std::make_pair (id, slot)));
         }
     }
+
+    while (esm.isNextSub("LEVM"))
+    {
+        std::string id = esm.getHString();
+        int count;
+        esm.getHNT (count, "COUN");
+        mLevelledItemMap[id] = count;
+    }
 }
 
 void ESM::InventoryState::save (ESMWriter &esm) const
@@ -57,4 +65,10 @@ void ESM::InventoryState::save (ESMWriter &esm) const
     for (std::vector<std::pair<LightState, int> >::const_iterator iter (mLights.begin());
         iter!=mLights.end(); ++iter)
         write (esm, iter->first, ESM::REC_LIGH, iter->second);
-}
\ No newline at end of file
+
+    for (std::map<std::string, int>::const_iterator it = mLevelledItemMap.begin(); it != mLevelledItemMap.end(); ++it)
+    {
+        esm.writeHNString ("LEVM", it->first);
+        esm.writeHNT ("COUN", it->second);
+    }
+}
diff --git a/components/esm/inventorystate.hpp b/components/esm/inventorystate.hpp
index 1a8752a498..4aa79f575b 100644
--- a/components/esm/inventorystate.hpp
+++ b/components/esm/inventorystate.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENMW_ESM_INVENTORYSTATE_H
 #define OPENMW_ESM_INVENTORYSTATE_H
 
+#include <map>
+
 #include "objectstate.hpp"
 #include "lightstate.hpp"
 
@@ -20,6 +22,8 @@ namespace ESM
         // lights (slot)
         std::vector<std::pair<LightState, int> > mLights;
 
+        std::map<std::string, int> mLevelledItemMap;
+
         virtual ~InventoryState() {}
 
         virtual void load (ESMReader &esm);
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index fb43ee8586..ee7ddbfadf 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -1,5 +1,7 @@
 #include "loaddial.hpp"
 
+#include <iostream>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 #include "defs.hpp"
@@ -43,4 +45,50 @@ void Dialogue::save(ESMWriter &esm) const
         mInfo.clear();
     }
 
+void Dialogue::addInfo(const ESM::DialInfo& info, bool merge)
+{
+    if (!merge || mInfo.empty() || info.mNext.empty())
+    {
+        mLookup[info.mId] = mInfo.insert(mInfo.end(), info);
+        return;
+    }
+    if (info.mPrev.empty())
+    {
+        mLookup[info.mId] = mInfo.insert(mInfo.begin(), info);
+        return;
+    }
+
+    ESM::Dialogue::InfoContainer::iterator it = mInfo.end();
+
+    std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup;
+
+    lookup = mLookup.find(info.mId);
+    if (lookup != mLookup.end())
+    {
+        it = lookup->second;
+        *it = info;
+        return;
+    }
+
+    lookup = mLookup.find(info.mPrev);
+    if (lookup != mLookup.end())
+    {
+        it = lookup->second;
+
+        mLookup[info.mId] = mInfo.insert(++it, info);
+        return;
+    }
+
+    lookup = mLookup.find(info.mNext);
+    if (lookup != mLookup.end())
+    {
+        it = lookup->second;
+
+        mLookup[info.mId] = mInfo.insert(it, info);
+        return;
+    }
+
+    std::cerr << "Failed to insert info " << info.mId << std::endl;
+}
+
 }
diff --git a/components/esm/loaddial.hpp b/components/esm/loaddial.hpp
index 63d78833e1..6ec5527f9f 100644
--- a/components/esm/loaddial.hpp
+++ b/components/esm/loaddial.hpp
@@ -2,7 +2,8 @@
 #define OPENMW_ESM_DIAL_H
 
 #include <string>
-#include <vector>
+#include <list>
+#include <map>
 
 #include "loadinfo.hpp"
 
@@ -33,11 +34,22 @@ struct Dialogue
 
     std::string mId;
     signed char mType;
-    std::vector<DialInfo> mInfo;
+
+    typedef std::list<DialInfo> InfoContainer;
+
+    typedef std::map<std::string, InfoContainer::iterator> LookupMap;
+
+    InfoContainer mInfo;
+
+    // This is only used during the loading phase to speed up DialInfo merging.
+    LookupMap mLookup;
 
     void load(ESMReader &esm);
     void save(ESMWriter &esm) const;
 
+    /// @param merge Merge with existing list, or just push each record to the end of the list?
+    void addInfo (const ESM::DialInfo& info, bool merge);
+
     void blank();
     ///< Set record to default state (does not touch the ID and does not change the type).
 };
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index de679e8152..aee8628bd6 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -38,6 +38,8 @@ void Script::load(ESMReader &esm)
         char* str = &tmp[0];
         for (size_t i = 0; i < mVarNames.size(); i++)
         {
+            char *termsym = strchr(str, '\r');
+            if(termsym) *termsym = '\0';
             mVarNames[i] = std::string(str);
             str += mVarNames[i].size() + 1;
 
diff --git a/components/esm/projectilestate.cpp b/components/esm/projectilestate.cpp
new file mode 100644
index 0000000000..85c00025b6
--- /dev/null
+++ b/components/esm/projectilestate.cpp
@@ -0,0 +1,65 @@
+#include "projectilestate.hpp"
+
+#include "esmwriter.hpp"
+#include "esmreader.hpp"
+
+namespace ESM
+{
+
+    void BaseProjectileState::save(ESMWriter &esm) const
+    {
+        esm.writeHNString ("ID__", mId);
+        esm.writeHNT ("VEC3", mPosition);
+        esm.writeHNT ("QUAT", mOrientation);
+        esm.writeHNT ("ACTO", mActorId);
+    }
+
+    void BaseProjectileState::load(ESMReader &esm)
+    {
+        mId = esm.getHNString("ID__");
+        esm.getHNT (mPosition, "VEC3");
+        esm.getHNT (mOrientation, "QUAT");
+        esm.getHNT (mActorId, "ACTO");
+    }
+
+    void MagicBoltState::save(ESMWriter &esm) const
+    {
+        BaseProjectileState::save(esm);
+
+        esm.writeHNString ("SPEL", mSpellId);
+        esm.writeHNString ("SRCN", mSourceName);
+        mEffects.save(esm);
+        esm.writeHNT ("SPED", mSpeed);
+        esm.writeHNT ("STCK", mStack);
+        esm.writeHNString ("SOUN", mSound);
+    }
+
+    void MagicBoltState::load(ESMReader &esm)
+    {
+        BaseProjectileState::load(esm);
+
+        mSpellId = esm.getHNString("SPEL");
+        mSourceName = esm.getHNString ("SRCN");
+        mEffects.load(esm);
+        esm.getHNT (mSpeed, "SPED");
+        esm.getHNT (mStack, "STCK");
+        mSound = esm.getHNString ("SOUN");
+    }
+
+    void ProjectileState::save(ESMWriter &esm) const
+    {
+        BaseProjectileState::save(esm);
+
+        esm.writeHNString ("BOW_", mBowId);
+        esm.writeHNT ("VEL_", mVelocity);
+    }
+
+    void ProjectileState::load(ESMReader &esm)
+    {
+        BaseProjectileState::load(esm);
+
+        mBowId = esm.getHNString ("BOW_");
+        esm.getHNT (mVelocity, "VEL_");
+    }
+
+}
diff --git a/components/esm/projectilestate.hpp b/components/esm/projectilestate.hpp
new file mode 100644
index 0000000000..6e36efb5b4
--- /dev/null
+++ b/components/esm/projectilestate.hpp
@@ -0,0 +1,90 @@
+#ifndef OPENMW_ESM_PROJECTILESTATE_H
+#define OPENMW_ESM_PROJECTILESTATE_H
+
+#include <string>
+
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+
+#include "effectlist.hpp"
+
+namespace ESM
+{
+
+    // format 0, savegames only
+
+    struct Quaternion
+    {
+        float mValues[4];
+
+        Quaternion() {}
+        Quaternion (Ogre::Quaternion q)
+        {
+            mValues[0] = q.w;
+            mValues[1] = q.x;
+            mValues[2] = q.y;
+            mValues[3] = q.z;
+        }
+
+        operator Ogre::Quaternion () const
+        {
+            return Ogre::Quaternion(mValues[0], mValues[1], mValues[2], mValues[3]);
+        }
+    };
+
+    struct Vector3
+    {
+        float mValues[3];
+
+        Vector3() {}
+        Vector3 (Ogre::Vector3 v)
+        {
+            mValues[0] = v.x;
+            mValues[1] = v.y;
+            mValues[2] = v.z;
+        }
+
+        operator Ogre::Vector3 () const
+        {
+            return Ogre::Vector3(&mValues[0]);
+        }
+    };
+
+    struct BaseProjectileState
+    {
+        std::string mId;
+
+        Vector3 mPosition;
+        Quaternion mOrientation;
+
+        int mActorId;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+
+    struct MagicBoltState : public BaseProjectileState
+    {
+        std::string mSpellId;
+        std::string mSourceName;
+        ESM::EffectList mEffects;
+        float mSpeed;
+        bool mStack;
+        std::string mSound;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+
+    struct ProjectileState : public BaseProjectileState
+    {
+        std::string mBowId;
+        Vector3 mVelocity;
+
+        void load (ESMReader &esm);
+        void save (ESMWriter &esm) const;
+    };
+
+}
+
+#endif
diff --git a/components/file_finder/file_finder.hpp b/components/file_finder/file_finder.hpp
deleted file mode 100644
index 8a15af73af..0000000000
--- a/components/file_finder/file_finder.hpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef FILE_FINDER_MAIN_H
-#define FILE_FINDER_MAIN_H
-
-#include <map>
-
-#include "search.hpp"
-#include "filename_less.hpp"
-#include <components/files/multidircollection.hpp>
-
-namespace FileFinder
-{
-
-template <typename LESS>
-class FileFinderT
-{
-  typedef std::map<std::string, std::string, LESS> TableContainer;
-  TableContainer table;
-
-  struct Inserter : ReturnPath
-  {
-    FileFinderT<LESS> *owner;
-    int cut;
-
-    void add(const boost::filesystem::path &pth)
-    {
-        std::string file = pth.string();
-        std::string key = file.substr(cut);
-        owner->table[key] = file;
-    }
-  };
-
-  Inserter inserter;
-
-public:
-  FileFinderT(const boost::filesystem::path &path, bool recurse=true)
-  {
-    inserter.owner = this;
-
-    // Remember the original path length, so we can cut it away from
-    // the relative paths used as keys
-    const std::string& pstring = path.string();
-    inserter.cut = pstring.size();
-
-    // If the path does not end in a slash, then boost will add one
-    // later, which means one more character we have to remove.
-    char last = *pstring.rbegin();
-    if(last != '\\' && last != '/')
-      inserter.cut++;
-
-    // Fill the map
-    find(path, inserter, recurse);
-  }
-
-  bool has(const std::string& file) const
-  {
-        return table.find(file) != table.end();
-  }
-
-  // Find the full path from a relative path.
-  const std::string &lookup(const std::string& file) const
-  {
-    static std::string empty;
-    typename TableContainer::const_iterator it = table.find(file);
-    return (it != table.end()) ? it->second : empty;
-  }
-};
-
-template
-<
-    class LESS
->
-struct TreeFileFinder
-{
-    typedef TreeFileFinder<LESS> finder_t;
-
-    TreeFileFinder(const Files::PathContainer& paths, bool recurse = true)
-    {
-        struct : ReturnPath
-        {
-            finder_t *owner;
-            int cut;
-
-            void add(const boost::filesystem::path &pth)
-            {
-                std::string file = pth.string();
-                std::string key = file.substr(cut);
-                owner->mTable[key] = file;
-            }
-        } inserter;
-
-        inserter.owner = this;
-
-        for (Files::PathContainer::const_iterator it = paths.begin(); it != paths.end(); ++it)
-        {
-
-            // Remember the original path length, so we can cut it away from
-            // the relative paths used as keys
-            const std::string& pstring = it->string();
-            inserter.cut = pstring.size();
-
-            // If the path does not end in a slash, then boost will add one
-            // later, which means one more character we have to remove.
-            char last = *pstring.rbegin();
-            if (last != '\\' && last != '/')
-            {
-              inserter.cut++;
-            }
-
-            // Fill the map
-            find(*it, inserter, recurse);
-        }
-    }
-
-    bool has(const std::string& file) const
-    {
-        return mTable.find(file) != mTable.end();
-    }
-
-    const std::string& lookup(const std::string& file) const
-    {
-        static std::string empty;
-        typename TableContainer::const_iterator it = mTable.find(file);
-        return (it != mTable.end()) ? it->second : empty;
-    }
-
-    private:
-        typedef std::map<std::string, std::string, LESS> TableContainer;
-        TableContainer mTable;
-
-//        Inserter inserter;
-};
-
-
-// The default is to use path_less for equality checks
-typedef FileFinderT<path_less> FileFinder;
-typedef FileFinderT<path_slash> FileFinderStrict;
-
-typedef TreeFileFinder<path_less> LessTreeFileFinder;
-typedef TreeFileFinder<path_slash> StrictTreeFileFinder;
-
-} /* namespace FileFinder */
-#endif /* FILE_FINDER_MAIN_H */
diff --git a/components/file_finder/filename_less.hpp b/components/file_finder/filename_less.hpp
deleted file mode 100644
index bc3186ce98..0000000000
--- a/components/file_finder/filename_less.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#ifndef FILE_FINDER_LESS_H
-#define FILE_FINDER_LESS_H
-
-#include <libs/platform/strings.h>
-#include <string>
-
-namespace FileFinder{
-
-// Used for maps of file paths. Compares file paths, but ignores case
-// AND treats \ and / as the same character.
-struct path_less
-{
-  int compareChar(char a, char b) const
-  {
-    if(a>b) return 1;
-    else if(a<b) return -1;
-    return 0;
-  }
-
-  int comparePathChar(char a, char b) const
-  {
-    if(a >= 'a' && a <= 'z') a += 'A'-'a';
-    else if(a == '\\') a = '/';
-    if(b >= 'a' && b <= 'z') b += 'A'-'a';
-    else if(b == '\\') b = '/';
-    return compareChar(a,b);
-  }
-
-  int compareString(const char *a, const char *b) const
-  {
-    while(*a && *b)
-      {
-        int i = comparePathChar(*a,*b);
-        if(i != 0) return i;
-        a++; b++;
-      }
-    // At this point, one or both of the chars is a null terminator.
-    // Normal char comparison will get the correct final result here.
-    return compareChar(*a,*b);
-  }
-
-  bool operator() (const std::string& a, const std::string& b) const
-  {
-    return compareString(a.c_str(), b.c_str()) < 0;
-  }
-};
-
-struct path_slash
-{
-  int compareChar(char a, char b) const
-  {
-    if(a>b) return 1;
-    else if(a<b) return -1;
-    return 0;
-  }
-
-  int comparePathChar(char a, char b) const
-  {
-   if(a == '\\') a = '/';
-   if(b == '\\') b = '/';
-    return compareChar(a,b);
-  }
-
-  int compareString(const char *a, const char *b) const
-  {
-    while(*a && *b)
-      {
-        int i = comparePathChar(*a,*b);
-        if(i != 0) return i;
-        a++; b++;
-      }
-    // At this point, one or both of the chars is a null terminator.
-    // Normal char comparison will get the correct final result here.
-    return compareChar(*a,*b);
-  }
-
-  bool operator() (const std::string& a, const std::string& b) const
-  {
-    return compareString(a.c_str(), b.c_str()) < 0;
-  }
-};
- 
-}
-#endif
diff --git a/components/file_finder/search.cpp b/components/file_finder/search.cpp
deleted file mode 100644
index 06deaf83a6..0000000000
--- a/components/file_finder/search.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "search.hpp"
-
-#include <iostream>
-
-void FileFinder::find(const boost::filesystem::path & dir_path, ReturnPath &ret, bool recurse)
-{
-    if (boost::filesystem::exists(dir_path))
-    {
-        if (!recurse)
-        {
-            boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end
-            for (boost::filesystem::directory_iterator itr(dir_path); itr != end_itr; ++itr)
-            {
-                if (!boost::filesystem::is_directory( *itr ))
-                {
-                    ret.add(*itr);
-                }
-            }
-        }
-        else
-        {
-            boost::filesystem::recursive_directory_iterator end_itr; // default construction yields past-the-end
-            for (boost::filesystem::recursive_directory_iterator itr(dir_path); itr != end_itr; ++itr)
-            {
-                if (!boost::filesystem::is_directory(*itr))
-                {
-                    ret.add(*itr);
-                }
-            }
-        }
-    }
-    else
-    {
-        std::cout << "Path " << dir_path << " not found" << std::endl;
-    }
-}
diff --git a/components/file_finder/search.hpp b/components/file_finder/search.hpp
deleted file mode 100644
index 4e16fb64a0..0000000000
--- a/components/file_finder/search.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef FILE_FINDER_SEARCH_H
-#define FILE_FINDER_SEARCH_H
-
-#include <boost/filesystem.hpp>
-#include <string>
-
-namespace FileFinder
-{
-  struct ReturnPath
-  {
-    virtual void add(const boost::filesystem::path &pth) = 0;
-  };
-
-  /** Search the given path and return all file paths through 'ret'. If
-      recurse==true, all files in subdirectories are returned as well.
-  */
-  void find(const boost::filesystem::path & dir_path, ReturnPath &ret, bool recurse=true);
-}
-
-#endif
diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index 761b7ca5ad..ffa911b44f 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -1,12 +1,12 @@
 #include "configurationmanager.hpp"
 
 #include <string>
-#include <fstream>
 #include <iostream>
 #include <algorithm>
 
 #include <boost/bind.hpp>
 #include <boost/algorithm/string/erase.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 /**
  * \namespace Files
@@ -125,7 +125,7 @@ void ConfigurationManager::loadConfig(const boost::filesystem::path& path,
     {
         std::cout << "Loading config file: " << cfgFile.string() << "... ";
 
-        std::ifstream configFileStream(cfgFile.string().c_str());
+        boost::filesystem::ifstream configFileStream(cfgFile);
         if (configFileStream.is_open())
         {
             boost::program_options::store(boost::program_options::parse_config_file(
diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
index 06ee9fb4e8..4cdeec043a 100644
--- a/components/files/lowlevelfile.cpp
+++ b/components/files/lowlevelfile.cpp
@@ -206,6 +206,8 @@ size_t LowLevelFile::read (void * data, size_t size)
 }
 
 #elif FILE_API == FILE_API_WIN32
+
+#include <boost/locale.hpp>
 /*
  *
  *	Implementation of LowLevelFile methods using Win32 API calls
@@ -227,9 +229,10 @@ void LowLevelFile::open (char const * filename)
 {
 	assert (mHandle == INVALID_HANDLE_VALUE);
 
-	HANDLE handle = CreateFileA (filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
+	std::wstring wname = boost::locale::conv::utf_to_utf<wchar_t>(filename);
+	HANDLE handle = CreateFileW (wname.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
 
-	if (handle == NULL)
+	if (handle == INVALID_HANDLE_VALUE)
 	{
 		std::ostringstream os;
 		os << "Failed to open '" << filename << "' for reading.";
diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp
index 347de96a6a..1abbae3ae8 100644
--- a/components/files/multidircollection.cpp
+++ b/components/files/multidircollection.cpp
@@ -60,10 +60,10 @@ namespace Files
             {
                 boost::filesystem::path path = *dirIter;
 
-                if (!equal (extension, boost::filesystem::path (path.extension()).string()))
+                if (!equal (extension, path.extension().string()))
                     continue;
 
-                std::string filename = boost::filesystem::path (path.filename()).string();
+                std::string filename = path.filename().string();
 
                 TIter result = mFiles.find (filename);
 
diff --git a/components/files/windowspath.cpp b/components/files/windowspath.cpp
index ea1ca56d3c..6b58304a0f 100644
--- a/components/files/windowspath.cpp
+++ b/components/files/windowspath.cpp
@@ -10,8 +10,12 @@
 
 #pragma comment(lib, "Shlwapi.lib")
 
+#include <boost/locale.hpp>
+namespace bconv = boost::locale::conv;
+
 /**
  * FIXME: Someone with Windows system should check this and correct if necessary
+ * FIXME: MAX_PATH is irrelevant for extended-length paths, i.e. \\?\...
  */
 
 /**
@@ -23,22 +27,29 @@ namespace Files
 WindowsPath::WindowsPath(const std::string& application_name)
     : mName(application_name)
 {
+    /*  Since on Windows boost::path.string() returns string of narrow
+        characters in local encoding, it is required to path::imbue()
+        with UTF-8 encoding (generated for empty name from boost::locale)
+        to handle Unicode in platform-agnostic way using std::string.
+
+        See boost::filesystem and boost::locale reference for details.
+    */
+    boost::filesystem::path::imbue(boost::locale::generator().generate(""));
 }
 
 boost::filesystem::path WindowsPath::getUserConfigPath() const
 {
     boost::filesystem::path userPath(".");
 
-    TCHAR path[MAX_PATH];
+    WCHAR path[MAX_PATH + 1];
     memset(path, 0, sizeof(path));
 
-    if(SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, path)))
+    if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PERSONAL | CSIDL_FLAG_CREATE, NULL, 0, path)))
     {
-        PathAppend(path, TEXT("My Games"));
-        userPath = boost::filesystem::path(path);
+        userPath = boost::filesystem::path(bconv::utf_to_utf<char>(path));
     }
 
-    return userPath / mName;
+    return userPath / "My Games" / mName;
 }
 
 boost::filesystem::path WindowsPath::getUserDataPath() const
@@ -51,12 +62,12 @@ boost::filesystem::path WindowsPath::getGlobalConfigPath() const
 {
     boost::filesystem::path globalPath(".");
 
-    TCHAR path[MAX_PATH];
+    WCHAR path[MAX_PATH + 1];
     memset(path, 0, sizeof(path));
 
-    if(SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES | CSIDL_FLAG_CREATE, NULL, 0, path)))
+    if(SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES | CSIDL_FLAG_CREATE, NULL, 0, path)))
     {
-        globalPath = boost::filesystem::path(path);
+        globalPath = boost::filesystem::path(bconv::utf_to_utf<char>(path));
     }
 
     return globalPath / mName;
diff --git a/components/ogreinit/ogreinit.cpp b/components/ogreinit/ogreinit.cpp
index 01b8764c2b..77dbcb1ee1 100644
--- a/components/ogreinit/ogreinit.cpp
+++ b/components/ogreinit/ogreinit.cpp
@@ -1,11 +1,15 @@
 #include "ogreinit.hpp"
 
 #include <string>
+#include <ctime>
+#include <cstdio>
+#include <cstring>
 
 #include <OgreRoot.h>
 #include <OgreParticleEmitterFactory.h>
 #include <OgreParticleSystemManager.h>
 #include <OgreLogManager.h>
+#include <OgreLog.h>
 
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 #include <OSX/macUtils.h>
@@ -13,8 +17,54 @@
 
 #include <components/nifogre/particles.hpp>
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+
 #include "ogreplugin.hpp"
 
+namespace bfs = boost::filesystem;
+
+namespace
+{
+    /** \brief Custom Ogre::LogListener interface implementation being
+        able to portably handle UTF-8 encoded path.
+
+        Effectively this is used in conjunction with default listener,
+        but since on every message messageLogged() set 'skip' flag to
+        true, there should be no troubles sharing same file.
+    */
+    class LogListener : public Ogre::LogListener
+    {
+        bfs::ofstream file;
+        char buffer[16];
+
+
+    public:
+
+        LogListener(const std::string &path)
+            : file((bfs::path(path)))
+        {
+            memset(buffer, sizeof(buffer), 0);
+        }
+
+        void timestamp()
+        {
+            int local = time(0) % 86400;
+            int sec = local % 60;
+            int min = (local / 60) % 60;
+            int hrs = local / 3600;
+            sprintf(buffer, "%02d:%02d:%02d: ", hrs, min, sec);
+        }
+
+        virtual void messageLogged(const std::string &msg, Ogre::LogMessageLevel lvl, bool mask, const std::string &logName, bool &skip)
+        {
+            timestamp();
+            file << buffer << msg << std::endl;
+            skip = true;
+        }
+    };
+}
+
 namespace OgreInit
 {
 
@@ -43,6 +93,11 @@ namespace OgreInit
         new Ogre::LogManager;
         Ogre::Log *log = Ogre::LogManager::getSingleton().createLog(logPath);
 
+    #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        // Use custom listener only on Windows
+        log->addListener(new LogListener(logPath));
+    #endif
+
         // Disable logging to cout/cerr
         log->setDebugOutputEnabled(false);
 
@@ -141,11 +196,6 @@ namespace OgreInit
             pluginDir = OGRE_PLUGIN_DIR_REL;
     #endif
         }
-
-        boost::filesystem::path absPluginPath = boost::filesystem::absolute(boost::filesystem::path(pluginDir));
-
-        pluginDir = absPluginPath.string();
-
         Files::loadOgrePlugin(pluginDir, "RenderSystem_GL", *mRoot);
         Files::loadOgrePlugin(pluginDir, "RenderSystem_GLES2", *mRoot);
         Files::loadOgrePlugin(pluginDir, "RenderSystem_GL3Plus", *mRoot);
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
index 13015e39c9..0def0afdb7 100644
--- a/components/settings/settings.cpp
+++ b/components/settings/settings.cpp
@@ -1,13 +1,19 @@
 #include "settings.hpp"
 
-#include <fstream>
 #include <stdexcept>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include <OgreResourceGroupManager.h>
 #include <OgreStringConverter.h>
+#include <OgreDataStream.h>
+
+#include <components/files/constrainedfiledatastream.hpp>
 
 using namespace Settings;
 
+namespace bfs = boost::filesystem;
+
 Ogre::ConfigFile Manager::mFile = Ogre::ConfigFile();
 Ogre::ConfigFile Manager::mDefaultFile = Ogre::ConfigFile();
 CategorySettingVector Manager::mChangedSettings = CategorySettingVector();
@@ -15,17 +21,19 @@ CategorySettingValueMap Manager::mNewSettings = CategorySettingValueMap();
 
 void Manager::loadUser (const std::string& file)
 {
-    mFile.load(file);
+    Ogre::DataStreamPtr stream = openConstrainedFileDataStream(file.c_str());
+    mFile.load(stream);
 }
 
 void Manager::loadDefault (const std::string& file)
 {
-    mDefaultFile.load(file);
+    Ogre::DataStreamPtr stream = openConstrainedFileDataStream(file.c_str());
+    mDefaultFile.load(stream);
 }
 
 void Manager::saveUser(const std::string& file)
 {
-    std::fstream fout(file.c_str(), std::ios::out);
+    bfs::ofstream fout((bfs::path(file)));
 
     Ogre::ConfigFile::SectionIterator seci = mFile.getSectionIterator();
 
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index d0ea4b7fb6..423c3971a0 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -1,7 +1,8 @@
 #include "translation.hpp"
-#include <components/misc/stringops.hpp>
 
-#include <fstream>
+#include <boost/filesystem/fstream.hpp>
+
+#include <components/misc/stringops.hpp>
 
 namespace Translation
 {
@@ -28,9 +29,8 @@ namespace Translation
 
         if (dataFileCollections.getCollection (extension).doesExist (fileName))
         {
-            std::string path = dataFileCollections.getCollection (extension).getPath (fileName).string();
-
-            std::ifstream stream (path.c_str());
+            boost::filesystem::ifstream stream (
+                dataFileCollections.getCollection (extension).getPath (fileName));
 
             if (!stream.is_open())
                 throw std::runtime_error ("failed to open translation file: " + fileName);
diff --git a/extern/oics/tinyxml.cpp b/extern/oics/tinyxml.cpp
index 29a4768aa0..21b2d9c9a3 100644
--- a/extern/oics/tinyxml.cpp
+++ b/extern/oics/tinyxml.cpp
@@ -31,18 +31,34 @@ distribution.
 
 #include "tinyxml.h"
 
+#ifdef _WIN32
+#include <Windows.h> // import MultiByteToWideChar
+#endif
+
 
 bool TiXmlBase::condenseWhiteSpace = true;
 
 // Microsoft compiler security
 FILE* TiXmlFOpen( const char* filename, const char* mode )
 {
-	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+	#if defined(_WIN32)
 		FILE* fp = 0;
-		errno_t err = fopen_s( &fp, filename, mode );
-		if ( !err && fp )
-			return fp;
-		return 0;
+		size_t len = strlen(filename);
+		wchar_t *wname = new wchar_t[len + 1];
+		memset(wname, 0, sizeof(*wname) * (len + 1));
+		wchar_t wmode[32] = { 0 };
+
+		MultiByteToWideChar(CP_UTF8, 0, filename, len, wname, len);
+		MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, sizeof(wmode) / sizeof(*wmode));
+
+		#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+		errno_t err = _wfopen_s( &fp, wname, wmode );
+		#else
+		fp = _wfopen(wname, wmode);
+		#endif
+		delete[] wname;
+
+		return fp;
 	#else
 		return fopen( filename, mode );
 	#endif
diff --git a/extern/shiny/Main/Preprocessor.cpp b/extern/shiny/Main/Preprocessor.cpp
index 1a97668bcc..c03879d460 100644
--- a/extern/shiny/Main/Preprocessor.cpp
+++ b/extern/shiny/Main/Preprocessor.cpp
@@ -4,6 +4,59 @@
 #include <boost/wave/cpplexer/cpp_lex_token.hpp>
 #include <boost/wave/cpplexer/cpp_lex_iterator.hpp>
 
+#include <boost/filesystem/fstream.hpp>
+
+/*
+	Almost exact copy of load_file_to_string policy found in
+	boost::wave headers with the only change that it uses
+	boost::filesystem facility to handle UTF-8 paths used
+	throughout OpenMW (bfs::fstream, bfs::path).
+
+	Original namespace is used due to required bost::wave
+	internal symbols.
+*/
+namespace boost {
+namespace wave {
+namespace iteration_context_policies {
+
+	struct load_utf8_path_to_string
+	{
+		template <typename IterContextT>
+		class inner
+		{
+		public:
+			template <typename PositionT>
+			static void init_iterators(IterContextT &iter_ctx,
+				PositionT const &act_pos, language_support language)
+			{
+				typedef typename IterContextT::iterator_type iterator_type;
+                                namespace bfs = boost::filesystem;
+
+				// read in the file
+				bfs::ifstream instream(bfs::path(iter_ctx.filename.c_str()));
+				if (!instream.is_open()) {
+					BOOST_WAVE_THROW_CTX(iter_ctx.ctx, preprocess_exception,
+						bad_include_file, iter_ctx.filename.c_str(), act_pos);
+					return;
+				}
+				instream.unsetf(std::ios::skipws);
+
+				iter_ctx.instring.assign(
+					std::istreambuf_iterator<char>(instream.rdbuf()),
+					std::istreambuf_iterator<char>());
+
+				iter_ctx.first = iterator_type(
+					iter_ctx.instring.begin(), iter_ctx.instring.end(),
+					PositionT(iter_ctx.filename), language);
+				iter_ctx.last = iterator_type();
+			}
+
+		private:
+			std::string instring;
+		};
+	};
+} } }
+
 namespace sh
 {
 	std::string Preprocessor::preprocess (std::string source, const std::string& includePath, std::vector<std::string> definitions, const std::string& name)
@@ -29,7 +82,7 @@ namespace sh
 			//  match the iterator type used during construction of the context
 			//  instance (see below). It is the type of the underlying input stream.
 			typedef boost::wave::context<std::string::iterator, lex_iterator_type
-					, boost::wave::iteration_context_policies::load_file_to_string,
+					, boost::wave::iteration_context_policies::load_utf8_path_to_string,
 					emit_custom_line_directives_hooks>
 				context_type;
 
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
index fa1e58b9d2..5dc53e5057 100644
--- a/files/mygui/openmw_edit_effect.layout
+++ b/files/mygui/openmw_edit_effect.layout
@@ -33,6 +33,7 @@
             </Widget>
             <Widget type="MWScrollBar" skin="MW_HScroll" position="122 20 210 13" name="MagnitudeMinSlider">
                 <Property key="Range" value="100"/>
+                <Property key="Page" value="1"/>
             </Widget>
 
             <Widget type="TextBox" skin="SandText" position="122 32 210 20" name="MagnitudeMaxValue">
@@ -41,6 +42,7 @@
             </Widget>
             <Widget type="MWScrollBar" skin="MW_HScroll" position="122 52 210 13" name="MagnitudeMaxSlider">
                 <Property key="Range" value="100"/>
+                <Property key="Page" value="1"/>
             </Widget>
         </Widget>
 
@@ -58,6 +60,7 @@
             </Widget>
             <Widget type="MWScrollBar" skin="MW_HScroll" position="122 20 210 13" name="DurationSlider">
                 <Property key="Range" value="1440"/>
+                <Property key="Page" value="1"/>
             </Widget>
         </Widget>
 
@@ -74,6 +77,7 @@
             </Widget>
             <Widget type="MWScrollBar" skin="MW_HScroll" position="122 20 210 13" name="AreaSlider">
                 <Property key="Range" value="51"/>
+                <Property key="Page" value="1"/>
             </Widget>
         </Widget>
 
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index bcf4374a46..6119ab7b4d 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -440,8 +440,12 @@
                                     <UserString key="SettingName" value="terrain shadows"/>
                                     <UserString key="SettingType" value="CheckButton"/>
                                 </Widget>
+                                <Widget type="AutoSizedTextBox" skin="SandText" align="Left Top">
+                                    <Property key="Caption" value="Terrain shadows"/>
+                                </Widget>
                             </Widget>
 
+
                             <Widget type="HBox" position="4 56 350 24">
                                 <Widget type="AutoSizedButton" skin="MW_Button" align="Left Top" name="ActorShadows">
                                     <UserString key="SettingCategory" value="Shadows"/>
diff --git a/libs/openengine/gui/loglistener.cpp b/libs/openengine/gui/loglistener.cpp
new file mode 100644
index 0000000000..da36b90a2f
--- /dev/null
+++ b/libs/openengine/gui/loglistener.cpp
@@ -0,0 +1,39 @@
+#include "loglistener.hpp"
+
+#include <iomanip>
+#include <time.h>
+
+#include <boost/filesystem/path.hpp>
+
+namespace MyGUI
+{
+    void CustomLogListener::open()
+    {
+        mStream.open(boost::filesystem::path(mFileName), std::ios_base::out);
+    }
+
+    void CustomLogListener::close()
+    {
+        if (mStream.is_open())
+            mStream.close();
+    }
+
+    void CustomLogListener::flush()
+    {
+        if (mStream.is_open())
+            mStream.flush();
+    }
+
+    void CustomLogListener::log(const std::string& _section, LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line)
+    {
+        if (mStream.is_open())
+        {
+            const char* separator = "  |  ";
+            mStream << std::setw(2) << std::setfill('0') << _time->tm_hour << ":"
+                << std::setw(2) << std::setfill('0') << _time->tm_min << ":"
+                << std::setw(2) << std::setfill('0') << _time->tm_sec << separator
+                << _section << separator << _level.print() << separator
+                << _message << separator << _file << separator << _line << std::endl;
+        }
+    }
+}
diff --git a/libs/openengine/gui/loglistener.hpp b/libs/openengine/gui/loglistener.hpp
new file mode 100644
index 0000000000..47978ba447
--- /dev/null
+++ b/libs/openengine/gui/loglistener.hpp
@@ -0,0 +1,37 @@
+#ifndef OPENENGINE_MYGUI_LOGLISTENER_H
+#define OPENENGINE_MYGUI_LOGLISTENER_H
+
+#include <string>
+#include <boost/filesystem/fstream.hpp>
+
+#include <MyGUI_ILogListener.h>
+
+namespace MyGUI
+{
+    /// \brief  Custom MyGUI::ILogListener interface implementation
+    /// being able to portably handle UTF-8 encoded path.
+    class CustomLogListener : public ILogListener
+    {
+    public:
+        CustomLogListener(const std::string &name)
+            : mFileName(name)
+        {}
+
+        ~CustomLogListener() {}
+
+        virtual void open();
+        virtual void close();
+        virtual void flush();
+
+        virtual void log(const std::string& _section, LogLevel _level, const struct tm* _time, const std::string& _message, const char* _file, int _line);
+
+        const std::string& getFileName() const { return mFileName; }
+
+    private:
+        boost::filesystem::ofstream mStream;
+        std::string mFileName;
+    };
+
+}
+
+#endif
diff --git a/libs/openengine/gui/manager.cpp b/libs/openengine/gui/manager.cpp
index 91937d24bc..383d37640b 100644
--- a/libs/openengine/gui/manager.cpp
+++ b/libs/openengine/gui/manager.cpp
@@ -1,9 +1,14 @@
 #include "manager.hpp"
+#include "loglistener.hpp"
 
 #include <MyGUI_Gui.h>
 #include <MyGUI_OgrePlatform.h>
 #include <MyGUI_Timer.h>
 
+#include <MyGUI_LevelLogFilter.h>
+#include <MyGUI_LogSource.h>
+#include <MyGUI_ConsoleLogListener.h>
+
 #include <cassert>
 
 #include <extern/shiny/Main/Factory.hpp>
@@ -554,8 +559,34 @@ public:
     }
 };
 
-}
+/// \brief Helper class holding data that required during
+/// MyGUI log creation
+class LogFacility
+{
+    ConsoleLogListener  mConsole;
+    CustomLogListener   mFile;
+    LevelLogFilter      mFilter;
+    LogSource           mSource;
 
+public:
+
+    LogFacility(const std::string &output, bool console)
+      : mFile(output)
+    {
+        mConsole.setEnabled(console);
+        mFilter.setLoggingLevel(LogLevel::Info);
+
+        mSource.addLogListener(&mFile);
+        mSource.addLogListener(&mConsole);
+        mSource.setLogFilter(&mFilter);
+
+        mSource.open();
+    }
+
+    LogSource *getSource() { return &mSource; }
+};
+
+}
 
 void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool logging, const std::string& logDir)
 {
@@ -586,10 +617,10 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
         mRenderManager = new MyGUI::OgreRenderManager();
     mDataManager = new MyGUI::FixedOgreDataManager();
 
-    LogManager::getInstance().setSTDOutputEnabled(logging);
-
-    if (!theLogFile.empty())
-        LogManager::getInstance().createDefaultSource(theLogFile);
+    // Do not use default log since it don't support Unicode path on Windows.
+    // Instead, manually create log source using LogFacility and pass it.
+    mLogFacility = new MyGUI::LogFacility(theLogFile, logging);
+    LogManager::getInstance().addLogSource(mLogFacility->getSource());
 
     if (mShaderRenderManager)
         mShaderRenderManager->initialise(wnd, mgr);
@@ -648,5 +679,7 @@ void MyGUIManager::shutdown()
         delete mLogManager;
         mLogManager = NULL;
     }
+    delete mLogFacility;
+
     mGui = NULL;
 }
diff --git a/libs/openengine/gui/manager.hpp b/libs/openengine/gui/manager.hpp
index cca70dfcfe..8923a5cc8e 100644
--- a/libs/openengine/gui/manager.hpp
+++ b/libs/openengine/gui/manager.hpp
@@ -10,6 +10,7 @@ namespace MyGUI
   class OgreDataManager;
   class OgreRenderManager;
   class ShaderBasedRenderManager;
+  class LogFacility;
 }
 
 namespace Ogre
@@ -25,6 +26,7 @@ namespace GUI
     {
         MyGUI::Gui *mGui;
         MyGUI::LogManager* mLogManager;
+        MyGUI::LogFacility* mLogFacility;
         MyGUI::OgreDataManager* mDataManager;
         MyGUI::OgreRenderManager* mRenderManager;
         MyGUI::ShaderBasedRenderManager* mShaderRenderManager;
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index caf62546e5..8fcf615ba4 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -15,6 +15,9 @@
 
 #include <components/ogreinit/ogreinit.hpp>
 
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/fstream.hpp>
+
 #include <cassert>
 #include <stdexcept>
 
@@ -48,7 +51,41 @@ void OgreRenderer::update(float dt)
 
 void OgreRenderer::screenshot(const std::string &file)
 {
-    mWindow->writeContentsToFile(file);
+    /*  Since Ogre uses narrow character interfaces, it does not support
+        Unicode paths on Windows. Therefore we had to implement screenshot
+        saving manually.
+    */
+    namespace bfs = boost::filesystem;
+    bfs::ofstream out(bfs::path(file), std::ios::binary);
+
+    Ogre::Image image;
+
+    Ogre::PixelFormat pf = mWindow->suggestPixelFormat();
+    int w = mWindow->getWidth();
+    int h = mWindow->getHeight();
+
+    image.loadDynamicImage(
+        OGRE_ALLOC_T(Ogre::uchar, w * h * Ogre::PixelUtil::getNumElemBytes(pf), Ogre::MEMCATEGORY_GENERAL),
+        w, h, 1, pf, true
+    );
+    mWindow->copyContentsToMemory(image.getPixelBox());
+
+    Ogre::DataStreamPtr stream = image.encode("png");
+    Ogre::MemoryDataStream *mem = dynamic_cast<Ogre::MemoryDataStream *>(stream.get());
+    if (mem != 0) { // likely
+        const char *ptr = reinterpret_cast<char *>(mem->getCurrentPtr());
+        out.write(ptr, mem->size());
+    }
+    else {
+        char buf[4096];
+        size_t size = stream->size();
+        while (size > 0) {
+            size_t chunk = (size > sizeof(buf)) ? sizeof(buf) : size;
+            stream->read(buf, chunk);
+            out.write(buf, chunk);
+            size -= chunk;
+        }
+    }
 }
 
 float OgreRenderer::getFPS()
diff --git a/readme.txt b/readme.txt
index 4db9425b6d..92cb35f31f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ OpenMW: A reimplementation of The Elder Scrolls III: Morrowind
 OpenMW is an attempt at recreating the engine for the popular role-playing game
 Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 
-Version: 0.29.0
+Version: 0.30.0
 License: GPL (see GPL3.txt for more information)
 Website: http://www.openmw.org