diff --git a/.gitignore b/.gitignore
index 9734ac35c..776e2b659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ makefile
 data
 *.kdev4
 CMakeLists.txt.user
+*.swp
+*.swo
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 8b1378917..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Bitstream Vera License.txt b/Bitstream Vera License.txt
deleted file mode 100644
index 2b37cc1df..000000000
--- a/Bitstream Vera License.txt	
+++ /dev/null
@@ -1,123 +0,0 @@
-Bitstream Vera Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as
-long as "Bitstream" or "Vera" are not in the names), and full
-redistribution (so long as they are not *sold* by themselves). They
-can be be bundled, redistributed and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright
-=========
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream
-Vera is a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the fonts accompanying this license ("Fonts") and associated
-documentation files (the "Font Software"), to reproduce and distribute
-the Font Software, including without limitation the rights to use,
-copy, merge, publish, distribute, and/or sell copies of the Font
-Software, and to permit persons to whom the Font Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice
-shall be included in all copies of one or more of the Font Software
-typefaces.
-
-The Font Software may be modified, altered, or added to, and in
-particular the designs of glyphs or characters in the Fonts may be
-modified and additional glyphs or characters may be added to the
-Fonts, only if the fonts are renamed to names not containing either
-the words "Bitstream" or the word "Vera".
-
-This License becomes null and void to the extent applicable to Fonts
-or Font Software that has been modified and is distributed under the
-"Bitstream Vera" names.
-
-The Font Software may be sold as part of a larger software package but
-no copy of one or more of the Font Software typefaces may be sold by
-itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
-BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
-OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
-SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome
-Foundation, and Bitstream Inc., shall not be used in advertising or
-otherwise to promote the sale, use or other dealings in this Font
-Software without prior written authorization from the Gnome Foundation
-or Bitstream Inc., respectively. For further information, contact:
-fonts at gnome dot org.
-
-Copyright FAQ
-=============
-
-   1. I don't understand the resale restriction... What gives?
-
-      Bitstream is giving away these fonts, but wishes to ensure its
-      competitors can't just drop the fonts as is into a font sale system
-      and sell them as is. It seems fair that if Bitstream can't make money
-      from the Bitstream Vera fonts, their competitors should not be able to
-      do so either. You can sell the fonts as part of any software package,
-      however.
-
-   2. I want to package these fonts separately for distribution and
-      sale as part of a larger software package or system.  Can I do so?
-
-      Yes. A RPM or Debian package is a "larger software package" to begin 
-      with, and you aren't selling them independently by themselves. 
-      See 1. above.
-
-   3. Are derivative works allowed?
-      Yes!
-
-   4. Can I change or add to the font(s)?
-      Yes, but you must change the name(s) of the font(s).
-
-   5. Under what terms are derivative works allowed?
-
-      You must change the name(s) of the fonts. This is to ensure the
-      quality of the fonts, both to protect Bitstream and Gnome. We want to
-      ensure that if an application has opened a font specifically of these
-      names, it gets what it expects (though of course, using fontconfig,
-      substitutions could still could have occurred during font
-      opening). You must include the Bitstream copyright. Additional
-      copyrights can be added, as per copyright law. Happy Font Hacking!
-
-   6. If I have improvements for Bitstream Vera, is it possible they might get 
-       adopted in future versions?
-
-      Yes. The contract between the Gnome Foundation and Bitstream has
-      provisions for working with Bitstream to ensure quality additions to
-      the Bitstream Vera font family. Please contact us if you have such
-      additions. Note, that in general, we will want such additions for the
-      entire family, not just a single font, and that you'll have to keep
-      both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add
-      glyphs to the font, they must be stylistically in keeping with Vera's
-      design. Vera cannot become a "ransom note" font. Jim Lyles will be
-      providing a document describing the design elements used in Vera, as a
-      guide and aid for people interested in contributing to Vera.
-
-   7. I want to sell a software package that uses these fonts: Can I do so?
-
-      Sure. Bundle the fonts with your software and sell your software
-      with the fonts. That is the intent of the copyright.
-
-   8. If applications have built the names "Bitstream Vera" into them, 
-      can I override this somehow to use fonts of my choosing?
-
-      This depends on exact details of the software. Most open source
-      systems and software (e.g., Gnome, KDE, etc.) are now converting to
-      use fontconfig (see www.fontconfig.org) to handle font configuration,
-      selection and substitution; it has provisions for overriding font
-      names and subsituting alternatives. An example is provided by the
-      supplied local.conf file, which chooses the family Bitstream Vera for
-      "sans", "serif" and "monospace".  Other software (e.g., the XFree86
-      core server) has other mechanisms for font substitution.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78388e20f..2313d2d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ include (OpenMWMacros)
 # Version
 
 set (OPENMW_VERSION_MAJOR 0)
-set (OPENMW_VERSION_MINOR 19)
+set (OPENMW_VERSION_MINOR 20)
 set (OPENMW_VERSION_RELEASE 0)
 
 set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
@@ -25,18 +25,20 @@ set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VE
 configure_file ("${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp")
 
 option(MYGUI_STATIC "Link static build of Mygui into the binaries" FALSE)
-option(OGRE_STATIC "Link static build of Ogre and Ogre Plugins into the binaries" FALSE)
+option(OGRE_STATIC  "Link static build of Ogre and Ogre Plugins into the binaries" FALSE)
+option(BOOST_STATIC "Link static build of Boost into the binaries" FALSE)
 
 # Apps and tools
 option(BUILD_ESMTOOL "build ESM inspector" ON)
 option(BUILD_LAUNCHER "build Launcher" ON)
 option(BUILD_MWINIIMPORTER "build MWiniImporter" ON)
+option(BUILD_OPENCS "build OpenMW Construction Set" ON)
 option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF)
 option(BUILD_UNITTESTS "Enable Unittests with Google C++ Unittest ang GMock frameworks" OFF)
 
 # Sound source selection
-option(USE_FFMPEG "use ffmpeg for sound" OFF)
-option(USE_AUDIERE "use audiere for sound" OFF)
+option(USE_FFMPEG "use ffmpeg for sound" ON)
+option(USE_AUDIERE "use audiere for sound" ON)
 option(USE_MPG123 "use mpg123 + libsndfile for sound" ON)
 
 # OS X deployment
@@ -65,35 +67,6 @@ endif()
 # We probably support older versions than this.
 cmake_minimum_required(VERSION 2.6)
 
-#
-# Pre-built binaries being used?
-#
-IF(EXISTS "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd/ogre_1_7_1")
-    set(PREBUILT_DIR "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd")
-    message (STATUS "OpenMW pre-built binaries found at ${PREBUILT_DIR}.")
-
-    SET(ENV{OGRE_HOME} "${PREBUILT_DIR}/ogre_1_7_1")
-
-    SET(ENV{BOOST_ROOT} "${PREBUILT_DIR}/boost_1_42_0")
-    set(Boost_USE_STATIC_LIBS   ON)
-    set(Boost_USE_MULTITHREADED ON)
-    set(ENV{BOOST_INCLUDEDIR} "${BOOST_ROOT}/include")
-    set(ENV{BOOST_LIBRARYDIR} "${BOOST_ROOT}/lib")
-
-    set(ENV{FREETYPE_DIR} "${PREBUILT_DIR}/freetype-2.3.5-1")
-
-    set(USE_MPG123 OFF)
-    set(USE_AUDIERE ON)
-    set(AUDIERE_INCLUDE_DIR "${PREBUILT_DIR}/audiere-1.9.4/include")
-    set(AUDIERE_LIBRARY "${PREBUILT_DIR}/audiere-1.9.4/lib/audiere.lib")
-
-    set(ENV{OPENALDIR} "${PREBUILT_DIR}/OpenAL 1.1 SDK")
-
-    set(BULLET_ROOT "${PREBUILT_DIR}/bullet")
-ELSE()
-    message (STATUS "OpenMW pre-built binaries not found.  Using standard locations.")
-ENDIF()
-
 # source directory: libs
 
 set(LIBDIR ${CMAKE_SOURCE_DIR}/libs)
@@ -102,7 +75,6 @@ set(OENGINE_OGRE
   ${LIBDIR}/openengine/ogre/renderer.cpp
   ${LIBDIR}/openengine/ogre/fader.cpp
   ${LIBDIR}/openengine/ogre/imagerotate.cpp
-  ${LIBDIR}/openengine/ogre/atlas.cpp
   ${LIBDIR}/openengine/ogre/selectionbuffer.cpp
 )
 set(OENGINE_GUI
@@ -136,30 +108,54 @@ set(OPENMW_LIBS ${OENGINE_ALL})
 set(OPENMW_LIBS_HEADER)
 
 # Sound setup
+set(GOT_SOUND_INPUT 0)
 set(SOUND_INPUT_INCLUDES "")
 set(SOUND_INPUT_LIBRARY "")
 set(SOUND_DEFINE "")
 if (USE_FFMPEG)
-    find_package(FFMPEG REQUIRED)
-    set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${FFMPEG_INCLUDE_DIR})
-    set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${FFMPEG_LIBRARIES})
-    set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_FFMPEG)
+    set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
+    find_package(FFmpeg)
+    if (FFMPEG_FOUND)
+        set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
+        set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARIES})
+        set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_FFMPEG)
+        set(GOT_SOUND_INPUT 1)
+    endif (FFMPEG_FOUND)
 endif (USE_FFMPEG)
 
-if (USE_AUDIERE)
-    find_package(Audiere REQUIRED)
-    set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${AUDIERE_INCLUDE_DIR})
-    set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${AUDIERE_LIBRARY})
-    set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_AUDIERE)
-endif (USE_AUDIERE)
+if (USE_AUDIERE AND NOT GOT_SOUND_INPUT)
+    find_package(Audiere)
+    if (AUDIERE_FOUND)
+        set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${AUDIERE_INCLUDE_DIR})
+        set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${AUDIERE_LIBRARY})
+        set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_AUDIERE)
+        set(GOT_SOUND_INPUT 1)
+    endif (AUDIERE_FOUND)
+endif (USE_AUDIERE AND NOT GOT_SOUND_INPUT)
 
-if (USE_MPG123)
+if (USE_MPG123 AND NOT GOT_SOUND_INPUT)
     find_package(MPG123 REQUIRED)
     find_package(SNDFILE REQUIRED)
-    set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${MPG123_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR})
-    set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${MPG123_LIBRARY} ${SNDFILE_LIBRARY})
-    set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_MPG123)
-endif (USE_MPG123)
+    if (MPG123_FOUND AND SNDFILE_FOUND)
+        set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${MPG123_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR})
+        set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${MPG123_LIBRARY} ${SNDFILE_LIBRARY})
+        set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_MPG123)
+        set(GOT_SOUND_INPUT 1)
+    endif (MPG123_FOUND AND SNDFILE_FOUND)
+endif (USE_MPG123 AND NOT GOT_SOUND_INPUT)
+
+if (NOT GOT_SOUND_INPUT)
+    message(WARNING "--------------------")
+    message(WARNING "Failed to find any sound input packages")
+    message(WARNING "--------------------")
+endif (NOT GOT_SOUND_INPUT)
+
+if (NOT FFMPEG_FOUND)
+    message(WARNING "--------------------")
+    message(WARNING "FFmpeg not found, video playback will be disabled")
+    message(WARNING "--------------------")
+endif (NOT FFMPEG_FOUND)
+
 
 # Platform specific
 if (WIN32)
@@ -167,9 +163,9 @@ if (WIN32)
     set(PLATFORM_INCLUDE_DIR "platform")
     add_definitions(-DBOOST_ALL_NO_LIB)
 else (WIN32)
-set(PLATFORM_INCLUDE_DIR "")
-find_path (UUID_INCLUDE_DIR uuid/uuid.h)
-include_directories(${UUID_INCLUDE_DIR})
+    set(PLATFORM_INCLUDE_DIR "")
+    find_path (UUID_INCLUDE_DIR uuid/uuid.h)
+    include_directories(${UUID_INCLUDE_DIR})
 endif (WIN32)
 if (MSVC10)
     set(PLATFORM_INCLUDE_DIR "")
@@ -183,7 +179,7 @@ endif (APPLE)
 
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
-find_package (Threads)
+    find_package (Threads)
 endif()
 
 # find boost without components so we can use Boost_VERSION
@@ -196,6 +192,10 @@ if (Boost_VERSION LESS 104900)
     set(BOOST_COMPONENTS ${BOOST_COMPONENTS} wave)
 endif()
 
+IF(BOOST_STATIC)
+    set(Boost_USE_STATIC_LIBS   ON)
+endif()
+
 find_package(OGRE REQUIRED)
 find_package(MyGUI REQUIRED)
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
@@ -244,7 +244,7 @@ if (APPLE)
     else ()
         set(OGRE_PLUGIN_DIR ${OGRE_PLUGIN_DIR_DBG})
     endif ()
-    
+
     #set(OGRE_PLUGIN_DIR "${OGRE_PLUGIN_DIR}/")
 
     configure_file(${OpenMW_SOURCE_DIR}/files/mac/Info.plist
@@ -356,7 +356,7 @@ if(DPKG_PROGRAM)
     SET(CPACK_DEBIAN_PACKAGE_NAME "openmw")
     SET(CPACK_DEBIAN_PACKAGE_VERSION "${VERSION_STRING}")
     SET(CPACK_PACKAGE_EXECUTABLES "openmw;OpenMW esmtool;Esmtool omwlauncher;OMWLauncher mwiniimporter;MWiniImporter")
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem1.46.1 (>= 1.46.1), libboost-program-options1.46.1 (>= 1.46.1), libboost-system1.46.1 (>= 1.46.1), libboost-thread1.46.1 (>= 1.46.1), libc6 (>= 2.11.2), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libmpg123-0 (>= 1.12.1), libois-1.3.0 (>= 1.3.0), libopenal1 (>= 1:1.12.854), libsndfile1 (>= 1.0.23), libstdc++6 (>= 4.4.5), libuuid1 (>= 2.17.2), libqtgui4 (>= 4.7.0)")
+    SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.11.2), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libmpg123-0 (>= 1.12.1), libois-1.3.0 (>= 1.3.0), libopenal1 (>= 1:1.12.854), libsndfile1 (>= 1.0.23), libstdc++6 (>= 4.4.5), libuuid1 (>= 2.17.2), libqtgui4 (>= 4.7.0)")
 
     SET(CPACK_DEBIAN_PACKAGE_SECTION "Games")
 
@@ -462,6 +462,10 @@ if (BUILD_MWINIIMPORTER)
    add_subdirectory( apps/mwiniimporter )
 endif()
 
+if (BUILD_OPENCS)
+   add_subdirectory (apps/opencs)
+endif()
+
 # UnitTests
 if (BUILD_UNITTESTS)
   add_subdirectory( apps/openmw_test_suite )
@@ -525,7 +529,9 @@ if (WIN32)
 		set_target_properties(omwlauncher PROPERTIES COMPILE_FLAGS ${WARNINGS})
 	endif (BUILD_LAUNCHER)
     set_target_properties(openmw PROPERTIES COMPILE_FLAGS ${WARNINGS})
-	set_target_properties(esmtool PROPERTIES COMPILE_FLAGS ${WARNINGS})
+    if (BUILD_ESMTOOL)
+        set_target_properties(esmtool PROPERTIES COMPILE_FLAGS ${WARNINGS})
+    endif (BUILD_ESMTOOL)
   endif(MSVC)
 
   # Same for MinGW
diff --git a/DejaVu Font License.txt b/DejaVu Font License.txt
new file mode 100644
index 000000000..254e2cc42
--- /dev/null
+++ b/DejaVu Font License.txt	
@@ -0,0 +1,99 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the 
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
+
+$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index 25c4f3a7a..3c9476d7a 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -59,7 +59,7 @@ struct Arguments
     std::string outname;
 
     std::vector<std::string> types;
-  
+
     ESMData data;
     ESM::ESMReader reader;
     ESM::ESMWriter writer;
@@ -74,7 +74,7 @@ bool parseOptions (int argc, char** argv, Arguments &info)
         ("version,v", "print version information and quit.")
         ("raw,r", "Show an unformatted list of all records and subrecords.")
         // The intention is that this option would interact better
-        // with other modes including clone, dump, and raw. 
+        // with other modes including clone, dump, and raw.
         ("type,t", bpo::value< std::vector<std::string> >(),
          "Show only records of this type (four character record code).  May "
          "be specified multiple times.  Only affects dump mode.")
@@ -165,23 +165,12 @@ bool parseOptions (int argc, char** argv, Arguments &info)
 
     // Font encoding settings
     info.encoding = variables["encoding"].as<std::string>();
-    if (info.encoding == "win1250")
+    if(info.encoding != "win1250" && info.encoding != "win1251" && info.encoding != "win1252")
     {
-        std::cout << "Using Central and Eastern European font encoding." << std::endl;
-    }
-    else if (info.encoding == "win1251")
-    {
-        std::cout << "Using Cyrillic font encoding." << std::endl;
-    }
-    else
-    {
-        if(info.encoding != "win1252")
-        {
-            std::cout << info.encoding << " is not a valid encoding option." << std::endl;
-            info.encoding = "win1252";
-        }
-        std::cout << "Using default (English) font encoding." << std::endl;
+        std::cout << info.encoding << " is not a valid encoding option." << std::endl;
+        info.encoding = "win1252";
     }
+    std::cout << ToUTF8::encodingUsingMessage(info.encoding) << std::endl;
 
     return true;
 }
@@ -265,7 +254,8 @@ void printRaw(ESM::ESMReader &esm)
 int load(Arguments& info)
 {
     ESM::ESMReader& esm = info.reader;
-    esm.setEncoding(info.encoding);
+    ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
+    esm.setEncoder(&encoder);
 
     std::string filename = info.filename;
     std::cout << "Loading file: " << filename << std::endl;
@@ -324,7 +314,7 @@ int load(Arguments& info)
             if (info.types.size() > 0)
             {
                 std::vector<std::string>::iterator match;
-                match = std::find(info.types.begin(), info.types.end(), 
+                match = std::find(info.types.begin(), info.types.end(),
                                   n.toString());
                 if (match == info.types.end()) interested = false;
             }
@@ -428,14 +418,15 @@ int clone(Arguments& info)
         if (++i % 3 == 0)
             std::cout << std::endl;
     }
-    
+
     if (i % 3 != 0)
         std::cout << std::endl;
 
     std::cout << std::endl << "Saving records to: " << info.outname << "..." << std::endl;
 
     ESM::ESMWriter& esm = info.writer;
-    esm.setEncoding(info.encoding);
+    ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(info.encoding));
+    esm.setEncoder(&encoder);
     esm.setAuthor(info.data.author);
     esm.setDescription(info.data.description);
     esm.setVersion(info.data.version);
@@ -453,7 +444,7 @@ int clone(Arguments& info)
     for (Records::iterator it = records.begin(); it != records.end() && i > 0; ++it)
     {
         EsmTool::RecordBase *record = *it;
-        
+
         name.val = record->getType().val;
 
         esm.startRecord(name.toString(), record->getFlags());
@@ -488,7 +479,7 @@ int clone(Arguments& info)
             std::cerr << "\r" << perc << "%";
         }
     }
-    
+
     std::cout << "\rDone!" << std::endl;
 
     esm.close();
@@ -516,7 +507,7 @@ int comp(Arguments& info)
 
     fileOne.encoding = info.encoding;
     fileTwo.encoding = info.encoding;
-    
+
     fileOne.filename = info.filename;
     fileTwo.filename = info.outname;
 
@@ -537,9 +528,9 @@ int comp(Arguments& info)
         std::cout << "Not equal, different amount of records." << std::endl;
         return 1;
     }
-    
-    
-    
+
+
+
 
     return 0;
 }
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index b5f97e979..a732f1938 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -738,7 +738,6 @@ void Record<ESM::GameSetting>::print()
     default:
         std::cout << "unknown type";
     }
-    std::cout << "\n  Dirty: " << mData.mDirty << std::endl;
 }
 
 template<>
diff --git a/apps/launcher/model/datafilesmodel.cpp b/apps/launcher/model/datafilesmodel.cpp
index d85a15e73..e84dbe0ac 100644
--- a/apps/launcher/model/datafilesmodel.cpp
+++ b/apps/launcher/model/datafilesmodel.cpp
@@ -272,7 +272,8 @@ void DataFilesModel::addMasters(const QString &path)
     foreach (const QString &path, dir.entryList()) {
         try {
             ESM::ESMReader fileReader;
-            fileReader.setEncoding(mEncoding.toStdString());
+            ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(mEncoding.toStdString()));
+            fileReader.setEncoder(&encoder);
             fileReader.open(dir.absoluteFilePath(path).toStdString());
 
             ESM::ESMReader::MasterList mlist = fileReader.getMasters();
@@ -335,7 +336,8 @@ void DataFilesModel::addPlugins(const QString &path)
 
         try {
             ESM::ESMReader fileReader;
-            fileReader.setEncoding(mEncoding.toStdString());
+            ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding(mEncoding.toStdString()));
+            fileReader.setEncoder(&encoder);
             fileReader.open(dir.absoluteFilePath(path).toStdString());
 
             ESM::ESMReader::MasterList mlist = fileReader.getMasters();
diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp
index 19b69794f..077b62be1 100644
--- a/apps/mwiniimporter/importer.cpp
+++ b/apps/mwiniimporter/importer.cpp
@@ -7,6 +7,8 @@
 #include <vector>
 #include <algorithm>
 #include <sstream>
+#include <components/misc/stringops.hpp>
+
 
 MwIniImporter::MwIniImporter()
     : mVerbose(false)
@@ -18,8 +20,609 @@ MwIniImporter::MwIniImporter()
         { 0, 0 }
     };
     const char *fallback[] = {
+
+        // light
+        "LightAttenuation:UseConstant",
+        "LightAttenuation:ConstantValue",
+        "LightAttenuation:UseLinear",
+        "LightAttenuation:LinearMethod",
+        "LightAttenuation:LinearValue",
+        "LightAttenuation:LinearRadiusMult",
+        "LightAttenuation:UseQuadratic",
+        "LightAttenuation:QuadraticMethod",
+        "LightAttenuation:QuadraticValue",
+        "LightAttenuation:QuadraticRadiusMult",
+        "LightAttenuation:OutQuadInLin",
+
+        // inventory
+        "Inventory:DirectionalDiffuseR",
+        "Inventory:DirectionalDiffuseG",
+        "Inventory:DirectionalDiffuseB",
+        "Inventory:DirectionalAmbientR",
+        "Inventory:DirectionalAmbientG",
+        "Inventory:DirectionalAmbientB",
+        "Inventory:DirectionalRotationX",
+        "Inventory:DirectionalRotationY",
+        "Inventory:UniformScaling",
+
+        // map
+        "Map:Travel Siltstrider Red",
+        "Map:Travel Siltstrider Green",
+        "Map:Travel Siltstrider Blue",
+        "Map:Travel Boat Red",
+        "Map:Travel Boat Green",
+        "Map:Travel Boat Blue",
+        "Map:Travel Magic Red",
+        "Map:Travel Magic Green",
+        "Map:Travel Magic Blue",
+        "Map:Show Travel Lines",
+
+        // water
+        "Water:Map Alpha",
+        "Water:World Alpha",
+        "Water:SurfaceTextureSize",
+        "Water:SurfaceTileCount",
+        "Water:SurfaceFPS",
+        "Water:SurfaceTexture",
+        "Water:SurfaceFrameCount",
+        "Water:TileTextureDivisor",
+        "Water:RippleTexture",
+        "Water:RippleFrameCount",
+        "Water:RippleLifetime",
+        "Water:MaxNumberRipples",
+        "Water:RippleScale",
+        "Water:RippleRotSpeed",
+        "Water:RippleAlphas",
+        "Water:PSWaterReflectTerrain",
+        "Water:PSWaterReflectUpdate",
+        "Water:NearWaterRadius",
+        "Water:NearWaterPoints",
+        "Water:NearWaterUnderwaterFreq",
+        "Water:NearWaterUnderwaterVolume",
+        "Water:NearWaterIndoorTolerance",
+        "Water:NearWaterOutdoorTolerance",
+        "Water:NearWaterIndoorID",
+        "Water:NearWaterOutdoorID",
+        "Water:UnderwaterSunriseFog",
+        "Water:UnderwaterDayFog",
+        "Water:UnderwaterSunsetFog",
+        "Water:UnderwaterNightFog",
+        "Water:UnderwaterIndoorFog",
+        "Water:UnderwaterColor",
+        "Water:UnderwaterColorWeight",
+
+        // pixelwater
+        "PixelWater:SurfaceFPS",
+        "PixelWater:TileCount",
+        "PixelWater:Resolution",
+
+        // fonts
+        "Fonts:Font 0",
+        "Fonts:Font 1",
+        "Fonts:Font 2",
+
+        // UI colors
+        "FontColor:color_normal",
+        "FontColor:color_normal_over",
+        "FontColor:color_normal_pressed",
+        "FontColor:color_active",
+        "FontColor:color_active_over",
+        "FontColor:color_active_pressed",
+        "FontColor:color_disabled",
+        "FontColor:color_disabled_over",
+        "FontColor:color_disabled_pressed",
+        "FontColor:color_link",
+        "FontColor:color_link_over",
+        "FontColor:color_link_pressed",
+        "FontColor:color_journal_link",
+        "FontColor:color_journal_link_over",
+        "FontColor:color_journal_link_pressed",
+        "FontColor:color_journal_topic",
+        "FontColor:color_journal_topic_over",
+        "FontColor:color_journal_topic_pressed",
+        "FontColor:color_answer",
+        "FontColor:color_answer_over",
+        "FontColor:color_answer_pressed",
+        "FontColor:color_header",
+        "FontColor:color_notify",
+        "FontColor:color_big_normal",
+        "FontColor:color_big_normal_over",
+        "FontColor:color_big_normal_pressed",
+        "FontColor:color_big_link",
+        "FontColor:color_big_link_over",
+        "FontColor:color_big_link_pressed",
+        "FontColor:color_big_answer",
+        "FontColor:color_big_answer_over",
+        "FontColor:color_big_answer_pressed",
+        "FontColor:color_big_header",
+        "FontColor:color_big_notify",
+        "FontColor:color_background",
+        "FontColor:color_focus",
+        "FontColor:color_health",
+        "FontColor:color_magic",
+        "FontColor:color_fatigue",
+        "FontColor:color_misc",
+        "FontColor:color_weapon_fill",
+        "FontColor:color_magic_fill",
+        "FontColor:color_positive",
+        "FontColor:color_negative",
+        "FontColor:color_count",
+
+        // level up messages
+        "Level Up:Level2",
+        "Level Up:Level3",
+        "Level Up:Level4",
+        "Level Up:Level5",
+        "Level Up:Level6",
+        "Level Up:Level7",
+        "Level Up:Level8",
+        "Level Up:Level9",
+        "Level Up:Level10",
+        "Level Up:Level11",
+        "Level Up:Level12",
+        "Level Up:Level13",
+        "Level Up:Level14",
+        "Level Up:Level15",
+        "Level Up:Level16",
+        "Level Up:Level17",
+        "Level Up:Level18",
+        "Level Up:Level19",
+        "Level Up:Level20",
+        "Level Up:Default",
+
+        // character creation multiple choice test
+        "Question 1:Question",
+        "Question 1:AnswerOne",
+        "Question 1:AnswerTwo",
+        "Question 1:AnswerThree",
+        "Question 1:Sound",
+        "Question 2:Question",
+        "Question 2:AnswerOne",
+        "Question 2:AnswerTwo",
+        "Question 2:AnswerThree",
+        "Question 2:Sound",
+        "Question 3:Question",
+        "Question 3:AnswerOne",
+        "Question 3:AnswerTwo",
+        "Question 3:AnswerThree",
+        "Question 3:Sound",
+        "Question 4:Question",
+        "Question 4:AnswerOne",
+        "Question 4:AnswerTwo",
+        "Question 4:AnswerThree",
+        "Question 4:Sound",
+        "Question 5:Question",
+        "Question 5:AnswerOne",
+        "Question 5:AnswerTwo",
+        "Question 5:AnswerThree",
+        "Question 5:Sound",
+        "Question 6:Question",
+        "Question 6:AnswerOne",
+        "Question 6:AnswerTwo",
+        "Question 6:AnswerThree",
+        "Question 6:Sound",
+        "Question 7:Question",
+        "Question 7:AnswerOne",
+        "Question 7:AnswerTwo",
+        "Question 7:AnswerThree",
+        "Question 7:Sound",
+        "Question 8:Question",
+        "Question 8:AnswerOne",
+        "Question 8:AnswerTwo",
+        "Question 8:AnswerThree",
+        "Question 8:Sound",
+        "Question 9:Question",
+        "Question 9:AnswerOne",
+        "Question 9:AnswerTwo",
+        "Question 9:AnswerThree",
+        "Question 9:Sound",
+        "Question 10:Question",
+        "Question 10:AnswerOne",
+        "Question 10:AnswerTwo",
+        "Question 10:AnswerThree",
+        "Question 10:Sound",
+
+        // blood textures and models
+        "Blood:Model 0",
+        "Blood:Model 1",
+        "Blood:Model 2",
+        "Blood:Texture 0",
+        "Blood:Texture 1",
+        "Blood:Texture 2",
+        "Blood:Texture Name 0",
+        "Blood:Texture Name 1",
+        "Blood:Texture Name 2",
+
+        // movies
+        "Movies:Company Logo",
+        "Movies:Morrowind Logo",
+        "Movies:New Game",
+        "Movies:Loading",
+        "Movies:Options Menu",
+
+        // weather related values
+
+        "Weather Thunderstorm:Thunder Sound ID 0",
+        "Weather Thunderstorm:Thunder Sound ID 1",
+        "Weather Thunderstorm:Thunder Sound ID 2",
+        "Weather Thunderstorm:Thunder Sound ID 3",
         "Weather:Sunrise Time",
         "Weather:Sunset Time",
+        "Weather:Sunrise Duration",
+        "Weather:Sunset Duration",
+        "Weather:Hours Between Weather Changes", // AKA weather update time
+        "Weather Thunderstorm:Thunder Frequency",
+        "Weather Thunderstorm:Thunder Threshold",
+
+        "Weather:EnvReduceColor",
+        "Weather:LerpCloseColor",
+        "Weather:BumpFadeColor",
+        "Weather:AlphaReduce",
+        "Weather:Minimum Time Between Environmental Sounds",
+        "Weather:Maximum Time Between Environmental Sounds",
+        "Weather:Sun Glare Fader Max",
+        "Weather:Sun Glare Fader Angle Max",
+        "Weather:Sun Glare Fader Color",
+        "Weather:Timescale Clouds",
+        "Weather:Precip Gravity",
+        "Weather:Rain Ripples",
+        "Weather:Rain Ripple Radius",
+        "Weather:Rain Ripples Per Drop",
+        "Weather:Rain Ripple Scale",
+        "Weather:Rain Ripple Speed",
+        "Weather:Fog Depth Change Speed",
+        "Weather:Sky Pre-Sunrise Time",
+        "Weather:Sky Post-Sunrise Time",
+        "Weather:Sky Pre-Sunset Time",
+        "Weather:Sky Post-Sunset Time",
+        "Weather:Ambient Pre-Sunrise Time",
+        "Weather:Ambient Post-Sunrise Time",
+        "Weather:Ambient Pre-Sunset Time",
+        "Weather:Ambient Post-Sunset Time",
+        "Weather:Fog Pre-Sunrise Time",
+        "Weather:Fog Post-Sunrise Time",
+        "Weather:Fog Pre-Sunset Time",
+        "Weather:Fog Post-Sunset Time",
+        "Weather:Sun Pre-Sunrise Time",
+        "Weather:Sun Post-Sunrise Time",
+        "Weather:Sun Pre-Sunset Time",
+        "Weather:Sun Post-Sunset Time",
+        "Weather:Stars Post-Sunset Start",
+        "Weather:Stars Pre-Sunrise Finish",
+        "Weather:Stars Fading Duration",
+        "Weather:Snow Ripples",
+        "Weather:Snow Ripple Radius",
+        "Weather:Snow Ripples Per Flake",
+        "Weather:Snow Ripple Scale",
+        "Weather:Snow Ripple Speed",
+        "Weather:Snow Gravity Scale",
+        "Weather:Snow High Kill",
+        "Weather:Snow Low Kill",
+
+        "Weather Clear:Cloud Texture",
+        "Weather Clear:Clouds Maximum Percent",
+        "Weather Clear:Transition Delta",
+        "Weather Clear:Sky Sunrise Color",
+        "Weather Clear:Sky Day Color",
+        "Weather Clear:Sky Sunset Color",
+        "Weather Clear:Sky Night Color",
+        "Weather Clear:Fog Sunrise Color",
+        "Weather Clear:Fog Day Color",
+        "Weather Clear:Fog Sunset Color",
+        "Weather Clear:Fog Night Color",
+        "Weather Clear:Ambient Sunrise Color",
+        "Weather Clear:Ambient Day Color",
+        "Weather Clear:Ambient Sunset Color",
+        "Weather Clear:Ambient Night Color",
+        "Weather Clear:Sun Sunrise Color",
+        "Weather Clear:Sun Day Color",
+        "Weather Clear:Sun Sunset Color",
+        "Weather Clear:Sun Night Color",
+        "Weather Clear:Sun Disc Sunset Color",
+        "Weather Clear:Land Fog Day Depth",
+        "Weather Clear:Land Fog Night Depth",
+        "Weather Clear:Wind Speed",
+        "Weather Clear:Cloud Speed",
+        "Weather Clear:Glare View",
+        "Weather Clear:Ambient Loop Sound ID",
+
+        "Weather Cloudy:Cloud Texture",
+        "Weather Cloudy:Clouds Maximum Percent",
+        "Weather Cloudy:Transition Delta",
+        "Weather Cloudy:Sky Sunrise Color",
+        "Weather Cloudy:Sky Day Color",
+        "Weather Cloudy:Sky Sunset Color",
+        "Weather Cloudy:Sky Night Color",
+        "Weather Cloudy:Fog Sunrise Color",
+        "Weather Cloudy:Fog Day Color",
+        "Weather Cloudy:Fog Sunset Color",
+        "Weather Cloudy:Fog Night Color",
+        "Weather Cloudy:Ambient Sunrise Color",
+        "Weather Cloudy:Ambient Day Color",
+        "Weather Cloudy:Ambient Sunset Color",
+        "Weather Cloudy:Ambient Night Color",
+        "Weather Cloudy:Sun Sunrise Color",
+        "Weather Cloudy:Sun Day Color",
+        "Weather Cloudy:Sun Sunset Color",
+        "Weather Cloudy:Sun Night Color",
+        "Weather Cloudy:Sun Disc Sunset Color",
+        "Weather Cloudy:Land Fog Day Depth",
+        "Weather Cloudy:Land Fog Night Depth",
+        "Weather Cloudy:Wind Speed",
+        "Weather Cloudy:Cloud Speed",
+        "Weather Cloudy:Glare View",
+        "Weather Cloudy:Ambient Loop Sound ID",
+
+        "Weather Foggy:Cloud Texture",
+        "Weather Foggy:Clouds Maximum Percent",
+        "Weather Foggy:Transition Delta",
+        "Weather Foggy:Sky Sunrise Color",
+        "Weather Foggy:Sky Day Color",
+        "Weather Foggy:Sky Sunset Color",
+        "Weather Foggy:Sky Night Color",
+        "Weather Foggy:Fog Sunrise Color",
+        "Weather Foggy:Fog Day Color",
+        "Weather Foggy:Fog Sunset Color",
+        "Weather Foggy:Fog Night Color",
+        "Weather Foggy:Ambient Sunrise Color",
+        "Weather Foggy:Ambient Day Color",
+        "Weather Foggy:Ambient Sunset Color",
+        "Weather Foggy:Ambient Night Color",
+        "Weather Foggy:Sun Sunrise Color",
+        "Weather Foggy:Sun Day Color",
+        "Weather Foggy:Sun Sunset Color",
+        "Weather Foggy:Sun Night Color",
+        "Weather Foggy:Sun Disc Sunset Color",
+        "Weather Foggy:Land Fog Day Depth",
+        "Weather Foggy:Land Fog Night Depth",
+        "Weather Foggy:Wind Speed",
+        "Weather Foggy:Cloud Speed",
+        "Weather Foggy:Glare View",
+        "Weather Foggy:Ambient Loop Sound ID",
+
+        "Weather Thunderstorm:Cloud Texture",
+        "Weather Thunderstorm:Clouds Maximum Percent",
+        "Weather Thunderstorm:Transition Delta",
+        "Weather Thunderstorm:Sky Sunrise Color",
+        "Weather Thunderstorm:Sky Day Color",
+        "Weather Thunderstorm:Sky Sunset Color",
+        "Weather Thunderstorm:Sky Night Color",
+        "Weather Thunderstorm:Fog Sunrise Color",
+        "Weather Thunderstorm:Fog Day Color",
+        "Weather Thunderstorm:Fog Sunset Color",
+        "Weather Thunderstorm:Fog Night Color",
+        "Weather Thunderstorm:Ambient Sunrise Color",
+        "Weather Thunderstorm:Ambient Day Color",
+        "Weather Thunderstorm:Ambient Sunset Color",
+        "Weather Thunderstorm:Ambient Night Color",
+        "Weather Thunderstorm:Sun Sunrise Color",
+        "Weather Thunderstorm:Sun Day Color",
+        "Weather Thunderstorm:Sun Sunset Color",
+        "Weather Thunderstorm:Sun Night Color",
+        "Weather Thunderstorm:Sun Disc Sunset Color",
+        "Weather Thunderstorm:Land Fog Day Depth",
+        "Weather Thunderstorm:Land Fog Night Depth",
+        "Weather Thunderstorm:Wind Speed",
+        "Weather Thunderstorm:Cloud Speed",
+        "Weather Thunderstorm:Glare View",
+        "Weather Thunderstorm:Rain Loop Sound ID",
+        "Weather Thunderstorm:Using Precip",
+        "Weather Thunderstorm:Rain Diameter",
+        "Weather Thunderstorm:Rain Height Min",
+        "Weather Thunderstorm:Rain Height Max",
+        "Weather Thunderstorm:Rain Threshold",
+        "Weather Thunderstorm:Max Raindrops",
+        "Weather Thunderstorm:Rain Entrance Speed",
+        "Weather Thunderstorm:Ambient Loop Sound ID",
+        "Weather Thunderstorm:Flash Decrement",
+
+        "Weather Rain:Cloud Texture",
+        "Weather Rain:Clouds Maximum Percent",
+        "Weather Rain:Transition Delta",
+        "Weather Rain:Sky Sunrise Color",
+        "Weather Rain:Sky Day Color",
+        "Weather Rain:Sky Sunset Color",
+        "Weather Rain:Sky Night Color",
+        "Weather Rain:Fog Sunrise Color",
+        "Weather Rain:Fog Day Color",
+        "Weather Rain:Fog Sunset Color",
+        "Weather Rain:Fog Night Color",
+        "Weather Rain:Ambient Sunrise Color",
+        "Weather Rain:Ambient Day Color",
+        "Weather Rain:Ambient Sunset Color",
+        "Weather Rain:Ambient Night Color",
+        "Weather Rain:Sun Sunrise Color",
+        "Weather Rain:Sun Day Color",
+        "Weather Rain:Sun Sunset Color",
+        "Weather Rain:Sun Night Color",
+        "Weather Rain:Sun Disc Sunset Color",
+        "Weather Rain:Land Fog Day Depth",
+        "Weather Rain:Land Fog Night Depth",
+        "Weather Rain:Wind Speed",
+        "Weather Rain:Cloud Speed",
+        "Weather Rain:Glare View",
+        "Weather Rain:Rain Loop Sound ID",
+        "Weather Rain:Using Precip",
+        "Weather Rain:Rain Diameter",
+        "Weather Rain:Rain Height Min",
+        "Weather Rain:Rain Height Max",
+        "Weather Rain:Rain Threshold",
+        "Weather Rain:Rain Entrance Speed",
+        "Weather Rain:Ambient Loop Sound ID",
+        "Weather Rain:Max Raindrops",
+
+        "Weather Overcast:Cloud Texture",
+        "Weather Overcast:Clouds Maximum Percent",
+        "Weather Overcast:Transition Delta",
+        "Weather Overcast:Sky Sunrise Color",
+        "Weather Overcast:Sky Day Color",
+        "Weather Overcast:Sky Sunset Color",
+        "Weather Overcast:Sky Night Color",
+        "Weather Overcast:Fog Sunrise Color",
+        "Weather Overcast:Fog Day Color",
+        "Weather Overcast:Fog Sunset Color",
+        "Weather Overcast:Fog Night Color",
+        "Weather Overcast:Ambient Sunrise Color",
+        "Weather Overcast:Ambient Day Color",
+        "Weather Overcast:Ambient Sunset Color",
+        "Weather Overcast:Ambient Night Color",
+        "Weather Overcast:Sun Sunrise Color",
+        "Weather Overcast:Sun Day Color",
+        "Weather Overcast:Sun Sunset Color",
+        "Weather Overcast:Sun Night Color",
+        "Weather Overcast:Sun Disc Sunset Color",
+        "Weather Overcast:Land Fog Day Depth",
+        "Weather Overcast:Land Fog Night Depth",
+        "Weather Overcast:Wind Speed",
+        "Weather Overcast:Cloud Speed",
+        "Weather Overcast:Glare View",
+        "Weather Overcast:Ambient Loop Sound ID",
+
+        "Weather Ashstorm:Cloud Texture",
+        "Weather Ashstorm:Clouds Maximum Percent",
+        "Weather Ashstorm:Transition Delta",
+        "Weather Ashstorm:Sky Sunrise Color",
+        "Weather Ashstorm:Sky Day Color",
+        "Weather Ashstorm:Sky Sunset Color",
+        "Weather Ashstorm:Sky Night Color",
+        "Weather Ashstorm:Fog Sunrise Color",
+        "Weather Ashstorm:Fog Day Color",
+        "Weather Ashstorm:Fog Sunset Color",
+        "Weather Ashstorm:Fog Night Color",
+        "Weather Ashstorm:Ambient Sunrise Color",
+        "Weather Ashstorm:Ambient Day Color",
+        "Weather Ashstorm:Ambient Sunset Color",
+        "Weather Ashstorm:Ambient Night Color",
+        "Weather Ashstorm:Sun Sunrise Color",
+        "Weather Ashstorm:Sun Day Color",
+        "Weather Ashstorm:Sun Sunset Color",
+        "Weather Ashstorm:Sun Night Color",
+        "Weather Ashstorm:Sun Disc Sunset Color",
+        "Weather Ashstorm:Land Fog Day Depth",
+        "Weather Ashstorm:Land Fog Night Depth",
+        "Weather Ashstorm:Wind Speed",
+        "Weather Ashstorm:Cloud Speed",
+        "Weather Ashstorm:Glare View",
+        "Weather Ashstorm:Ambient Loop Sound ID",
+        "Weather Ashstorm:Storm Threshold",
+
+        "Weather Blight:Cloud Texture",
+        "Weather Blight:Clouds Maximum Percent",
+        "Weather Blight:Transition Delta",
+        "Weather Blight:Sky Sunrise Color",
+        "Weather Blight:Sky Day Color",
+        "Weather Blight:Sky Sunset Color",
+        "Weather Blight:Sky Night Color",
+        "Weather Blight:Fog Sunrise Color",
+        "Weather Blight:Fog Day Color",
+        "Weather Blight:Fog Sunset Color",
+        "Weather Blight:Fog Night Color",
+        "Weather Blight:Ambient Sunrise Color",
+        "Weather Blight:Ambient Day Color",
+        "Weather Blight:Ambient Sunset Color",
+        "Weather Blight:Ambient Night Color",
+        "Weather Blight:Sun Sunrise Color",
+        "Weather Blight:Sun Day Color",
+        "Weather Blight:Sun Sunset Color",
+        "Weather Blight:Sun Night Color",
+        "Weather Blight:Sun Disc Sunset Color",
+        "Weather Blight:Land Fog Day Depth",
+        "Weather Blight:Land Fog Night Depth",
+        "Weather Blight:Wind Speed",
+        "Weather Blight:Cloud Speed",
+        "Weather Blight:Glare View",
+        "Weather Blight:Ambient Loop Sound ID",
+        "Weather Blight:Storm Threshold",
+        "Weather Blight:Disease Chance",
+
+        // for Bloodmoon
+        "Weather Snow:Cloud Texture",
+        "Weather Snow:Clouds Maximum Percent",
+        "Weather Snow:Transition Delta",
+        "Weather Snow:Sky Sunrise Color",
+        "Weather Snow:Sky Day Color",
+        "Weather Snow:Sky Sunset Color",
+        "Weather Snow:Sky Night Color",
+        "Weather Snow:Fog Sunrise Color",
+        "Weather Snow:Fog Day Color",
+        "Weather Snow:Fog Sunset Color",
+        "Weather Snow:Fog Night Color",
+        "Weather Snow:Ambient Sunrise Color",
+        "Weather Snow:Ambient Day Color",
+        "Weather Snow:Ambient Sunset Color",
+        "Weather Snow:Ambient Night Color",
+        "Weather Snow:Sun Sunrise Color",
+        "Weather Snow:Sun Day Color",
+        "Weather Snow:Sun Sunset Color",
+        "Weather Snow:Sun Night Color",
+        "Weather Snow:Sun Disc Sunset Color",
+        "Weather Snow:Land Fog Day Depth",
+        "Weather Snow:Land Fog Night Depth",
+        "Weather Snow:Wind Speed",
+        "Weather Snow:Cloud Speed",
+        "Weather Snow:Glare View",
+        "Weather Snow:Snow Diameter",
+        "Weather Snow:Snow Height Min",
+        "Weather Snow:Snow Height Max",
+        "Weather Snow:Snow Entrance Speed",
+        "Weather Snow:Max Snowflakes",
+        "Weather Snow:Ambient Loop Sound ID",
+        "Weather Snow:Snow Threshold",
+
+        // for Bloodmoon
+        "Weather Blizzard:Cloud Texture",
+        "Weather Blizzard:Clouds Maximum Percent",
+        "Weather Blizzard:Transition Delta",
+        "Weather Blizzard:Sky Sunrise Color",
+        "Weather Blizzard:Sky Day Color",
+        "Weather Blizzard:Sky Sunset Color",
+        "Weather Blizzard:Sky Night Color",
+        "Weather Blizzard:Fog Sunrise Color",
+        "Weather Blizzard:Fog Day Color",
+        "Weather Blizzard:Fog Sunset Color",
+        "Weather Blizzard:Fog Night Color",
+        "Weather Blizzard:Ambient Sunrise Color",
+        "Weather Blizzard:Ambient Day Color",
+        "Weather Blizzard:Ambient Sunset Color",
+        "Weather Blizzard:Ambient Night Color",
+        "Weather Blizzard:Sun Sunrise Color",
+        "Weather Blizzard:Sun Day Color",
+        "Weather Blizzard:Sun Sunset Color",
+        "Weather Blizzard:Sun Night Color",
+        "Weather Blizzard:Sun Disc Sunset Color",
+        "Weather Blizzard:Land Fog Day Depth",
+        "Weather Blizzard:Land Fog Night Depth",
+        "Weather Blizzard:Wind Speed",
+        "Weather Blizzard:Cloud Speed",
+        "Weather Blizzard:Glare View",
+        "Weather Blizzard:Ambient Loop Sound ID",
+        "Weather Blizzard:Storm Threshold",
+
+        // moons
+        "Moons:Secunda Size",
+        "Moons:Secunda Axis Offset",
+        "Moons:Secunda Speed",
+        "Moons:Secunda Daily Increment",
+        "Moons:Secunda Moon Shadow Early Fade Angle",
+        "Moons:Secunda Fade Start Angle",
+        "Moons:Secunda Fade End Angle",
+        "Moons:Secunda Fade In Start",
+        "Moons:Secunda Fade In Finish",
+        "Moons:Secunda Fade Out Start",
+        "Moons:Secunda Fade Out Finish",
+        "Moons:Masser Size",
+        "Moons:Masser Axis Offset",
+        "Moons:Masser Speed",
+        "Moons:Masser Daily Increment",
+        "Moons:Masser Moon Shadow Early Fade Angle",
+        "Moons:Masser Fade Start Angle",
+        "Moons:Masser Fade End Angle",
+        "Moons:Masser Fade In Start",
+        "Moons:Masser Fade In Finish",
+        "Moons:Masser Fade Out Start",
+        "Moons:Masser Fade Out Finish",
+        "Moons:Script Color",
+
         0
     };
 
@@ -48,14 +651,26 @@ MwIniImporter::multistrmap MwIniImporter::loadIniFile(std::string filename) {
     std::string section("");
     MwIniImporter::multistrmap map;
     boost::iostreams::stream<boost::iostreams::file_source>file(filename.c_str());
+    ToUTF8::Utf8Encoder encoder(mEncoding);
 
     std::string line;
     while (std::getline(file, line)) {
 
+        line = encoder.getUtf8(line);
+
+        // unify Unix-style and Windows file ending
+        if (!(line.empty()) && (line[line.length()-1]) == '\r') {
+            line = line.substr(0, line.length()-1);
+        }
+
         if(line[0] == '[') {
-            if(line.length() > 2) {
-                section = line.substr(1, line.length()-3);
+            int pos = line.find(']');
+            if(pos < 2) {
+                std::cout << "Warning: ini file wrongly formatted (" << line << "). Line ignored." << std::endl;
+                continue;
             }
+
+            section = line.substr(1, line.find(']')-1);
             continue;
         }
 
@@ -147,7 +762,7 @@ void MwIniImporter::mergeFallback(multistrmap &cfg, multistrmap &ini) {
                 std::string value(*it);
                 std::replace( value.begin(), value.end(), ' ', '_' );
                 std::replace( value.begin(), value.end(), ':', '_' );
-                value.append(",").append(vc->substr(0,vc->length()-1));
+                value.append(",").append(vc->substr(0,vc->length()));
                 insertMultistrmap(cfg, "fallback", value);
             }
         }
@@ -180,7 +795,7 @@ void MwIniImporter::importGameFiles(multistrmap &cfg, multistrmap &ini) {
 
         for(std::vector<std::string>::iterator entry = it->second.begin(); entry!=it->second.end(); ++entry) {
             std::string filetype(entry->substr(entry->length()-4, 3));
-            std::transform(filetype.begin(), filetype.end(), filetype.begin(), ::tolower);
+            Misc::StringUtils::toLower(filetype);
 
             if(filetype.compare("esm") == 0) {
                 esmFiles.push_back(*entry);
@@ -216,3 +831,8 @@ void MwIniImporter::writeToFile(boost::iostreams::stream<boost::iostreams::file_
         }
     }
 }
+
+void MwIniImporter::setInputEncoding(const ToUTF8::FromType &encoding)
+{
+  mEncoding = encoding;
+}
diff --git a/apps/mwiniimporter/importer.hpp b/apps/mwiniimporter/importer.hpp
index ced332a72..c87fd3e16 100644
--- a/apps/mwiniimporter/importer.hpp
+++ b/apps/mwiniimporter/importer.hpp
@@ -8,12 +8,15 @@
 #include <vector>
 #include <exception>
 
+#include <components/to_utf8/to_utf8.hpp>
+
 class MwIniImporter {
   public:
     typedef std::map<std::string, std::string> strmap;
     typedef std::map<std::string, std::vector<std::string> > multistrmap;
 
     MwIniImporter();
+    void    setInputEncoding(const ToUTF8::FromType& encoding);
     void    setVerbose(bool verbose);
     multistrmap  loadIniFile(std::string filename);
     multistrmap  loadCfgFile(std::string filename);
@@ -25,9 +28,11 @@ class MwIniImporter {
   private:
     void insertMultistrmap(multistrmap &cfg, std::string key, std::string value);
     std::string numberToString(int n);
+    std::string toUTF8(const std::string &str);
     bool mVerbose;
     strmap mMergeMap;
     std::vector<std::string> mMergeFallback;
+    ToUTF8::FromType mEncoding;
 };
 
 
diff --git a/apps/mwiniimporter/main.cpp b/apps/mwiniimporter/main.cpp
index 234d7d57d..e90f26dd2 100644
--- a/apps/mwiniimporter/main.cpp
+++ b/apps/mwiniimporter/main.cpp
@@ -18,6 +18,11 @@ int main(int argc, char *argv[]) {
         ("cfg,c", bpo::value<std::string>(), "openmw.cfg file")
         ("output,o", bpo::value<std::string>()->default_value(""), "openmw.cfg file")
         ("game-files,g", "import esm and esp files")
+        ("encoding,e", bpo::value<std::string>()-> default_value("win1252"),
+            "Character encoding used in OpenMW game messages:\n"
+            "\n\twin1250 - Central and Eastern European such as Polish, Czech, Slovak, Hungarian, Slovene, Bosnian, Croatian, Serbian (Latin script), Romanian and Albanian languages\n"
+            "\n\twin1251 - Cyrillic alphabet such as Russian, Bulgarian, Serbian Cyrillic and other languages\n"
+            "\n\twin1252 - Western European (Latin) alphabet, used by default")
         ;
     p_desc.add("ini", 1).add("cfg", 1);
 
@@ -57,6 +62,10 @@ int main(int argc, char *argv[]) {
     MwIniImporter importer;
     importer.setVerbose(vm.count("verbose"));
 
+    // Font encoding settings
+    std::string encoding(vm["encoding"].as<std::string>());
+    importer.setInputEncoding(ToUTF8::calculateEncoding(encoding));
+
     MwIniImporter::multistrmap ini = importer.loadIniFile(iniFile);
     MwIniImporter::multistrmap cfg = importer.loadCfgFile(cfgFile);
 
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
new file mode 100644
index 000000000..abbc953ca
--- /dev/null
+++ b/apps/opencs/CMakeLists.txt
@@ -0,0 +1,76 @@
+
+set (OPENCS_SRC
+    main.cpp editor.cpp
+
+    model/doc/documentmanager.cpp model/doc/document.cpp
+
+    model/world/universalid.cpp model/world/idcollection.cpp model/world/data.cpp model/world/idtable.cpp
+    model/world/commands.cpp model/world/idtableproxymodel.cpp model/world/record.cpp
+    model/world/columnbase.cpp
+
+    model/tools/tools.cpp model/tools/operation.cpp model/tools/stage.cpp model/tools/verifier.cpp
+    model/tools/mandatoryid.cpp model/tools/reportmodel.cpp
+
+    view/doc/viewmanager.cpp view/doc/view.cpp view/doc/operations.cpp view/doc/operation.cpp view/doc/subviewfactory.cpp
+    view/doc/subview.cpp
+
+    view/world/table.cpp view/world/tablesubview.cpp view/world/subviews.cpp view/world/util.cpp
+    view/world/dialoguesubview.cpp
+
+    view/tools/reportsubview.cpp view/tools/subviews.cpp
+    )
+
+set (OPENCS_HDR
+    editor.hpp
+
+    model/doc/documentmanager.hpp model/doc/document.hpp model/doc/state.hpp
+
+    model/world/universalid.hpp model/world/record.hpp model/world/idcollection.hpp model/world/data.hpp
+    model/world/idtable.hpp model/world/columns.hpp model/world/idtableproxymodel.hpp
+    model/world/commands.hpp model/world/columnbase.hpp
+
+    model/tools/tools.hpp model/tools/operation.hpp model/tools/stage.hpp model/tools/verifier.hpp
+    model/tools/mandatoryid.hpp model/tools/reportmodel.hpp
+
+    view/doc/viewmanager.hpp view/doc/view.hpp view/doc/operations.hpp view/doc/operation.hpp view/doc/subviewfactory.hpp
+    view/doc/subview.hpp view/doc/subviewfactoryimp.hpp
+
+    view/world/table.hpp view/world/tablesubview.hpp view/world/subviews.hpp view/world/util.hpp
+    view/world/dialoguesubview.hpp
+
+    view/tools/reportsubview.hpp view/tools/subviews.hpp
+    )
+
+set (OPENCS_US
+    )
+
+set (OPENCS_RES
+    )
+
+source_group (opencs FILES ${OPENCS_SRC} ${OPENCS_HDR})
+
+if(WIN32)
+    set(QT_USE_QTMAIN TRUE)
+endif(WIN32)
+
+find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtXmlPatterns REQUIRED)
+include(${QT_USE_FILE})
+
+qt4_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
+qt4_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR})
+qt4_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_executable(opencs
+    ${OPENCS_SRC}
+    ${OPENCS_UI_HDR}
+    ${OPENCS_MOC_SRC}
+    ${OPENCS_RES_SRC}
+)
+
+target_link_libraries(opencs
+    ${Boost_LIBRARIES}
+    ${QT_LIBRARIES}
+    components
+)
\ No newline at end of file
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
new file mode 100644
index 000000000..1632ed220
--- /dev/null
+++ b/apps/opencs/editor.cpp
@@ -0,0 +1,49 @@
+
+#include "editor.hpp"
+
+#include <sstream>
+
+#include <QtGui/QApplication>
+
+#include "model/doc/document.hpp"
+#include "model/world/data.hpp"
+
+CS::Editor::Editor() : mViewManager (mDocumentManager), mNewDocumentIndex (0)
+{
+    connect (&mViewManager, SIGNAL (newDocumentRequest ()), this, SLOT (createDocument ()));
+}
+
+void CS::Editor::createDocument()
+{
+    std::ostringstream stream;
+
+    stream << "NewDocument" << (++mNewDocumentIndex);
+
+    CSMDoc::Document *document = mDocumentManager.addDocument (stream.str());
+
+    static const char *sGlobals[] =
+    {
+            "Day", "DaysPassed", "GameHour", "Month", "PCRace", "PCVampire", "PCWerewolf", "PCYear", 0
+    };
+
+    for (int i=0; sGlobals[i]; ++i)
+    {
+        ESM::Global record;
+        record.mId = sGlobals[i];
+        record.mValue = i==0 ? 1 : 0;
+        record.mType = ESM::VT_Float;
+        document->getData().getGlobals().add (record);
+    }
+
+    document->getData().merge(); /// \todo remove once proper ESX loading is implemented
+
+    mViewManager.addView (document);
+}
+
+int CS::Editor::run()
+{
+    /// \todo Instead of creating an empty document, open a small welcome dialogue window with buttons for new/load/recent projects
+    createDocument();
+
+    return QApplication::exec();
+}
\ No newline at end of file
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
new file mode 100644
index 000000000..60f7beaf1
--- /dev/null
+++ b/apps/opencs/editor.hpp
@@ -0,0 +1,37 @@
+#ifndef CS_EDITOR_H
+#define CS_EDITOR_H
+
+#include <QObject>
+
+#include "model/doc/documentmanager.hpp"
+#include "view/doc/viewmanager.hpp"
+
+namespace CS
+{
+    class Editor : public QObject
+    {
+            Q_OBJECT
+
+            int mNewDocumentIndex; ///< \todo remove when the proper new document dialogue is implemented.
+
+            CSMDoc::DocumentManager mDocumentManager;
+            CSVDoc::ViewManager mViewManager;
+
+            // not implemented
+            Editor (const Editor&);
+            Editor& operator= (const Editor&);
+
+        public:
+
+            Editor();
+
+            int run();
+            ///< \return error status
+
+        public slots:
+
+            void createDocument();
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
new file mode 100644
index 000000000..4b1a688c2
--- /dev/null
+++ b/apps/opencs/main.cpp
@@ -0,0 +1,39 @@
+
+#include "editor.hpp"
+
+#include <exception>
+#include <iostream>
+
+#include <QtGui/QApplication>
+
+class Application : public QApplication
+{
+    private:
+
+        bool notify (QObject *receiver, QEvent *event)
+        {
+            try
+            {
+                return QApplication::notify (receiver, event);
+            }
+            catch (const std::exception& exception)
+            {
+                std::cerr << "An exception has been caught: " << exception.what() << std::endl;
+            }
+
+            return false;
+        }
+
+    public:
+
+        Application (int& argc, char *argv[]) : QApplication (argc, argv) {}
+};
+
+int main(int argc, char *argv[])
+{
+    Application mApplication (argc, argv);
+
+    CS::Editor editor;
+
+    return editor.run();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
new file mode 100644
index 000000000..9d2694483
--- /dev/null
+++ b/apps/opencs/model/doc/document.cpp
@@ -0,0 +1,114 @@
+
+#include "document.hpp"
+
+CSMDoc::Document::Document (const std::string& name)
+: mTools (mData)
+{
+    mName = name; ///< \todo replace with ESX list
+
+    connect (&mUndoStack, SIGNAL (cleanChanged (bool)), this, SLOT (modificationStateChanged (bool)));
+
+    connect (&mTools, SIGNAL (progress (int, int, int)), this, SLOT (progress (int, int, int)));
+    connect (&mTools, SIGNAL (done (int)), this, SLOT (operationDone (int)));
+
+     // dummy implementation -> remove when proper save is implemented.
+    mSaveCount = 0;
+    connect (&mSaveTimer, SIGNAL(timeout()), this, SLOT (saving()));
+}
+
+QUndoStack& CSMDoc::Document::getUndoStack()
+{
+    return mUndoStack;
+}
+
+int CSMDoc::Document::getState() const
+{
+    int state = 0;
+
+    if (!mUndoStack.isClean())
+        state |= State_Modified;
+
+    if (mSaveCount)
+        state |= State_Locked | State_Saving | State_Operation;
+
+    if (int operations = mTools.getRunningOperations())
+        state |= State_Locked | State_Operation | operations;
+
+    return state;
+}
+
+const std::string& CSMDoc::Document::getName() const
+{
+    return mName;
+}
+
+void CSMDoc::Document::save()
+{
+    mSaveCount = 1;
+    mSaveTimer.start (500);
+    emit stateChanged (getState(), this);
+    emit progress (1, 16, State_Saving, 1, this);
+}
+
+CSMWorld::UniversalId CSMDoc::Document::verify()
+{
+    CSMWorld::UniversalId id = mTools.runVerifier();
+    emit stateChanged (getState(), this);
+    return id;
+}
+
+void CSMDoc::Document::abortOperation (int type)
+{
+    mTools.abortOperation (type);
+
+    if (type==State_Saving)
+    {
+        mSaveTimer.stop();
+        emit stateChanged (getState(), this);
+    }
+}
+
+void CSMDoc::Document::modificationStateChanged (bool clean)
+{
+    emit stateChanged (getState(), this);
+}
+
+void CSMDoc::Document::operationDone (int type)
+{
+    emit stateChanged (getState(), this);
+}
+
+void CSMDoc::Document::saving()
+{
+    ++mSaveCount;
+
+    emit progress (mSaveCount, 16, State_Saving, 1, this);
+
+    if (mSaveCount>15)
+    {
+            mSaveCount = 0;
+            mSaveTimer.stop();
+            mUndoStack.setClean();
+            emit stateChanged (getState(), this);
+    }
+}
+
+const CSMWorld::Data& CSMDoc::Document::getData() const
+{
+    return mData;
+}
+
+CSMWorld::Data& CSMDoc::Document::getData()
+{
+    return mData;
+}
+
+CSMTools::ReportModel *CSMDoc::Document::getReport (const CSMWorld::UniversalId& id)
+{
+    return mTools.getReport (id);
+}
+
+void CSMDoc::Document::progress (int current, int max, int type)
+{
+    emit progress (current, max, type, 1, this);
+}
\ No newline at end of file
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
new file mode 100644
index 000000000..43e8bba37
--- /dev/null
+++ b/apps/opencs/model/doc/document.hpp
@@ -0,0 +1,87 @@
+#ifndef CSM_DOC_DOCUMENT_H
+#define CSM_DOC_DOCUMENT_H
+
+#include <string>
+
+#include <QUndoStack>
+#include <QObject>
+#include <QTimer>
+
+#include "../world/data.hpp"
+
+#include "../tools/tools.hpp"
+
+#include "state.hpp"
+
+class QAbstractItemModel;
+
+namespace CSMDoc
+{
+    class Document : public QObject
+    {
+            Q_OBJECT
+
+        private:
+
+            std::string mName; ///< \todo replace name with ESX list
+            CSMWorld::Data mData;
+            CSMTools::Tools mTools;
+
+            // It is important that the undo stack is declared last, because on desctruction it fires a signal, that is connected to a slot, that is
+            // using other member variables.  Unfortunately this connection is cut only in the QObject destructor, which is way too late.
+            QUndoStack mUndoStack;
+
+            int mSaveCount; ///< dummy implementation -> remove when proper save is implemented.
+            QTimer mSaveTimer; ///< dummy implementation -> remove when proper save is implemented.
+
+            // not implemented
+            Document (const Document&);
+            Document& operator= (const Document&);
+
+        public:
+
+            Document (const std::string& name);
+            ///< \todo replace name with ESX list
+
+            QUndoStack& getUndoStack();
+
+            int getState() const;
+
+            const std::string& getName() const;
+            ///< \todo replace with ESX list
+
+            void save();
+
+            CSMWorld::UniversalId verify();
+
+            void abortOperation (int type);
+
+            const CSMWorld::Data& getData() const;
+
+            CSMWorld::Data& getData();
+
+            CSMTools::ReportModel *getReport (const CSMWorld::UniversalId& id);
+            ///< The ownership of the returned report is not transferred.
+
+        signals:
+
+            void stateChanged (int state, CSMDoc::Document *document);
+
+            void progress (int current, int max, int type, int threads, CSMDoc::Document *document);
+
+        private slots:
+
+            void modificationStateChanged (bool clean);
+
+            void operationDone (int type);
+
+            void saving();
+            ///< dummy implementation -> remove when proper save is implemented.
+
+        public slots:
+
+            void progress (int current, int max, int type);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
new file mode 100644
index 000000000..8ae2764f2
--- /dev/null
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -0,0 +1,37 @@
+
+#include "documentmanager.hpp"
+
+#include <algorithm>
+#include <stdexcept>
+
+#include "document.hpp"
+
+CSMDoc::DocumentManager::DocumentManager() {}
+
+CSMDoc::DocumentManager::~DocumentManager()
+{
+    for (std::vector<Document *>::iterator iter (mDocuments.begin()); iter!=mDocuments.end(); ++iter)
+        delete *iter;
+}
+
+CSMDoc::Document *CSMDoc::DocumentManager::addDocument (const std::string& name)
+{
+    Document *document = new Document (name);
+
+    mDocuments.push_back (document);
+
+    return document;
+}
+
+bool CSMDoc::DocumentManager::removeDocument (Document *document)
+{
+    std::vector<Document *>::iterator iter = std::find (mDocuments.begin(), mDocuments.end(), document);
+
+    if (iter==mDocuments.end())
+            throw std::runtime_error ("removing invalid document");
+
+    mDocuments.erase (iter);
+    delete document;
+
+    return mDocuments.empty();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/doc/documentmanager.hpp b/apps/opencs/model/doc/documentmanager.hpp
new file mode 100644
index 000000000..730c7fae1
--- /dev/null
+++ b/apps/opencs/model/doc/documentmanager.hpp
@@ -0,0 +1,32 @@
+#ifndef CSM_DOC_DOCUMENTMGR_H
+#define CSM_DOC_DOCUMENTMGR_H
+
+#include <vector>
+#include <string>
+
+namespace CSMDoc
+{
+    class Document;
+
+    class DocumentManager
+    {
+            std::vector<Document *> mDocuments;
+
+            DocumentManager (const DocumentManager&);
+            DocumentManager& operator= (const DocumentManager&);
+
+        public:
+
+            DocumentManager();
+
+            ~DocumentManager();
+
+            Document *addDocument (const std::string& name);
+            ///< The ownership of the returned document is not transferred to the caller.
+
+            bool removeDocument (Document *document);
+            ///< \return last document removed?
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/doc/state.hpp b/apps/opencs/model/doc/state.hpp
new file mode 100644
index 000000000..04e6fae89
--- /dev/null
+++ b/apps/opencs/model/doc/state.hpp
@@ -0,0 +1,19 @@
+#ifndef CSM_DOC_STATE_H
+#define CSM_DOC_STATE_H
+
+namespace CSMDoc
+{
+        enum State
+        {
+                State_Modified = 1,
+                State_Locked = 2,
+                State_Operation = 4,
+
+                State_Saving = 8,
+                State_Verifying = 16,
+                State_Compiling = 32, // not implemented yet
+                State_Searching = 64 // not implemented yet
+        };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/mandatoryid.cpp b/apps/opencs/model/tools/mandatoryid.cpp
new file mode 100644
index 000000000..f9f2ca378
--- /dev/null
+++ b/apps/opencs/model/tools/mandatoryid.cpp
@@ -0,0 +1,21 @@
+
+#include "mandatoryid.hpp"
+
+#include "../world/idcollection.hpp"
+
+CSMTools::MandatoryIdStage::MandatoryIdStage (const CSMWorld::IdCollectionBase& idCollection,
+    const CSMWorld::UniversalId& collectionId, const std::vector<std::string>& ids)
+: mIdCollection (idCollection), mCollectionId (collectionId), mIds (ids)
+{}
+
+int CSMTools::MandatoryIdStage::setup()
+{
+    return mIds.size();
+}
+
+void CSMTools::MandatoryIdStage::perform (int stage, std::vector<std::string>& messages)
+{
+    if (mIdCollection.searchId (mIds.at (stage))==-1 ||
+        mIdCollection.getRecord (mIds.at (stage)).isDeleted())
+        messages.push_back (mCollectionId.toString() + "|Missing mandatory record: " + mIds.at (stage));
+}
\ No newline at end of file
diff --git a/apps/opencs/model/tools/mandatoryid.hpp b/apps/opencs/model/tools/mandatoryid.hpp
new file mode 100644
index 000000000..14fcec204
--- /dev/null
+++ b/apps/opencs/model/tools/mandatoryid.hpp
@@ -0,0 +1,38 @@
+#ifndef CSM_TOOLS_MANDATORYID_H
+#define CSM_TOOLS_MANDATORYID_H
+
+#include <string>
+#include <vector>
+
+#include "../world/universalid.hpp"
+
+#include "stage.hpp"
+
+namespace CSMWorld
+{
+    class IdCollectionBase;
+}
+
+namespace CSMTools
+{
+    /// \brief Verify stage: make sure that records with specific IDs exist.
+    class MandatoryIdStage : public Stage
+    {
+            const CSMWorld::IdCollectionBase& mIdCollection;
+            CSMWorld::UniversalId mCollectionId;
+            std::vector<std::string> mIds;
+
+        public:
+
+            MandatoryIdStage (const CSMWorld::IdCollectionBase& idCollection, const CSMWorld::UniversalId& collectionId,
+                const std::vector<std::string>& ids);
+
+            virtual int setup();
+            ///< \return number of steps
+
+            virtual void perform (int stage, std::vector<std::string>& messages);
+            ///< Messages resulting from this tage will be appended to \a messages.
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/operation.cpp b/apps/opencs/model/tools/operation.cpp
new file mode 100644
index 000000000..71761cdae
--- /dev/null
+++ b/apps/opencs/model/tools/operation.cpp
@@ -0,0 +1,84 @@
+
+#include "operation.hpp"
+
+#include <string>
+#include <vector>
+
+#include <QTimer>
+
+#include "../doc/state.hpp"
+
+#include "stage.hpp"
+
+void CSMTools::Operation::prepareStages()
+{
+    mCurrentStage = mStages.begin();
+    mCurrentStep = 0;
+    mCurrentStepTotal = 0;
+    mTotalSteps = 0;
+
+    for (std::vector<std::pair<Stage *, int> >::iterator iter (mStages.begin()); iter!=mStages.end(); ++iter)
+    {
+        iter->second = iter->first->setup();
+        mTotalSteps += iter->second;
+    }
+}
+
+CSMTools::Operation::Operation (int type) : mType (type) {}
+
+CSMTools::Operation::~Operation()
+{
+    for (std::vector<std::pair<Stage *, int> >::iterator iter (mStages.begin()); iter!=mStages.end(); ++iter)
+        delete iter->first;
+}
+
+void CSMTools::Operation::run()
+{
+    prepareStages();
+
+    QTimer timer;
+
+    timer.connect (&timer, SIGNAL (timeout()), this, SLOT (verify()));
+
+    timer.start (0);
+
+    exec();
+}
+
+void CSMTools::Operation::appendStage (Stage *stage)
+{
+    mStages.push_back (std::make_pair (stage, 0));
+}
+
+void CSMTools::Operation::abort()
+{
+    exit();
+}
+
+void CSMTools::Operation::verify()
+{
+    std::vector<std::string> messages;
+
+    while (mCurrentStage!=mStages.end())
+    {
+        if (mCurrentStep>=mCurrentStage->second)
+        {
+            mCurrentStep = 0;
+            ++mCurrentStage;
+        }
+        else
+        {
+            mCurrentStage->first->perform (mCurrentStep++, messages);
+            ++mCurrentStepTotal;
+            break;
+        }
+    }
+
+    emit progress (mCurrentStepTotal, mTotalSteps ? mTotalSteps : 1, mType);
+
+    for (std::vector<std::string>::const_iterator iter (messages.begin()); iter!=messages.end(); ++iter)
+        emit reportMessage (iter->c_str(), mType);
+
+    if (mCurrentStage==mStages.end())
+        exit();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/tools/operation.hpp b/apps/opencs/model/tools/operation.hpp
new file mode 100644
index 000000000..4731c58fa
--- /dev/null
+++ b/apps/opencs/model/tools/operation.hpp
@@ -0,0 +1,54 @@
+#ifndef CSM_TOOLS_OPERATION_H
+#define CSM_TOOLS_OPERATION_H
+
+#include <vector>
+
+#include <QThread>
+
+namespace CSMTools
+{
+    class Stage;
+
+    class Operation : public QThread
+    {
+            Q_OBJECT
+
+            int mType;
+            std::vector<std::pair<Stage *, int> > mStages; // stage, number of steps
+            std::vector<std::pair<Stage *, int> >::iterator mCurrentStage;
+            int mCurrentStep;
+            int mCurrentStepTotal;
+            int mTotalSteps;
+
+            void prepareStages();
+
+        public:
+
+            Operation (int type);
+
+            virtual ~Operation();
+
+            virtual void run();
+
+            void appendStage (Stage *stage);
+            ///< The ownership of \a stage is transferred to *this.
+            ///
+            /// \attention Do no call this function while this Operation is running.
+
+        signals:
+
+            void progress (int current, int max, int type);
+
+            void reportMessage (const QString& message, int type);
+
+        public slots:
+
+            void abort();
+
+        private slots:
+
+            void verify();
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
new file mode 100644
index 000000000..b12531875
--- /dev/null
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -0,0 +1,71 @@
+
+#include "reportmodel.hpp"
+
+#include <stdexcept>
+
+int CSMTools::ReportModel::rowCount (const QModelIndex & parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return mRows.size();
+}
+
+int CSMTools::ReportModel::columnCount (const QModelIndex & parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return 2;
+}
+
+QVariant CSMTools::ReportModel::data (const QModelIndex & index, int role) const
+{
+    if (role!=Qt::DisplayRole)
+        return QVariant();
+
+    if (index.column()==0)
+        return static_cast<int> (mRows.at (index.row()).first.getType());
+    else
+        return mRows.at (index.row()).second.c_str();
+}
+
+QVariant CSMTools::ReportModel::headerData (int section, Qt::Orientation orientation, int role) const
+{
+    if (role!=Qt::DisplayRole)
+        return QVariant();
+
+    if (orientation==Qt::Vertical)
+        return QVariant();
+
+    return tr (section==0 ? "Type" : "Description");
+}
+
+bool CSMTools::ReportModel::removeRows (int row, int count, const QModelIndex& parent)
+{
+    if (parent.isValid())
+        return false;
+
+    mRows.erase (mRows.begin()+row, mRows.begin()+row+count);
+
+    return true;
+}
+
+void CSMTools::ReportModel::add (const std::string& row)
+{
+    std::string::size_type index = row.find ('|');
+
+    if (index==std::string::npos)
+        throw std::logic_error ("invalid report message");
+
+    beginInsertRows (QModelIndex(), mRows.size(), mRows.size());
+
+    mRows.push_back (std::make_pair (row.substr (0, index), row.substr (index+1)));
+
+    endInsertRows();
+}
+
+const CSMWorld::UniversalId& CSMTools::ReportModel::getUniversalId (int row) const
+{
+    return mRows.at (row).first;
+}
\ No newline at end of file
diff --git a/apps/opencs/model/tools/reportmodel.hpp b/apps/opencs/model/tools/reportmodel.hpp
new file mode 100644
index 000000000..55c25d907
--- /dev/null
+++ b/apps/opencs/model/tools/reportmodel.hpp
@@ -0,0 +1,37 @@
+#ifndef CSM_TOOLS_REPORTMODEL_H
+#define CSM_TOOLS_REPORTMODEL_H
+
+#include <vector>
+#include <string>
+
+#include <QAbstractTableModel>
+
+#include "../world/universalid.hpp"
+
+namespace CSMTools
+{
+    class ReportModel : public QAbstractTableModel
+    {
+            Q_OBJECT
+
+            std::vector<std::pair<CSMWorld::UniversalId, std::string> > mRows;
+
+        public:
+
+            virtual int rowCount (const QModelIndex & parent = QModelIndex()) const;
+
+            virtual int columnCount (const QModelIndex & parent = QModelIndex()) const;
+
+            virtual QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const;
+
+            virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+            virtual bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex());
+
+            void add (const std::string& row);
+
+            const CSMWorld::UniversalId& getUniversalId (int row) const;
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/stage.cpp b/apps/opencs/model/tools/stage.cpp
new file mode 100644
index 000000000..6f4567e57
--- /dev/null
+++ b/apps/opencs/model/tools/stage.cpp
@@ -0,0 +1,4 @@
+
+#include "stage.hpp"
+
+CSMTools::Stage::~Stage() {}
\ No newline at end of file
diff --git a/apps/opencs/model/tools/stage.hpp b/apps/opencs/model/tools/stage.hpp
new file mode 100644
index 000000000..3020936f3
--- /dev/null
+++ b/apps/opencs/model/tools/stage.hpp
@@ -0,0 +1,24 @@
+#ifndef CSM_TOOLS_STAGE_H
+#define CSM_TOOLS_STAGE_H
+
+#include <vector>
+#include <string>
+
+namespace CSMTools
+{
+    class Stage
+    {
+        public:
+
+            virtual ~Stage();
+
+            virtual int setup() = 0;
+            ///< \return number of steps
+
+            virtual void perform (int stage, std::vector<std::string>& messages) = 0;
+            ///< Messages resulting from this tage will be appended to \a messages.
+    };
+}
+
+#endif
+
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
new file mode 100644
index 000000000..8dd1c0fe6
--- /dev/null
+++ b/apps/opencs/model/tools/tools.cpp
@@ -0,0 +1,123 @@
+
+#include "tools.hpp"
+
+#include <QThreadPool>
+
+#include "verifier.hpp"
+
+#include "../doc/state.hpp"
+
+#include "../world/data.hpp"
+#include "../world/universalid.hpp"
+
+#include "reportmodel.hpp"
+#include "mandatoryid.hpp"
+
+CSMTools::Operation *CSMTools::Tools::get (int type)
+{
+    switch (type)
+    {
+        case CSMDoc::State_Verifying: return mVerifier;
+    }
+
+    return 0;
+}
+
+const CSMTools::Operation *CSMTools::Tools::get (int type) const
+{
+    return const_cast<Tools *> (this)->get (type);
+}
+
+CSMTools::Verifier *CSMTools::Tools::getVerifier()
+{
+    if (!mVerifier)
+    {
+        mVerifier = new Verifier;
+
+        connect (mVerifier, SIGNAL (progress (int, int, int)), this, SIGNAL (progress (int, int, int)));
+        connect (mVerifier, SIGNAL (finished()), this, SLOT (verifierDone()));
+        connect (mVerifier, SIGNAL (reportMessage (const QString&, int)),
+            this, SLOT (verifierMessage (const QString&, int)));
+
+        std::vector<std::string> mandatoryIds; //  I want C++11, damn it!
+        mandatoryIds.push_back ("Day");
+        mandatoryIds.push_back ("DaysPassed");
+        mandatoryIds.push_back ("GameHour");
+        mandatoryIds.push_back ("Month");
+        mandatoryIds.push_back ("PCRace");
+        mandatoryIds.push_back ("PCVampire");
+        mandatoryIds.push_back ("PCWerewolf");
+        mandatoryIds.push_back ("PCYear");
+
+        mVerifier->appendStage (new MandatoryIdStage (mData.getGlobals(),
+            CSMWorld::UniversalId (CSMWorld::UniversalId::Type_Globals), mandatoryIds));
+    }
+
+    return mVerifier;
+}
+
+CSMTools::Tools::Tools (CSMWorld::Data& data) : mData (data), mVerifier (0), mNextReportNumber (0)
+{
+    for (std::map<int, ReportModel *>::iterator iter (mReports.begin()); iter!=mReports.end(); ++iter)
+        delete iter->second;
+}
+
+CSMTools::Tools::~Tools()
+{
+    delete mVerifier;
+}
+
+CSMWorld::UniversalId CSMTools::Tools::runVerifier()
+{
+    mReports.insert (std::make_pair (mNextReportNumber++, new ReportModel));
+    mActiveReports[CSMDoc::State_Verifying] = mNextReportNumber-1;
+
+    getVerifier()->start();
+
+    return CSMWorld::UniversalId (CSMWorld::UniversalId::Type_VerificationResults, mNextReportNumber-1);
+}
+
+void CSMTools::Tools::abortOperation (int type)
+{
+    if (Operation *operation = get (type))
+        operation->abort();
+}
+
+int CSMTools::Tools::getRunningOperations() const
+{
+    static const int sOperations[] =
+    {
+       CSMDoc::State_Verifying,
+        -1
+    };
+
+    int result = 0;
+
+    for (int i=0; sOperations[i]!=-1; ++i)
+        if (const Operation *operation = get (sOperations[i]))
+            if (operation->isRunning())
+                result |= sOperations[i];
+
+    return result;
+}
+
+CSMTools::ReportModel *CSMTools::Tools::getReport (const CSMWorld::UniversalId& id)
+{
+    if (id.getType()!=CSMWorld::UniversalId::Type_VerificationResults)
+        throw std::logic_error ("invalid request for report model: " + id.toString());
+
+    return mReports.at (id.getIndex());
+}
+
+void CSMTools::Tools::verifierDone()
+{
+    emit done (CSMDoc::State_Verifying);
+}
+
+void CSMTools::Tools::verifierMessage (const QString& message, int type)
+{
+    std::map<int, int>::iterator iter = mActiveReports.find (type);
+
+    if (iter!=mActiveReports.end())
+        mReports[iter->second]->add (message.toStdString());
+}
\ No newline at end of file
diff --git a/apps/opencs/model/tools/tools.hpp b/apps/opencs/model/tools/tools.hpp
new file mode 100644
index 000000000..652345c6d
--- /dev/null
+++ b/apps/opencs/model/tools/tools.hpp
@@ -0,0 +1,73 @@
+#ifndef CSM_TOOLS_TOOLS_H
+#define CSM_TOOLS_TOOLS_H
+
+#include <QObject>
+
+#include <map>
+
+namespace CSMWorld
+{
+    class Data;
+    class UniversalId;
+}
+
+namespace CSMTools
+{
+    class Verifier;
+    class Operation;
+    class ReportModel;
+
+    class Tools : public QObject
+    {
+            Q_OBJECT
+
+            CSMWorld::Data& mData;
+            Verifier *mVerifier;
+            std::map<int, ReportModel *> mReports;
+            int mNextReportNumber;
+            std::map<int, int> mActiveReports; // type, report number
+
+            // not implemented
+            Tools (const Tools&);
+            Tools& operator= (const Tools&);
+
+            Verifier *getVerifier();
+
+            Operation *get (int type);
+            ///< Returns a 0-pointer, if operation hasn't been used yet.
+
+            const Operation *get (int type) const;
+            ///< Returns a 0-pointer, if operation hasn't been used yet.
+
+        public:
+
+            Tools (CSMWorld::Data& data);
+
+            virtual ~Tools();
+
+            CSMWorld::UniversalId runVerifier();
+            ///< \return ID of the report for this verification run
+
+            void abortOperation (int type);
+            ///< \attention The operation is not aborted immediately.
+
+            int getRunningOperations() const;
+
+            ReportModel *getReport (const CSMWorld::UniversalId& id);
+            ///< The ownership of the returned report is not transferred.
+
+        private slots:
+
+            void verifierDone();
+
+            void verifierMessage (const QString& message, int type);
+
+        signals:
+
+            void progress (int current, int max, int type);
+
+            void done (int type);
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/verifier.cpp b/apps/opencs/model/tools/verifier.cpp
new file mode 100644
index 000000000..9c00d4ea7
--- /dev/null
+++ b/apps/opencs/model/tools/verifier.cpp
@@ -0,0 +1,7 @@
+
+#include "verifier.hpp"
+
+#include "../doc/state.hpp"
+
+CSMTools::Verifier::Verifier() : Operation (CSMDoc::State_Verifying)
+{}
diff --git a/apps/opencs/model/tools/verifier.hpp b/apps/opencs/model/tools/verifier.hpp
new file mode 100644
index 000000000..054f87169
--- /dev/null
+++ b/apps/opencs/model/tools/verifier.hpp
@@ -0,0 +1,17 @@
+#ifndef CSM_TOOLS_VERIFIER_H
+#define CSM_TOOLS_VERIFIER_H
+
+#include "operation.hpp"
+
+namespace CSMTools
+{
+    class Verifier : public Operation
+    {
+        public:
+
+            Verifier();
+
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
new file mode 100644
index 000000000..134c582c4
--- /dev/null
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -0,0 +1,13 @@
+
+#include "columnbase.hpp"
+
+CSMWorld::ColumnBase::ColumnBase (const std::string& title, Display displayType, int flags)
+: mTitle (title), mDisplayType (displayType), mFlags (flags)
+{}
+
+CSMWorld::ColumnBase::~ColumnBase() {}
+
+bool CSMWorld::ColumnBase::isUserEditable() const
+{
+    return isEditable();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
new file mode 100644
index 000000000..38b73ee3f
--- /dev/null
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -0,0 +1,67 @@
+#ifndef CSM_WOLRD_COLUMNBASE_H
+#define CSM_WOLRD_COLUMNBASE_H
+
+#include <string>
+
+#include <Qt>
+#include <QVariant>
+
+#include "record.hpp"
+
+namespace CSMWorld
+{
+    struct ColumnBase
+    {
+        enum Roles
+        {
+            Role_Flags = Qt::UserRole,
+            Role_Display = Qt::UserRole+1
+        };
+
+        enum Flags
+        {
+            Flag_Table = 1, // column should be displayed in table view
+            Flag_Dialogue = 2 // column should be displayed in dialogue view
+        };
+
+        enum Display
+        {
+            Display_String,
+            Display_Integer,
+            Display_Float
+        };
+
+        std::string mTitle;
+        int mFlags;
+        Display mDisplayType;
+
+        ColumnBase (const std::string& title, Display displayType, int flag);
+
+        virtual ~ColumnBase();
+
+        virtual bool isEditable() const = 0;
+
+        virtual bool isUserEditable() const;
+        ///< Can this column be edited directly by the user?
+
+    };
+
+    template<typename ESXRecordT>
+    struct Column : public ColumnBase
+    {
+        std::string mTitle;
+        int mFlags;
+
+        Column (const std::string& title, Display displayType, int flags = Flag_Table | Flag_Dialogue)
+        : ColumnBase (title, displayType, flags) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const = 0;
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            throw std::logic_error ("Column " + mTitle + " is not editable");
+        }
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
new file mode 100644
index 000000000..1e2de9265
--- /dev/null
+++ b/apps/opencs/model/world/columns.hpp
@@ -0,0 +1,96 @@
+#ifndef CSM_WOLRD_COLUMNS_H
+#define CSM_WOLRD_COLUMNS_H
+
+#include "columnbase.hpp"
+
+namespace CSMWorld
+{
+    template<typename ESXRecordT>
+    struct FloatValueColumn : public Column<ESXRecordT>
+    {
+        FloatValueColumn() : Column<ESXRecordT> ("Value", ColumnBase::Display_Float) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return record.get().mValue;
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT base = record.getBase();
+            base.mValue = data.toFloat();
+            record.setModified (base);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
+
+    template<typename ESXRecordT>
+    struct StringIdColumn : public Column<ESXRecordT>
+    {
+        StringIdColumn() : Column<ESXRecordT> ("ID", ColumnBase::Display_String) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return record.get().mId.c_str();
+        }
+
+        virtual bool isEditable() const
+        {
+            return false;
+        }
+    };
+
+    template<typename ESXRecordT>
+    struct RecordStateColumn : public Column<ESXRecordT>
+    {
+        RecordStateColumn() : Column<ESXRecordT> ("*", ColumnBase::Display_Integer) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            if (record.mState==Record<ESXRecordT>::State_Erased)
+                return static_cast<int> (Record<ESXRecordT>::State_Deleted);
+
+            return static_cast<int> (record.mState);
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            record.mState = static_cast<RecordBase::State> (data.toInt());
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+
+        virtual bool isUserEditable() const
+        {
+            return false;
+        }
+    };
+
+    template<typename ESXRecordT>
+    struct FixedRecordTypeColumn : public Column<ESXRecordT>
+    {
+        int mType;
+
+        FixedRecordTypeColumn (int type)
+        : Column<ESXRecordT> ("Type", ColumnBase::Display_Integer, 0), mType (type) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return mType;
+        }
+
+        virtual bool isEditable() const
+        {
+            return false;
+        }
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
new file mode 100644
index 000000000..e22ecf992
--- /dev/null
+++ b/apps/opencs/model/world/commands.cpp
@@ -0,0 +1,108 @@
+
+#include "commands.hpp"
+
+#include <QAbstractTableModel>
+
+#include "idtableproxymodel.hpp"
+#include "idtable.hpp"
+
+CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelIndex& index,
+    const QVariant& new_, QUndoCommand *parent)
+: QUndoCommand (parent), mModel (model), mIndex (index), mNew (new_)
+{
+    mOld = mModel.data (mIndex, Qt::EditRole);
+
+    setText ("Modify " + mModel.headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+}
+
+void CSMWorld::ModifyCommand::redo()
+{
+    mModel.setData (mIndex, mNew);
+}
+
+void CSMWorld::ModifyCommand::undo()
+{
+    mModel.setData (mIndex, mOld);
+}
+
+CSMWorld::CreateCommand::CreateCommand (IdTableProxyModel& model, const std::string& id, QUndoCommand *parent)
+: QUndoCommand (parent), mModel (model), mId (id)
+{
+    setText (("Create record " + id).c_str());
+}
+
+void CSMWorld::CreateCommand::redo()
+{
+    mModel.addRecord (mId);
+}
+
+void CSMWorld::CreateCommand::undo()
+{
+    mModel.removeRow (mModel.getModelIndex (mId, 0).row());
+}
+
+CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent)
+: QUndoCommand (parent), mModel (model), mId (id), mOld (0)
+{
+    setText (("Revert record " + id).c_str());
+
+    mOld = model.getRecord (id).clone();
+}
+
+CSMWorld::RevertCommand::~RevertCommand()
+{
+    delete mOld;
+}
+
+void CSMWorld::RevertCommand::redo()
+{
+    QModelIndex index = mModel.getModelIndex (mId, 1);
+    RecordBase::State state = static_cast<RecordBase::State> (mModel.data (index).toInt());
+
+    if (state==RecordBase::State_ModifiedOnly)
+    {
+        mModel.removeRows (index.row(), 1);
+    }
+    else
+    {
+        mModel.setData (index, static_cast<int> (RecordBase::State_BaseOnly));
+    }
+}
+
+void CSMWorld::RevertCommand::undo()
+{
+    mModel.setRecord (*mOld);
+}
+
+CSMWorld::DeleteCommand::DeleteCommand (IdTable& model, const std::string& id, QUndoCommand *parent)
+: QUndoCommand (parent), mModel (model), mId (id), mOld (0)
+{
+    setText (("Delete record " + id).c_str());
+
+    mOld = model.getRecord (id).clone();
+}
+
+CSMWorld::DeleteCommand::~DeleteCommand()
+{
+    delete mOld;
+}
+
+void CSMWorld::DeleteCommand::redo()
+{
+    QModelIndex index = mModel.getModelIndex (mId, 1);
+    RecordBase::State state = static_cast<RecordBase::State> (mModel.data (index).toInt());
+
+    if (state==RecordBase::State_ModifiedOnly)
+    {
+        mModel.removeRows (index.row(), 1);
+    }
+    else
+    {
+        mModel.setData (index, static_cast<int> (RecordBase::State_Deleted));
+    }
+}
+
+void CSMWorld::DeleteCommand::undo()
+{
+    mModel.setRecord (*mOld);
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
new file mode 100644
index 000000000..af419215d
--- /dev/null
+++ b/apps/opencs/model/world/commands.hpp
@@ -0,0 +1,95 @@
+#ifndef CSM_WOLRD_COMMANDS_H
+#define CSM_WOLRD_COMMANDS_H
+
+#include "record.hpp"
+
+#include <string>
+
+#include <QVariant>
+#include <QUndoCommand>
+#include <QModelIndex>
+
+class QModelIndex;
+class QAbstractItemModel;
+
+namespace CSMWorld
+{
+    class IdTableProxyModel;
+    class IdTable;
+    class RecordBase;
+
+    class ModifyCommand : public QUndoCommand
+    {
+            QAbstractItemModel& mModel;
+            QModelIndex mIndex;
+            QVariant mNew;
+            QVariant mOld;
+
+        public:
+
+            ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
+                QUndoCommand *parent = 0);
+
+            virtual void redo();
+
+            virtual void undo();
+    };
+
+    class CreateCommand : public QUndoCommand
+    {
+            IdTableProxyModel& mModel;
+            std::string mId;
+
+        public:
+
+            CreateCommand (IdTableProxyModel& model, const std::string& id, QUndoCommand *parent = 0);
+
+            virtual void redo();
+
+            virtual void undo();
+    };
+
+    class RevertCommand : public QUndoCommand
+    {
+            IdTable& mModel;
+            std::string mId;
+            RecordBase *mOld;
+
+            // not implemented
+            RevertCommand (const RevertCommand&);
+            RevertCommand& operator= (const RevertCommand&);
+
+        public:
+
+            RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+
+            virtual ~RevertCommand();
+
+            virtual void redo();
+
+            virtual void undo();
+    };
+
+    class DeleteCommand : public QUndoCommand
+    {
+            IdTable& mModel;
+            std::string mId;
+            RecordBase *mOld;
+
+            // not implemented
+            DeleteCommand (const DeleteCommand&);
+            DeleteCommand& operator= (const DeleteCommand&);
+
+        public:
+
+            DeleteCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+
+            virtual ~DeleteCommand();
+
+            virtual void redo();
+
+            virtual void undo();
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
new file mode 100644
index 000000000..a3522503e
--- /dev/null
+++ b/apps/opencs/model/world/data.cpp
@@ -0,0 +1,62 @@
+
+#include "data.hpp"
+
+#include <stdexcept>
+
+#include <QAbstractTableModel>
+
+#include <components/esm/loadglob.hpp>
+
+#include "idtable.hpp"
+#include "columns.hpp"
+
+void CSMWorld::Data::addModel (QAbstractTableModel *model, UniversalId::Type type1,
+    UniversalId::Type type2)
+{
+    mModels.push_back (model);
+    mModelIndex.insert (std::make_pair (type1, model));
+
+    if (type2!=UniversalId::Type_None)
+        mModelIndex.insert (std::make_pair (type2, model));
+}
+
+CSMWorld::Data::Data()
+{
+    mGlobals.addColumn (new StringIdColumn<ESM::Global>);
+    mGlobals.addColumn (new RecordStateColumn<ESM::Global>);
+    mGlobals.addColumn (new FixedRecordTypeColumn<ESM::Global> (UniversalId::Type_Global));
+    mGlobals.addColumn (new FloatValueColumn<ESM::Global>);
+
+    addModel (new IdTable (&mGlobals), UniversalId::Type_Globals, UniversalId::Type_Global);
+}
+
+CSMWorld::Data::~Data()
+{
+    for (std::vector<QAbstractTableModel *>::iterator iter (mModels.begin()); iter!=mModels.end(); ++iter)
+        delete *iter;
+}
+
+const CSMWorld::IdCollection<ESM::Global>& CSMWorld::Data::getGlobals() const
+{
+    return mGlobals;
+}
+
+CSMWorld::IdCollection<ESM::Global>& CSMWorld::Data::getGlobals()
+{
+    return mGlobals;
+}
+
+QAbstractTableModel *CSMWorld::Data::getTableModel (const UniversalId& id)
+{
+    std::map<UniversalId::Type, QAbstractTableModel *>::iterator iter = mModelIndex.find (id.getType());
+
+    if (iter==mModelIndex.end())
+        throw std::logic_error ("No table model available for " + id.toString());
+
+    return iter->second;
+}
+
+void CSMWorld::Data::merge()
+{
+    mGlobals.merge();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
new file mode 100644
index 000000000..f7748cb5d
--- /dev/null
+++ b/apps/opencs/model/world/data.hpp
@@ -0,0 +1,50 @@
+#ifndef CSM_WOLRD_DATA_H
+#define CSM_WOLRD_DATA_H
+
+#include <map>
+#include <vector>
+
+#include <components/esm/loadglob.hpp>
+
+#include "idcollection.hpp"
+#include "universalid.hpp"
+
+class QAbstractTableModel;
+
+namespace CSMWorld
+{
+    class Data
+    {
+            IdCollection<ESM::Global> mGlobals;
+            std::vector<QAbstractTableModel *> mModels;
+            std::map<UniversalId::Type, QAbstractTableModel *> mModelIndex;
+
+            // not implemented
+            Data (const Data&);
+            Data& operator= (const Data&);
+
+            void addModel (QAbstractTableModel *model, UniversalId::Type type1,
+                UniversalId::Type type2 = UniversalId::Type_None);
+
+        public:
+
+            Data();
+
+            ~Data();
+
+            const IdCollection<ESM::Global>& getGlobals() const;
+
+            IdCollection<ESM::Global>& getGlobals();
+
+            QAbstractTableModel *getTableModel (const UniversalId& id);
+            ///< If no table model is available for \a id, an exception is thrown.
+            ///
+            /// \note The returned table may either be the model for the ID itself or the model that
+            /// contains the record specified by the ID.
+
+            void merge();
+            ///< Merge modified into base.
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/world/idcollection.cpp b/apps/opencs/model/world/idcollection.cpp
new file mode 100644
index 000000000..fc4bb1ef6
--- /dev/null
+++ b/apps/opencs/model/world/idcollection.cpp
@@ -0,0 +1,6 @@
+
+#include "idcollection.hpp"
+
+CSMWorld::IdCollectionBase::IdCollectionBase() {}
+
+CSMWorld::IdCollectionBase::~IdCollectionBase() {}
\ No newline at end of file
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
new file mode 100644
index 000000000..963997924
--- /dev/null
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -0,0 +1,320 @@
+#ifndef CSM_WOLRD_IDCOLLECTION_H
+#define CSM_WOLRD_IDCOLLECTION_H
+
+#include <vector>
+#include <map>
+#include <string>
+#include <algorithm>
+#include <cctype>
+#include <stdexcept>
+#include <functional>
+
+#include <QVariant>
+
+#include "columnbase.hpp"
+#include <components/misc/stringops.hpp>
+
+namespace CSMWorld
+{
+    class IdCollectionBase
+    {
+            // not implemented
+            IdCollectionBase (const IdCollectionBase&);
+            IdCollectionBase& operator= (const IdCollectionBase&);
+
+        public:
+
+            IdCollectionBase();
+
+            virtual ~IdCollectionBase();
+
+            virtual int getSize() const = 0;
+
+            virtual std::string getId (int index) const = 0;
+
+            virtual int getIndex (const std::string& id) const = 0;
+
+            virtual int getColumns() const = 0;
+
+            virtual const ColumnBase& getColumn (int column) const = 0;
+
+            virtual QVariant getData (int index, int column) const = 0;
+
+            virtual void setData (int index, int column, const QVariant& data) = 0;
+
+            virtual void merge() = 0;
+            ///< Merge modified into base.
+
+            virtual void purge() = 0;
+            ///< Remove records that are flagged as erased.
+
+            virtual void removeRows (int index, int count) = 0;
+
+            virtual void appendBlankRecord (const std::string& id) = 0;
+
+            virtual int searchId (const std::string& id) const = 0;
+            ////< Search record with \a id.
+            /// \return index of record (if found) or -1 (not found)
+
+            virtual void replace (int index, const RecordBase& record) = 0;
+            ///< If the record type does not match, an exception is thrown.
+            ///
+            /// \attention \a record must not change the ID.
+
+            virtual void appendRecord (const RecordBase& record) = 0;
+            ///< If the record type does not match, an exception is thrown.
+
+            virtual std::string getId (const RecordBase& record) const = 0;
+            ///< Return ID for \a record.
+            ///
+            /// \attention Throw san exception, if the type of \a record does not match.
+
+            virtual const RecordBase& getRecord (const std::string& id) const = 0;
+    };
+
+    ///< \brief Collection of ID-based records
+    template<typename ESXRecordT>
+    class IdCollection : public IdCollectionBase
+    {
+            std::vector<Record<ESXRecordT> > mRecords;
+            std::map<std::string, int> mIndex;
+            std::vector<Column<ESXRecordT> *> mColumns;
+
+            // not implemented
+            IdCollection (const IdCollection&);
+            IdCollection& operator= (const IdCollection&);
+
+        public:
+
+            IdCollection();
+
+            virtual ~IdCollection();
+
+            void add (const ESXRecordT& record);
+            ///< Add a new record (modified)
+
+            virtual int getSize() const;
+
+            virtual std::string getId (int index) const;
+
+            virtual int getIndex (const std::string& id) const;
+
+            virtual int getColumns() const;
+
+            virtual QVariant getData (int index, int column) const;
+
+            virtual void setData (int index, int column, const QVariant& data);
+
+            virtual const ColumnBase& getColumn (int column) const;
+
+            virtual void merge();
+            ///< Merge modified into base.
+
+            virtual void purge();
+            ///< Remove records that are flagged as erased.
+
+            virtual void removeRows (int index, int count) ;
+
+            virtual void appendBlankRecord (const std::string& id);
+
+            virtual int searchId (const std::string& id) const;
+            ////< Search record with \a id.
+            /// \return index of record (if found) or -1 (not found)
+
+            virtual void replace (int index, const RecordBase& record);
+            ///< If the record type does not match, an exception is thrown.
+            ///
+            /// \attention \a record must not change the ID.
+
+            virtual void appendRecord (const RecordBase& record);
+            ///< If the record type does not match, an exception is thrown.
+
+            virtual std::string getId (const RecordBase& record) const;
+            ///< Return ID for \a record.
+            ///
+            /// \attention Throw san exception, if the type of \a record does not match.
+
+            virtual const RecordBase& getRecord (const std::string& id) const;
+
+            void addColumn (Column<ESXRecordT> *column);
+    };
+
+    template<typename ESXRecordT>
+    IdCollection<ESXRecordT>::IdCollection()
+    {}
+
+    template<typename ESXRecordT>
+    IdCollection<ESXRecordT>::~IdCollection()
+    {
+        for (typename std::vector<Column<ESXRecordT> *>::iterator iter (mColumns.begin()); iter!=mColumns.end(); ++iter)
+            delete *iter;
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::add (const ESXRecordT& record)
+    {
+        std::string id = Misc::StringUtils::lowerCase(record.mId);
+
+        std::map<std::string, int>::iterator iter = mIndex.find (id);
+
+        if (iter==mIndex.end())
+        {
+            Record<ESXRecordT> record2;
+            record2.mState = Record<ESXRecordT>::State_ModifiedOnly;
+            record2.mModified = record;
+
+            mRecords.push_back (record2);
+            mIndex.insert (std::make_pair (id, mRecords.size()-1));
+        }
+        else
+        {
+            mRecords[iter->second].setModified (record);
+        }
+    }
+
+    template<typename ESXRecordT>
+    int IdCollection<ESXRecordT>::getSize() const
+    {
+        return mRecords.size();
+    }
+
+    template<typename ESXRecordT>
+    std::string IdCollection<ESXRecordT>::getId (int index) const
+    {
+        return mRecords.at (index).get().mId;
+    }
+
+    template<typename ESXRecordT>
+    int  IdCollection<ESXRecordT>::getIndex (const std::string& id) const
+    {
+        int index = searchId (id);
+
+        if (index==-1)
+            throw std::runtime_error ("invalid ID: " + id);
+
+        return index;
+    }
+
+    template<typename ESXRecordT>
+    int IdCollection<ESXRecordT>::getColumns() const
+    {
+        return mColumns.size();
+    }
+
+    template<typename ESXRecordT>
+    QVariant IdCollection<ESXRecordT>::getData (int index, int column) const
+    {
+        return mColumns.at (column)->get (mRecords.at (index));
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::setData (int index, int column, const QVariant& data)
+    {
+        return mColumns.at (column)->set (mRecords.at (index), data);
+    }
+
+    template<typename ESXRecordT>
+    const ColumnBase& IdCollection<ESXRecordT>::getColumn (int column) const
+    {
+        return *mColumns.at (column);
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::addColumn (Column<ESXRecordT> *column)
+    {
+        mColumns.push_back (column);
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::merge()
+    {
+        for (typename std::vector<Record<ESXRecordT> >::iterator iter (mRecords.begin()); iter!=mRecords.end(); ++iter)
+            iter->merge();
+
+        purge();
+    }
+
+    template<typename ESXRecordT>
+    void  IdCollection<ESXRecordT>::purge()
+    {
+        mRecords.erase (std::remove_if (mRecords.begin(), mRecords.end(),
+            std::mem_fun_ref (&Record<ESXRecordT>::isErased) // I want lambda :(
+            ), mRecords.end());
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::removeRows (int index, int count)
+    {
+        mRecords.erase (mRecords.begin()+index, mRecords.begin()+index+count);
+
+        typename std::map<std::string, int>::iterator iter = mIndex.begin();
+
+        while (iter!=mIndex.end())
+        {
+            if (iter->second>=index)
+            {
+                if (iter->second>=index+count)
+                {
+                    iter->second -= count;
+                }
+                else
+                {
+                    mIndex.erase (iter++);
+                }
+            }
+
+            ++iter;
+        }
+    }
+
+    template<typename ESXRecordT>
+    void  IdCollection<ESXRecordT>::appendBlankRecord (const std::string& id)
+    {
+        ESXRecordT record;
+        record.mId = id;
+        record.blank();
+        add (record);
+    }
+
+    template<typename ESXRecordT>
+    int IdCollection<ESXRecordT>::searchId (const std::string& id) const
+    {
+        std::string id2 = Misc::StringUtils::lowerCase(id);
+
+        std::map<std::string, int>::const_iterator iter = mIndex.find (id2);
+
+        if (iter==mIndex.end())
+            return -1;
+
+        return iter->second;
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::replace (int index, const RecordBase& record)
+    {
+        mRecords.at (index) = dynamic_cast<const Record<ESXRecordT>&> (record);
+    }
+
+    template<typename ESXRecordT>
+    void IdCollection<ESXRecordT>::appendRecord (const RecordBase& record)
+    {
+        mRecords.push_back (dynamic_cast<const Record<ESXRecordT>&> (record));
+        mIndex.insert (std::make_pair (getId (record), mRecords.size()-1));
+    }
+
+    template<typename ESXRecordT>
+    std::string IdCollection<ESXRecordT>::getId (const RecordBase& record) const
+    {
+        const Record<ESXRecordT>& record2 = dynamic_cast<const Record<ESXRecordT>&> (record);
+        return (record2.isModified() ? record2.mModified : record2.mBase).mId;
+    }
+
+    template<typename ESXRecordT>
+    const RecordBase& IdCollection<ESXRecordT>::getRecord (const std::string& id) const
+    {
+        int index = getIndex (id);
+        return mRecords.at (index);
+    }
+}
+
+#endif
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
new file mode 100644
index 000000000..afed6b6ed
--- /dev/null
+++ b/apps/opencs/model/world/idtable.cpp
@@ -0,0 +1,140 @@
+
+#include "idtable.hpp"
+
+#include "idcollection.hpp"
+
+CSMWorld::IdTable::IdTable (IdCollectionBase *idCollection) : mIdCollection (idCollection)
+{
+
+}
+
+CSMWorld::IdTable::~IdTable()
+{
+
+}
+
+int CSMWorld::IdTable::rowCount (const QModelIndex & parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return mIdCollection->getSize();
+}
+
+int CSMWorld::IdTable::columnCount (const QModelIndex & parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return mIdCollection->getColumns();
+}
+
+QVariant CSMWorld::IdTable::data  (const QModelIndex & index, int role) const
+{
+    if (role!=Qt::DisplayRole && role!=Qt::EditRole)
+        return QVariant();
+
+    if (role==Qt::EditRole && !mIdCollection->getColumn (index.column()).isEditable())
+        return QVariant();
+
+    return mIdCollection->getData (index.row(), index.column());
+}
+
+QVariant CSMWorld::IdTable::headerData (int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation==Qt::Vertical)
+        return QVariant();
+
+    if (role==Qt::DisplayRole)
+        return tr (mIdCollection->getColumn (section).mTitle.c_str());
+
+    if (role==ColumnBase::Role_Flags)
+        return mIdCollection->getColumn (section).mFlags;
+
+    if (role==ColumnBase::Role_Display)
+        return mIdCollection->getColumn (section).mDisplayType;
+
+    return QVariant();
+}
+
+bool CSMWorld::IdTable::setData ( const QModelIndex &index, const QVariant &value, int role)
+{
+    if (mIdCollection->getColumn (index.column()).isEditable() && role==Qt::EditRole)
+    {
+        mIdCollection->setData (index.row(), index.column(), value);
+
+        emit dataChanged (CSMWorld::IdTable::index (index.row(), 0),
+            CSMWorld::IdTable::index (index.row(), mIdCollection->getColumns()-1));
+
+        return true;
+    }
+
+    return false;
+}
+
+Qt::ItemFlags CSMWorld::IdTable::flags (const QModelIndex & index) const
+{
+    Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+
+    if (mIdCollection->getColumn (index.column()).isUserEditable())
+        flags |= Qt::ItemIsEditable;
+
+    return flags;
+}
+
+bool CSMWorld::IdTable::removeRows (int row, int count, const QModelIndex& parent)
+{
+    if (parent.isValid())
+        return false;
+
+    beginRemoveRows (parent, row, row+count-1);
+
+    mIdCollection->removeRows (row, count);
+
+    endRemoveRows();
+
+    return true;
+}
+
+void CSMWorld::IdTable::addRecord (const std::string& id)
+{
+    int index = mIdCollection->getSize();
+
+    beginInsertRows (QModelIndex(), index, index);
+
+    mIdCollection->appendBlankRecord (id);
+
+    endInsertRows();
+}
+
+QModelIndex CSMWorld::IdTable::getModelIndex (const std::string& id, int column) const
+{
+    return index (mIdCollection->getIndex (id), column);
+}
+
+void CSMWorld::IdTable::setRecord (const RecordBase& record)
+{
+    int index = mIdCollection->searchId (mIdCollection->getId (record));
+
+    if (index==-1)
+    {
+        int index = mIdCollection->getSize();
+
+        beginInsertRows (QModelIndex(), index, index);
+
+        mIdCollection->appendRecord (record);
+
+        endInsertRows();
+    }
+    else
+    {
+        mIdCollection->replace (index, record);
+        emit dataChanged (CSMWorld::IdTable::index (index, 0),
+            CSMWorld::IdTable::index (index, mIdCollection->getColumns()-1));
+    }
+}
+
+const CSMWorld::RecordBase& CSMWorld::IdTable::getRecord (const std::string& id) const
+{
+    return mIdCollection->getRecord (id);
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/idtable.hpp b/apps/opencs/model/world/idtable.hpp
new file mode 100644
index 000000000..deaebaa38
--- /dev/null
+++ b/apps/opencs/model/world/idtable.hpp
@@ -0,0 +1,53 @@
+#ifndef CSM_WOLRD_IDTABLE_H
+#define CSM_WOLRD_IDTABLE_H
+
+#include <QAbstractTableModel>
+
+namespace CSMWorld
+{
+    class IdCollectionBase;
+    class RecordBase;
+
+    class IdTable : public QAbstractTableModel
+    {
+            Q_OBJECT
+
+            IdCollectionBase *mIdCollection;
+
+            // not implemented
+            IdTable (const IdTable&);
+            IdTable& operator= (const IdTable&);
+
+        public:
+
+            IdTable (IdCollectionBase *idCollection);
+            ///< The ownership of \a idCollection is not transferred.
+
+            virtual ~IdTable();
+
+            virtual int rowCount (const QModelIndex & parent = QModelIndex()) const;
+
+            virtual int columnCount (const QModelIndex & parent = QModelIndex()) const;
+
+            virtual QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const;
+
+            virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+            virtual bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+
+            virtual Qt::ItemFlags flags (const QModelIndex & index) const;
+
+            virtual bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex());
+
+            void addRecord (const std::string& id);
+
+            QModelIndex getModelIndex (const std::string& id, int column) const;
+
+            void setRecord (const RecordBase& record);
+            ///< Add record or overwrite existing recrod.
+
+            const RecordBase& getRecord (const std::string& id) const;
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
new file mode 100644
index 000000000..78995f60b
--- /dev/null
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -0,0 +1,18 @@
+
+#include "idtableproxymodel.hpp"
+
+#include "idtable.hpp"
+
+CSMWorld::IdTableProxyModel::IdTableProxyModel (QObject *parent)
+: QSortFilterProxyModel (parent)
+{}
+
+void CSMWorld::IdTableProxyModel::addRecord (const std::string& id)
+{
+    dynamic_cast<IdTable&> (*sourceModel()).addRecord (id);
+}
+
+QModelIndex CSMWorld::IdTableProxyModel::getModelIndex (const std::string& id, int column) const
+{
+    return mapFromSource (dynamic_cast<IdTable&> (*sourceModel()).getModelIndex (id, column));
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/idtableproxymodel.hpp b/apps/opencs/model/world/idtableproxymodel.hpp
new file mode 100644
index 000000000..3f1537cce
--- /dev/null
+++ b/apps/opencs/model/world/idtableproxymodel.hpp
@@ -0,0 +1,24 @@
+#ifndef CSM_WOLRD_IDTABLEPROXYMODEL_H
+#define CSM_WOLRD_IDTABLEPROXYMODEL_H
+
+#include <QSortFilterProxyModel>
+
+#include <string>
+
+namespace CSMWorld
+{
+    class IdTableProxyModel : public QSortFilterProxyModel
+    {
+            Q_OBJECT
+
+        public:
+
+            IdTableProxyModel (QObject *parent = 0);
+
+            virtual void addRecord (const std::string& id);
+
+            virtual QModelIndex getModelIndex (const std::string& id, int column) const;
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/model/world/record.cpp b/apps/opencs/model/world/record.cpp
new file mode 100644
index 000000000..229985a8a
--- /dev/null
+++ b/apps/opencs/model/world/record.cpp
@@ -0,0 +1,21 @@
+
+#include "record.hpp"
+
+CSMWorld::RecordBase::~RecordBase() {}
+
+bool CSMWorld::RecordBase::RecordBase::isDeleted() const
+{
+    return mState==State_Deleted || mState==State_Erased;
+}
+
+
+bool CSMWorld::RecordBase::RecordBase::isErased() const
+{
+    return mState==State_Erased;
+}
+
+
+bool CSMWorld::RecordBase::RecordBase::isModified() const
+{
+    return mState==State_Modified || mState==State_ModifiedOnly;
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
new file mode 100644
index 000000000..53bb7ea2c
--- /dev/null
+++ b/apps/opencs/model/world/record.hpp
@@ -0,0 +1,104 @@
+#ifndef CSM_WOLRD_RECORD_H
+#define CSM_WOLRD_RECORD_H
+
+#include <stdexcept>
+
+namespace CSMWorld
+{
+    struct RecordBase
+    {
+        enum State
+        {
+            State_BaseOnly = 0, // defined in base only
+            State_Modified = 1, // exists in base, but has been modified
+            State_ModifiedOnly = 2, // newly created in modified
+            State_Deleted = 3, // exists in base, but has been deleted
+            State_Erased = 4 // does not exist at all (we mostly treat that the same way as deleted)
+        };
+
+        State mState;
+
+        virtual ~RecordBase();
+
+        virtual RecordBase *clone() const = 0;
+
+        bool isDeleted() const;
+
+        bool isErased() const;
+
+        bool isModified() const;
+    };
+
+    template <typename ESXRecordT>
+    struct Record : public RecordBase
+    {
+        ESXRecordT mBase;
+        ESXRecordT mModified;
+
+        virtual RecordBase *clone() const;
+
+        const ESXRecordT& get() const;
+        ///< Throws an exception, if the record is deleted.
+
+        const ESXRecordT& getBase() const;
+        ///< Throws an exception, if the record is deleted. Returns modified, if there is no base.
+
+        void setModified (const ESXRecordT& modified);
+        ///< Throws an exception, if the record is deleted.
+
+        void merge();
+        ///< Merge modified into base.
+    };
+
+    template <typename ESXRecordT>
+    RecordBase *Record<ESXRecordT>::clone() const
+    {
+        return new Record<ESXRecordT> (*this);
+    }
+
+    template <typename ESXRecordT>
+    const ESXRecordT& Record<ESXRecordT>::get() const
+    {
+        if (mState==State_Erased)
+            throw std::logic_error ("attempt to access a deleted record");
+
+        return mState==State_BaseOnly ? mBase : mModified;
+    }
+
+    template <typename ESXRecordT>
+    const ESXRecordT& Record<ESXRecordT>::getBase() const
+    {
+        if (mState==State_Erased)
+            throw std::logic_error ("attempt to access a deleted record");
+
+        return mState==State_ModifiedOnly ? mModified : mBase;
+    }
+
+    template <typename ESXRecordT>
+    void Record<ESXRecordT>::setModified (const ESXRecordT& modified)
+    {
+        if (mState==State_Erased)
+            throw std::logic_error ("attempt to modify a deleted record");
+
+        mModified = modified;
+
+        if (mState!=State_ModifiedOnly)
+            mState = mBase==mModified ? State_BaseOnly : State_Modified;
+    }
+
+    template <typename ESXRecordT>
+    void Record<ESXRecordT>::merge()
+    {
+        if (isModified())
+        {
+            mBase = mModified;
+            mState = State_BaseOnly;
+        }
+        else if (mState==State_Deleted)
+        {
+            mState = State_Erased;
+        }
+    }
+}
+
+#endif
diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
new file mode 100644
index 000000000..d8775643a
--- /dev/null
+++ b/apps/opencs/model/world/universalid.cpp
@@ -0,0 +1,237 @@
+
+#include "universalid.hpp"
+
+#include <ostream>
+#include <stdexcept>
+#include <sstream>
+
+namespace
+{
+    struct TypeData
+    {
+            CSMWorld::UniversalId::Class mClass;
+            CSMWorld::UniversalId::Type mType;
+            const char *mName;
+    };
+
+    static const TypeData sNoArg[] =
+    {
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, "empty" },
+        { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Globals, "Global Variables" },
+
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
+    };
+
+    static const TypeData sIdArg[] =
+    {
+        { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Global, "Global Variable" },
+
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
+    };
+
+    static const TypeData sIndexArg[] =
+    {
+        { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results" },
+
+        { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0 } // end marker
+    };
+}
+
+CSMWorld::UniversalId::UniversalId (const std::string& universalId)
+{
+    std::string::size_type index = universalId.find (':');
+
+    if (index==std::string::npos)
+    {
+        std::string type = universalId.substr (0, index);
+
+        if (index==std::string::npos)
+        {
+            for (int i=0; sNoArg[i].mName; ++i)
+                if (type==sNoArg[i].mName)
+                {
+                    mArgumentType = ArgumentType_None;
+                    mType = sNoArg[i].mType;
+                    mClass = sNoArg[i].mClass;
+                    return;
+                }
+        }
+        else
+        {
+            for (int i=0; sIdArg[i].mName; ++i)
+                if (type==sIdArg[i].mName)
+                {
+                    mArgumentType = ArgumentType_Id;
+                    mType = sIdArg[i].mType;
+                    mClass = sIdArg[i].mClass;
+                    mId = universalId.substr (0, index);
+                    return;
+                }
+
+            for (int i=0; sIndexArg[i].mName; ++i)
+                if (type==sIndexArg[i].mName)
+                {
+                    mArgumentType = ArgumentType_Index;
+                    mType = sIndexArg[i].mType;
+                    mClass = sIndexArg[i].mClass;
+
+                    std::istringstream stream (universalId.substr (0, index));
+
+                    if (stream >> mIndex)
+                        return;
+
+                    break;
+                }
+        }
+    }
+
+    throw std::runtime_error ("invalid UniversalId: " + universalId);
+}
+
+CSMWorld::UniversalId::UniversalId (Type type) : mArgumentType (ArgumentType_None), mType (type), mIndex (0)
+{
+    for (int i=0; sNoArg[i].mName; ++i)
+        if (type==sNoArg[i].mType)
+        {
+            mClass = sNoArg[i].mClass;
+            return;
+        }
+
+    throw std::logic_error ("invalid argument-less UniversalId type");
+}
+
+CSMWorld::UniversalId::UniversalId (Type type, const std::string& id)
+: mArgumentType (ArgumentType_Id), mType (type), mId (id), mIndex (0)
+{
+    for (int i=0; sIdArg[i].mName; ++i)
+        if (type==sIdArg[i].mType)
+        {
+            mClass = sIdArg[i].mClass;
+            return;
+        }
+
+    throw std::logic_error ("invalid ID argument UniversalId type");
+}
+
+CSMWorld::UniversalId::UniversalId (Type type, int index)
+: mArgumentType (ArgumentType_Index), mType (type), mIndex (index)
+{
+    for (int i=0; sIndexArg[i].mName; ++i)
+        if (type==sIndexArg[i].mType)
+        {
+            mClass = sIndexArg[i].mClass;
+            return;
+        }
+
+    throw std::logic_error ("invalid index argument UniversalId type");
+}
+
+CSMWorld::UniversalId::Class CSMWorld::UniversalId::getClass() const
+{
+    return mClass;
+}
+
+CSMWorld::UniversalId::ArgumentType CSMWorld::UniversalId::getArgumentType() const
+{
+    return mArgumentType;
+}
+
+CSMWorld::UniversalId::Type CSMWorld::UniversalId::getType() const
+{
+    return mType;
+}
+
+const std::string& CSMWorld::UniversalId::getId() const
+{
+    if (mArgumentType!=ArgumentType_Id)
+        throw std::logic_error ("invalid access to ID of non-ID UniversalId");
+
+    return mId;
+}
+
+int CSMWorld::UniversalId::getIndex() const
+{
+    if (mArgumentType!=ArgumentType_Index)
+        throw std::logic_error ("invalid access to index of non-index UniversalId");
+
+    return mIndex;
+}
+
+bool CSMWorld::UniversalId::isEqual (const UniversalId& universalId) const
+{
+    if (mClass!=universalId.mClass || mArgumentType!=universalId.mArgumentType || mType!=universalId.mType)
+            return false;
+
+    switch (mArgumentType)
+    {
+        case ArgumentType_Id: return mId==universalId.mId;
+        case ArgumentType_Index: return mIndex==universalId.mIndex;
+
+        default: return true;
+    }
+}
+
+bool CSMWorld::UniversalId::isLess (const UniversalId& universalId) const
+{
+    if (mType<universalId.mType)
+        return true;
+
+    if (mType>universalId.mType)
+        return false;
+
+    switch (mArgumentType)
+    {
+        case ArgumentType_Id: return mId<universalId.mId;
+        case ArgumentType_Index: return mIndex<universalId.mIndex;
+
+        default: return false;
+    }
+}
+
+std::string CSMWorld::UniversalId::getTypeName() const
+{
+    const TypeData *typeData = mArgumentType==ArgumentType_None ? sNoArg :
+        (mArgumentType==ArgumentType_Id ? sIdArg : sIndexArg);
+
+    for (int i=0; typeData[i].mName; ++i)
+        if (typeData[i].mType==mType)
+            return typeData[i].mName;
+
+    throw std::logic_error ("failed to retrieve UniversalId type name");
+}
+
+std::string CSMWorld::UniversalId::toString() const
+{
+    std::ostringstream stream;
+
+    stream << getTypeName();
+
+    switch (mArgumentType)
+    {
+        case ArgumentType_None: break;
+        case ArgumentType_Id: stream << ": " << mId; break;
+        case ArgumentType_Index: stream << ": " << mIndex; break;
+    }
+
+    return stream.str();
+}
+
+bool CSMWorld::operator== (const CSMWorld::UniversalId& left, const CSMWorld::UniversalId& right)
+{
+    return left.isEqual (right);
+}
+
+bool CSMWorld::operator!= (const CSMWorld::UniversalId& left, const CSMWorld::UniversalId& right)
+{
+    return !left.isEqual (right);
+}
+
+bool CSMWorld::operator< (const UniversalId& left, const UniversalId& right)
+{
+    return left.isLess (right);
+}
+
+std::ostream& CSMWorld::operator< (std::ostream& stream, const CSMWorld::UniversalId& universalId)
+{
+    return stream << universalId.toString();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/world/universalid.hpp b/apps/opencs/model/world/universalid.hpp
new file mode 100644
index 000000000..4a73feb12
--- /dev/null
+++ b/apps/opencs/model/world/universalid.hpp
@@ -0,0 +1,96 @@
+#ifndef CSM_WOLRD_UNIVERSALID_H
+#define CSM_WOLRD_UNIVERSALID_H
+
+#include <string>
+#include <iosfwd>
+
+#include <QMetaType>
+
+namespace CSMWorld
+{
+    class UniversalId
+    {
+        public:
+
+            enum Class
+            {
+                    Class_None = 0,
+                    Class_Record,
+                    Class_SubRecord,
+                    Class_RecordList,
+                    Class_Collection, // multiple types of records combined
+                    Class_Transient, // not part of the world data or the project data
+                    Class_NonRecord // record like data that is not part of the world
+            };
+
+            enum ArgumentType
+            {
+                ArgumentType_None,
+                ArgumentType_Id,
+                ArgumentType_Index
+            };
+
+            enum Type
+            {
+                Type_None,
+
+                Type_Globals,
+
+                Type_Global,
+
+                Type_VerificationResults
+            };
+
+        private:
+
+            Class mClass;
+            ArgumentType mArgumentType;
+            Type mType;
+            std::string mId;
+            int mIndex;
+
+        public:
+
+            UniversalId (const std::string& universalId);
+
+            UniversalId (Type type = Type_None);
+            ///< Using a type for a non-argument-less UniversalId will throw an exception.
+
+            UniversalId (Type type, const std::string& id);
+            ///< Using a type for a non-ID-argument UniversalId will throw an exception.
+
+            UniversalId (Type type, int index);
+            ///< Using a type for a non-index-argument UniversalId will throw an exception.
+
+            Class getClass() const;
+
+            ArgumentType getArgumentType() const;
+
+            Type getType() const;
+
+            const std::string& getId() const;
+            ///< Calling this function for a non-ID type will throw an exception.
+
+            int getIndex() const;
+            ///< Calling this function for a non-index type will throw an exception.
+
+            bool isEqual (const UniversalId& universalId) const;
+
+            bool isLess (const UniversalId& universalId) const;
+
+            std::string getTypeName() const;
+
+            std::string toString() const;
+    };
+
+    bool operator== (const UniversalId& left, const UniversalId& right);
+    bool operator!= (const UniversalId& left, const UniversalId& right);
+
+    bool operator< (const UniversalId& left, const UniversalId& right);
+
+    std::ostream& operator< (std::ostream& stream, const UniversalId& universalId);
+}
+
+Q_DECLARE_METATYPE (CSMWorld::UniversalId)
+
+#endif
diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp
new file mode 100644
index 000000000..3f415da03
--- /dev/null
+++ b/apps/opencs/view/doc/operation.cpp
@@ -0,0 +1,54 @@
+
+#include "operation.hpp"
+
+#include <sstream>
+
+#include "../../model/doc/document.hpp"
+
+void CSVDoc::Operation::updateLabel (int threads)
+{
+    if (threads==-1 || ((threads==0)!=mStalling))
+    {
+        std::string name ("unknown operation");
+
+        switch (mType)
+        {
+            case CSMDoc::State_Saving: name = "saving"; break;
+            case CSMDoc::State_Verifying: name = "verifying"; break;
+        }
+
+        std::ostringstream stream;
+
+        if ((mStalling = (threads<=0)))
+        {
+            stream << name << " (waiting for a free worker thread)";
+        }
+        else
+        {
+            stream << name << " (%p%)";
+        }
+
+        setFormat (stream.str().c_str());
+    }
+}
+
+CSVDoc::Operation::Operation (int type) : mType (type), mStalling (false)
+{
+    /// \todo Add a cancel button or a pop up menu with a cancel item
+
+    updateLabel();
+
+    /// \todo assign different progress bar colours to allow the user to distinguish easily between operation types
+}
+
+void CSVDoc::Operation::setProgress (int current, int max, int threads)
+{
+    updateLabel (threads);
+    setRange (0, max);
+    setValue (current);
+}
+
+int CSVDoc::Operation::getType() const
+{
+    return mType;
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/operation.hpp b/apps/opencs/view/doc/operation.hpp
new file mode 100644
index 000000000..362725b6f
--- /dev/null
+++ b/apps/opencs/view/doc/operation.hpp
@@ -0,0 +1,31 @@
+#ifndef CSV_DOC_OPERATION_H
+#define CSV_DOC_OPERATION_H
+
+#include <QProgressBar>
+
+namespace CSVDoc
+{
+    class Operation : public QProgressBar
+    {
+            Q_OBJECT
+
+            int mType;
+            bool mStalling;
+
+            // not implemented
+            Operation (const Operation&);
+            Operation& operator= (const Operation&);
+
+            void updateLabel (int threads = -1);
+
+        public:
+
+            Operation (int type);
+
+            void setProgress (int current, int max, int threads);
+
+            int getType() const;
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/doc/operations.cpp b/apps/opencs/view/doc/operations.cpp
new file mode 100644
index 000000000..ba444a119
--- /dev/null
+++ b/apps/opencs/view/doc/operations.cpp
@@ -0,0 +1,47 @@
+
+#include "operations.hpp"
+
+#include <QVBoxLayout>
+
+#include "operation.hpp"
+
+CSVDoc::Operations::Operations()
+{
+    /// \todo make widget height fixed (exactly the height required to display all operations)
+
+    setFeatures (QDockWidget::NoDockWidgetFeatures);
+
+    QWidget *widget = new QWidget;
+    setWidget (widget);
+
+    mLayout = new QVBoxLayout;
+
+    widget->setLayout (mLayout);
+}
+
+void CSVDoc::Operations::setProgress (int current, int max, int type, int threads)
+{
+    for (std::vector<Operation *>::iterator iter (mOperations.begin()); iter!=mOperations.end(); ++iter)
+        if ((*iter)->getType()==type)
+        {
+            (*iter)->setProgress (current, max, threads);
+            return;
+        }
+
+    Operation *operation = new Operation (type);
+
+    mLayout->addWidget (operation);
+    mOperations.push_back (operation);
+    operation->setProgress (current, max, threads);
+}
+
+void CSVDoc::Operations::quitOperation (int type)
+{
+    for (std::vector<Operation *>::iterator iter (mOperations.begin()); iter!=mOperations.end(); ++iter)
+        if ((*iter)->getType()==type)
+        {
+            delete *iter;
+            mOperations.erase (iter);
+            break;
+        }
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/operations.hpp b/apps/opencs/view/doc/operations.hpp
new file mode 100644
index 000000000..b96677450
--- /dev/null
+++ b/apps/opencs/view/doc/operations.hpp
@@ -0,0 +1,37 @@
+#ifndef CSV_DOC_OPERATIONS_H
+#define CSV_DOC_OPERATIONS_H
+
+#include <vector>
+
+#include <QDockWidget>
+
+class QVBoxLayout;
+
+namespace CSVDoc
+{
+    class Operation;
+
+    class Operations : public QDockWidget
+    {
+            Q_OBJECT
+
+            QVBoxLayout *mLayout;
+            std::vector<Operation *> mOperations;
+
+            // not implemented
+            Operations (const Operations&);
+            Operations& operator= (const Operations&);
+
+        public:
+
+            Operations();
+
+            void setProgress (int current, int max, int type, int threads);
+            ///< Implicitly starts the operation, if it is not running already.
+
+            void quitOperation (int type);
+            ///< Calling this function for an operation that is not running is a no-op.
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
new file mode 100644
index 000000000..1c356fa73
--- /dev/null
+++ b/apps/opencs/view/doc/subview.cpp
@@ -0,0 +1,18 @@
+
+#include "subview.hpp"
+
+CSVDoc::SubView::SubView (const CSMWorld::UniversalId& id) : mUniversalId (id)
+{
+    /// \todo  add a button to the title bar that clones this sub view
+
+    setWindowTitle (mUniversalId.toString().c_str());
+
+    /// \todo remove (for testing only)
+    setMinimumWidth (100);
+    setMinimumHeight (60);
+}
+
+CSMWorld::UniversalId CSVDoc::SubView::getUniversalId() const
+{
+    return mUniversalId;
+}
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
new file mode 100644
index 000000000..985c5eb3c
--- /dev/null
+++ b/apps/opencs/view/doc/subview.hpp
@@ -0,0 +1,45 @@
+#ifndef CSV_DOC_SUBVIEW_H
+#define CSV_DOC_SUBVIEW_H
+
+#include "../../model/doc/document.hpp"
+
+#include "../../model/world/universalid.hpp"
+
+#include "subviewfactory.hpp"
+
+#include <QDockWidget>
+
+class QUndoStack;
+
+namespace CSMWorld
+{
+    class Data;
+}
+
+namespace CSVDoc
+{
+    class SubView : public QDockWidget
+    {
+            Q_OBJECT
+
+            CSMWorld::UniversalId mUniversalId;
+
+            // not implemented
+            SubView (const SubView&);
+            SubView& operator= (SubView&);
+
+        public:
+
+            SubView (const CSMWorld::UniversalId& id);
+
+            CSMWorld::UniversalId getUniversalId() const;
+
+            virtual void setEditLock (bool locked) = 0;
+
+        signals:
+
+            void focusId (const CSMWorld::UniversalId& universalId);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/doc/subviewfactory.cpp b/apps/opencs/view/doc/subviewfactory.cpp
new file mode 100644
index 000000000..8576f6b1d
--- /dev/null
+++ b/apps/opencs/view/doc/subviewfactory.cpp
@@ -0,0 +1,38 @@
+
+#include "subviewfactory.hpp"
+
+#include <cassert>
+
+#include <stdexcept>
+
+CSVDoc::SubViewFactoryBase::SubViewFactoryBase() {}
+
+CSVDoc::SubViewFactoryBase::~SubViewFactoryBase() {}
+
+
+CSVDoc::SubViewFactoryManager::SubViewFactoryManager() {}
+
+CSVDoc::SubViewFactoryManager::~SubViewFactoryManager()
+{
+    for (std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase *>::iterator iter (mSubViewFactories.begin());
+        iter!=mSubViewFactories.end(); ++iter)
+        delete iter->second;
+}
+
+void CSVDoc::SubViewFactoryManager::add (const CSMWorld::UniversalId::Type& id, SubViewFactoryBase *factory)
+{
+    assert (mSubViewFactories.find (id)==mSubViewFactories.end());
+
+    mSubViewFactories.insert (std::make_pair (id, factory));
+}
+
+CSVDoc::SubView *CSVDoc::SubViewFactoryManager::makeSubView (const CSMWorld::UniversalId& id,
+    CSMDoc::Document& document)
+{
+    std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase *>::iterator iter = mSubViewFactories.find (id.getType());
+
+    if (iter==mSubViewFactories.end())
+        throw std::runtime_error ("Failed to create a sub view for: " + id.toString());
+
+    return iter->second->makeSubView (id, document);
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/subviewfactory.hpp b/apps/opencs/view/doc/subviewfactory.hpp
new file mode 100644
index 000000000..1f7c15480
--- /dev/null
+++ b/apps/opencs/view/doc/subviewfactory.hpp
@@ -0,0 +1,55 @@
+#ifndef CSV_DOC_SUBVIEWFACTORY_H
+#define CSV_DOC_SUBVIEWFACTORY_H
+
+#include <map>
+
+#include "../../model/world/universalid.hpp"
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSVDoc
+{
+    class SubView;
+
+    class SubViewFactoryBase
+    {
+            // not implemented
+            SubViewFactoryBase (const SubViewFactoryBase&);
+            SubViewFactoryBase& operator= (const SubViewFactoryBase&);
+
+        public:
+
+            SubViewFactoryBase();
+
+            virtual ~SubViewFactoryBase();
+
+            virtual SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) = 0;
+            ///< The ownership of the returned sub view is not transferred.
+    };
+
+    class SubViewFactoryManager
+    {
+            std::map<CSMWorld::UniversalId::Type, SubViewFactoryBase *> mSubViewFactories;
+
+            // not implemented
+            SubViewFactoryManager (const SubViewFactoryManager&);
+            SubViewFactoryManager& operator= (const SubViewFactoryManager&);
+
+        public:
+
+            SubViewFactoryManager();
+
+            ~SubViewFactoryManager();
+
+            void add (const CSMWorld::UniversalId::Type& id, SubViewFactoryBase *factory);
+            ///< The ownership of \a factory is transferred to this.
+
+            SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+            ///< The ownership of the returned sub view is not transferred.
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/doc/subviewfactoryimp.hpp b/apps/opencs/view/doc/subviewfactoryimp.hpp
new file mode 100644
index 000000000..d16e0b2b7
--- /dev/null
+++ b/apps/opencs/view/doc/subviewfactoryimp.hpp
@@ -0,0 +1,50 @@
+#ifndef CSV_DOC_SUBVIEWFACTORYIMP_H
+#define CSV_DOC_SUBVIEWFACTORYIMP_H
+
+#include "../../model/doc/document.hpp"
+
+#include "subviewfactory.hpp"
+
+namespace CSVDoc
+{
+    template<class SubViewT>
+    class SubViewFactory : public SubViewFactoryBase
+    {
+        public:
+
+            virtual CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+    };
+
+    template<class SubViewT>
+    CSVDoc::SubView *SubViewFactory<SubViewT>::makeSubView (const CSMWorld::UniversalId& id,
+        CSMDoc::Document& document)
+    {
+        return new SubViewT (id, document);
+    }
+
+    template<class SubViewT>
+    class SubViewFactoryWithCreateFlag : public SubViewFactoryBase
+    {
+        bool mCreateAndDelete;
+
+        public:
+
+            SubViewFactoryWithCreateFlag (bool createAndDelete);
+
+            virtual CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+    };
+
+    template<class SubViewT>
+    SubViewFactoryWithCreateFlag<SubViewT>::SubViewFactoryWithCreateFlag (bool createAndDelete)
+    : mCreateAndDelete (createAndDelete)
+    {}
+
+    template<class SubViewT>
+    CSVDoc::SubView *SubViewFactoryWithCreateFlag<SubViewT>::makeSubView (const CSMWorld::UniversalId& id,
+        CSMDoc::Document& document)
+    {
+        return new SubViewT (id, document, mCreateAndDelete);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
new file mode 100644
index 000000000..13edb6e74
--- /dev/null
+++ b/apps/opencs/view/doc/view.cpp
@@ -0,0 +1,216 @@
+
+#include "view.hpp"
+
+#include <sstream>
+#include <stdexcept>
+
+#include <QCloseEvent>
+#include <QMenuBar>
+#include <QMdiArea>
+
+#include "../../model/doc/document.hpp"
+
+#include "../world/subviews.hpp"
+
+#include "../tools/subviews.hpp"
+
+#include "viewmanager.hpp"
+#include "operations.hpp"
+#include "subview.hpp"
+
+void CSVDoc::View::closeEvent (QCloseEvent *event)
+{
+    if (!mViewManager.closeRequest (this))
+        event->ignore();
+}
+
+void CSVDoc::View::setupFileMenu()
+{
+    QMenu *file = menuBar()->addMenu (tr ("&File"));
+
+    QAction *new_ = new QAction (tr ("New"), this);
+    connect (new_, SIGNAL (triggered()), this, SIGNAL (newDocumentRequest()));
+    file->addAction (new_);
+
+    mSave = new QAction (tr ("&Save"), this);
+    connect (mSave, SIGNAL (triggered()), this, SLOT (save()));
+    file->addAction (mSave);
+}
+
+void CSVDoc::View::setupEditMenu()
+{
+    QMenu *edit = menuBar()->addMenu (tr ("&Edit"));
+
+    mUndo = mDocument->getUndoStack().createUndoAction (this, tr("&Undo"));
+    mUndo->setShortcuts (QKeySequence::Undo);
+    edit->addAction (mUndo);
+
+    mRedo= mDocument->getUndoStack().createRedoAction (this, tr("&Redo"));
+    mRedo->setShortcuts (QKeySequence::Redo);
+    edit->addAction (mRedo);
+}
+
+void CSVDoc::View::setupViewMenu()
+{
+    QMenu *view = menuBar()->addMenu (tr ("&View"));
+
+    QAction *newWindow = new QAction (tr ("&New View"), this);
+    connect (newWindow, SIGNAL (triggered()), this, SLOT (newView()));
+    view->addAction (newWindow);
+}
+
+void CSVDoc::View::setupWorldMenu()
+{
+    QMenu *world = menuBar()->addMenu (tr ("&World"));
+
+    QAction *globals = new QAction (tr ("Globals"), this);
+    connect (globals, SIGNAL (triggered()), this, SLOT (addGlobalsSubView()));
+    world->addAction (globals);
+
+    mVerify = new QAction (tr ("&Verify"), this);
+    connect (mVerify, SIGNAL (triggered()), this, SLOT (verify()));
+    world->addAction (mVerify);
+}
+
+void CSVDoc::View::setupUi()
+{
+    setupFileMenu();
+    setupEditMenu();
+    setupViewMenu();
+    setupWorldMenu();
+}
+
+void CSVDoc::View::updateTitle()
+{
+    std::ostringstream stream;
+
+    stream << mDocument->getName();
+
+    if (mDocument->getState() & CSMDoc::State_Modified)
+            stream << " *";
+
+    if (mViewTotal>1)
+        stream << " [" << (mViewIndex+1) << "/" << mViewTotal << "]";
+
+    setWindowTitle (stream.str().c_str());
+}
+
+void CSVDoc::View::updateActions()
+{
+    bool editing = !(mDocument->getState() & CSMDoc::State_Locked);
+
+    for (std::vector<QAction *>::iterator iter (mEditingActions.begin()); iter!=mEditingActions.end(); ++iter)
+        (*iter)->setEnabled (editing);
+
+    mUndo->setEnabled (editing & mDocument->getUndoStack().canUndo());
+    mRedo->setEnabled (editing & mDocument->getUndoStack().canRedo());
+
+    mSave->setEnabled (!(mDocument->getState() & CSMDoc::State_Saving));
+    mVerify->setEnabled (!(mDocument->getState() & CSMDoc::State_Verifying));
+}
+
+CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews)
+: mViewManager (viewManager), mDocument (document), mViewIndex (totalViews-1), mViewTotal (totalViews)
+{
+    setDockOptions (QMainWindow::AllowNestedDocks);
+
+    resize (300, 300); /// \todo get default size from settings and set reasonable minimal size
+
+    mOperations = new Operations;
+    addDockWidget (Qt::BottomDockWidgetArea, mOperations);
+
+    updateTitle();
+
+    setupUi();
+
+    CSVWorld::addSubViewFactories (mSubViewFactory);
+    CSVTools::addSubViewFactories (mSubViewFactory);
+}
+
+CSVDoc::View::~View()
+{
+}
+
+const CSMDoc::Document *CSVDoc::View::getDocument() const
+{
+        return mDocument;
+}
+
+CSMDoc::Document *CSVDoc::View::getDocument()
+{
+        return mDocument;
+}
+
+void CSVDoc::View::setIndex (int viewIndex, int totalViews)
+{
+    mViewIndex = viewIndex;
+    mViewTotal = totalViews;
+    updateTitle();
+}
+
+void CSVDoc::View::updateDocumentState()
+{
+    updateTitle();
+    updateActions();
+
+    static const int operations[] =
+    {
+        CSMDoc::State_Saving, CSMDoc::State_Verifying,
+        -1 // end marker
+    };
+
+    int state = mDocument->getState() ;
+
+    for (int i=0; operations[i]!=-1; ++i)
+        if (!(state & operations[i]))
+            mOperations->quitOperation (operations[i]);
+
+    QList<CSVDoc::SubView *> subViews = findChildren<CSVDoc::SubView *>();
+
+    for (QList<CSVDoc::SubView *>::iterator iter (subViews.begin()); iter!=subViews.end(); ++iter)
+        (*iter)->setEditLock (state & CSMDoc::State_Locked);
+}
+
+void CSVDoc::View::updateProgress (int current, int max, int type, int threads)
+{
+    mOperations->setProgress (current, max, type, threads);
+}
+
+void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id)
+{
+    /// \todo add an user setting for limiting the number of sub views per top level view. Automatically open a new top level view if this
+    /// number is exceeded
+
+    /// \todo if the sub view limit setting is one, the sub view title bar should be hidden and the text in the main title bar adjusted
+    /// accordingly
+
+    /// \todo add an user setting to reuse sub views (on a per document basis or on a per top level view basis)
+
+    SubView *view = mSubViewFactory.makeSubView (id, *mDocument);
+    addDockWidget (Qt::TopDockWidgetArea, view);
+
+    connect (view, SIGNAL (focusId (const CSMWorld::UniversalId&)), this,
+        SLOT (addSubView (const CSMWorld::UniversalId&)));
+
+    view->show();
+}
+
+void CSVDoc::View::newView()
+{
+    mViewManager.addView (mDocument);
+}
+
+void CSVDoc::View::save()
+{
+    mDocument->save();
+}
+
+void CSVDoc::View::verify()
+{
+    addSubView (mDocument->verify());
+}
+
+void CSVDoc::View::addGlobalsSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Globals);
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
new file mode 100644
index 000000000..b1dedafe9
--- /dev/null
+++ b/apps/opencs/view/doc/view.hpp
@@ -0,0 +1,103 @@
+#ifndef CSV_DOC_VIEW_H
+#define CSV_DOC_VIEW_H
+
+#include <vector>
+#include <map>
+
+#include <QMainWindow>
+
+#include "subviewfactory.hpp"
+
+class QAction;
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSMWorld
+{
+    class UniversalId;
+}
+
+namespace CSVDoc
+{
+    class ViewManager;
+    class Operations;
+
+    class View : public QMainWindow
+    {
+            Q_OBJECT
+
+            ViewManager& mViewManager;
+            CSMDoc::Document *mDocument;
+            int mViewIndex;
+            int mViewTotal;
+            QAction *mUndo;
+            QAction *mRedo;
+            QAction *mSave;
+            QAction *mVerify;
+            std::vector<QAction *> mEditingActions;
+            Operations *mOperations;
+            SubViewFactoryManager mSubViewFactory;
+
+            // not implemented
+            View (const View&);
+            View& operator= (const View&);
+
+        private:
+
+            void closeEvent (QCloseEvent *event);
+
+            void setupFileMenu();
+
+            void setupEditMenu();
+
+            void setupViewMenu();
+
+            void setupWorldMenu();
+
+            void setupUi();
+
+            void updateTitle();
+
+            void updateActions();
+
+        public:
+
+            View (ViewManager& viewManager, CSMDoc::Document *document, int totalViews);
+            ///< The ownership of \a document is not transferred to *this.
+
+            virtual ~View();
+
+            const CSMDoc::Document *getDocument() const;
+
+            CSMDoc::Document *getDocument();
+
+            void setIndex (int viewIndex, int totalViews);
+
+            void updateDocumentState();
+
+            void updateProgress (int current, int max, int type, int threads);
+
+        signals:
+
+            void newDocumentRequest();
+
+        public slots:
+
+            void addSubView (const CSMWorld::UniversalId& id);
+
+        private slots:
+
+            void newView();
+
+            void save();
+
+            void verify();
+
+            void addGlobalsSubView();
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
new file mode 100644
index 000000000..22847c78b
--- /dev/null
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -0,0 +1,112 @@
+
+#include "viewmanager.hpp"
+
+#include <map>
+
+#include "../../model/doc/documentmanager.hpp"
+#include "../../model/doc/document.hpp"
+
+#include "view.hpp"
+
+void CSVDoc::ViewManager::updateIndices()
+{
+    std::map<CSMDoc::Document *, std::pair<int, int> > documents;
+
+    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+    {
+        std::map<CSMDoc::Document *, std::pair<int, int> >::iterator document = documents.find ((*iter)->getDocument());
+
+        if (document==documents.end())
+            document =
+                documents.insert (
+                    std::make_pair ((*iter)->getDocument(), std::make_pair (0, countViews ((*iter)->getDocument())))).
+                first;
+
+        (*iter)->setIndex (document->second.first++, document->second.second);
+    }
+}
+
+CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
+: mDocumentManager (documentManager)
+{
+
+}
+
+CSVDoc::ViewManager::~ViewManager()
+{
+    for (std::vector<View *>::iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+        delete *iter;
+}
+
+CSVDoc::View *CSVDoc::ViewManager::addView (CSMDoc::Document *document)
+{
+    if (countViews (document)==0)
+    {
+        // new document
+        connect (document, SIGNAL (stateChanged (int, CSMDoc::Document *)),
+            this, SLOT (documentStateChanged (int, CSMDoc::Document *)));
+
+        connect (document, SIGNAL (progress (int, int, int, int, CSMDoc::Document *)),
+            this, SLOT (progress (int, int, int, int, CSMDoc::Document *)));
+    }
+
+    View *view = new View (*this, document, countViews (document)+1);
+
+    mViews.push_back (view);
+
+    view->show();
+
+    connect (view, SIGNAL (newDocumentRequest ()), this, SIGNAL (newDocumentRequest()));
+
+    updateIndices();
+
+    return view;
+}
+
+int CSVDoc::ViewManager::countViews (const CSMDoc::Document *document) const
+{
+    int count = 0;
+
+    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+        if ((*iter)->getDocument()==document)
+            ++count;
+
+    return count;
+}
+
+bool CSVDoc::ViewManager::closeRequest (View *view)
+{
+    std::vector<View *>::iterator iter = std::find (mViews.begin(), mViews.end(), view);
+
+    if (iter!=mViews.end())
+    {
+        bool last = countViews (view->getDocument())<=1;
+
+        /// \todo check if save is in progress  -> warn user about possible data loss
+        /// \todo check if document has not been saved -> return false and start close dialogue
+
+        mViews.erase (iter);
+        view->deleteLater();
+
+        if (last)
+            mDocumentManager.removeDocument (view->getDocument());
+        else
+            updateIndices();
+    }
+
+    return true;
+}
+
+void CSVDoc::ViewManager::documentStateChanged (int state, CSMDoc::Document *document)
+{
+    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+            if ((*iter)->getDocument()==document)
+                (*iter)->updateDocumentState();
+}
+
+void CSVDoc::ViewManager::progress (int current, int max, int type, int threads, CSMDoc::Document *document)
+{
+    for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
+            if ((*iter)->getDocument()==document)
+                (*iter)->updateProgress (current, max, type, threads);
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/viewmanager.hpp b/apps/opencs/view/doc/viewmanager.hpp
new file mode 100644
index 000000000..5e4b1be07
--- /dev/null
+++ b/apps/opencs/view/doc/viewmanager.hpp
@@ -0,0 +1,58 @@
+#ifndef CSV_DOC_VIEWMANAGER_H
+#define CSV_DOC_VIEWMANAGER_H
+
+#include <vector>
+
+#include <QObject>
+
+namespace CSMDoc
+{
+    class Document;
+    class DocumentManager;
+}
+
+namespace CSVDoc
+{
+    class View;
+
+    class ViewManager : public QObject
+    {
+            Q_OBJECT
+
+            CSMDoc::DocumentManager& mDocumentManager;
+            std::vector<View *> mViews;
+
+            // not implemented
+            ViewManager (const ViewManager&);
+            ViewManager& operator= (const ViewManager&);
+
+            void updateIndices();
+
+        public:
+
+            ViewManager (CSMDoc::DocumentManager& documentManager);
+
+            virtual ~ViewManager();
+
+            View *addView (CSMDoc::Document *document);
+            ///< The ownership of the returned view is not transferred.
+
+            int countViews (const CSMDoc::Document *document) const;
+            ///< Return number of views for \a document.
+
+            bool closeRequest (View *view);
+
+        signals:
+
+            void newDocumentRequest();
+
+        private slots:
+
+            void documentStateChanged (int state, CSMDoc::Document *document);
+
+            void progress (int current, int max, int type, int threads, CSMDoc::Document *document);
+    };
+
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/tools/reportsubview.cpp b/apps/opencs/view/tools/reportsubview.cpp
new file mode 100644
index 000000000..fe1be85d7
--- /dev/null
+++ b/apps/opencs/view/tools/reportsubview.cpp
@@ -0,0 +1,32 @@
+
+#include "reportsubview.hpp"
+
+#include <QTableView>
+#include <QHeaderView>
+
+#include "../../model/tools/reportmodel.hpp"
+
+CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+: CSVDoc::SubView (id), mModel (document.getReport (id))
+{
+    setWidget (mTable = new QTableView (this));
+    mTable->setModel (mModel);
+
+    mTable->horizontalHeader()->setResizeMode (QHeaderView::Interactive);
+    mTable->verticalHeader()->hide();
+    mTable->setSortingEnabled (true);
+    mTable->setSelectionBehavior (QAbstractItemView::SelectRows);
+    mTable->setSelectionMode (QAbstractItemView::ExtendedSelection);
+
+    connect (mTable, SIGNAL (doubleClicked (const QModelIndex&)), this, SLOT (show (const QModelIndex&)));
+}
+
+void CSVTools::ReportSubView::setEditLock (bool locked)
+{
+    // ignored. We don't change document state anyway.
+}
+
+void CSVTools::ReportSubView::show (const QModelIndex& index)
+{
+    focusId (mModel->getUniversalId (index.row()));
+}
\ No newline at end of file
diff --git a/apps/opencs/view/tools/reportsubview.hpp b/apps/opencs/view/tools/reportsubview.hpp
new file mode 100644
index 000000000..626ceb663
--- /dev/null
+++ b/apps/opencs/view/tools/reportsubview.hpp
@@ -0,0 +1,42 @@
+#ifndef CSV_TOOLS_REPORTSUBVIEW_H
+#define CSV_TOOLS_REPORTSUBVIEW_H
+
+#include "../doc/subview.hpp"
+
+class QTableView;
+class QModelIndex;
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSMTools
+{
+    class ReportModel;
+}
+
+namespace CSVTools
+{
+    class Table;
+
+    class ReportSubView : public CSVDoc::SubView
+    {
+            Q_OBJECT
+
+            CSMTools::ReportModel *mModel;
+            QTableView *mTable;
+
+        public:
+
+            ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+
+            virtual void setEditLock (bool locked);
+
+        private slots:
+
+            void show (const QModelIndex& index);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/tools/subviews.cpp b/apps/opencs/view/tools/subviews.cpp
new file mode 100644
index 000000000..781cf602e
--- /dev/null
+++ b/apps/opencs/view/tools/subviews.cpp
@@ -0,0 +1,12 @@
+
+#include "subviews.hpp"
+
+#include "../doc/subviewfactoryimp.hpp"
+
+#include "reportsubview.hpp"
+
+void CSVTools::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
+{
+    manager.add (CSMWorld::UniversalId::Type_VerificationResults,
+        new CSVDoc::SubViewFactory<ReportSubView>);
+}
\ No newline at end of file
diff --git a/apps/opencs/view/tools/subviews.hpp b/apps/opencs/view/tools/subviews.hpp
new file mode 100644
index 000000000..1bac32228
--- /dev/null
+++ b/apps/opencs/view/tools/subviews.hpp
@@ -0,0 +1,14 @@
+#ifndef CSV_TOOLS_SUBVIEWS_H
+#define CSV_TOOLS_SUBVIEWS_H
+
+namespace CSVDoc
+{
+    class SubViewFactoryManager;
+}
+
+namespace CSVTools
+{
+    void addSubViewFactories (CSVDoc::SubViewFactoryManager& manager);
+}
+
+#endif
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
new file mode 100644
index 000000000..2bf6577b1
--- /dev/null
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -0,0 +1,94 @@
+
+#include "dialoguesubview.hpp"
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QAbstractTableModel>
+#include <QDoubleSpinBox>
+#include <QSpinBox>
+#include <QLineEdit>
+#include <QDataWidgetMapper>
+
+#include "../../model/world/columnbase.hpp"
+#include "../../model/world/idtable.hpp"
+
+CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
+    bool createAndDelete)
+: SubView (id)
+{
+    QWidget *widget = new QWidget (this);
+
+    setWidget (widget);
+
+    QGridLayout *layout = new QGridLayout;
+
+    widget->setLayout (layout);
+
+    QAbstractTableModel *model = document.getData().getTableModel (id);
+
+    int columns = model->columnCount();
+
+    mWidgetMapper = new QDataWidgetMapper (this);
+    mWidgetMapper->setModel (model);
+
+    for (int i=0; i<columns; ++i)
+    {
+        int flags = model->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+
+        if (flags & CSMWorld::ColumnBase::Flag_Dialogue)
+        {
+            layout->addWidget (new QLabel (model->headerData (i, Qt::Horizontal).toString()), i, 0);
+
+            CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>
+                (model->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+
+            QWidget *widget = 0;
+
+            if (model->flags (model->index (0, i)) & Qt::ItemIsEditable)
+            {
+                switch (display)
+                {
+                    case CSMWorld::ColumnBase::Display_String:
+
+                        layout->addWidget (widget = new QLineEdit, i, 1);
+                        break;
+
+                    case CSMWorld::ColumnBase::Display_Integer:
+
+                        /// \todo configure widget properly (range)
+                        layout->addWidget (widget = new QSpinBox, i, 1);
+                        break;
+
+                    case CSMWorld::ColumnBase::Display_Float:
+
+                        /// \todo configure widget properly (range, format?)
+                        layout->addWidget (widget = new QDoubleSpinBox, i, 1);
+                        break;
+                }
+            }
+            else
+            {
+                switch (display)
+                {
+                    case CSMWorld::ColumnBase::Display_String:
+                    case CSMWorld::ColumnBase::Display_Integer:
+                    case CSMWorld::ColumnBase::Display_Float:
+
+                        layout->addWidget (widget = new QLabel, i, 1);
+                        break;
+                }
+            }
+
+            if (widget)
+                mWidgetMapper->addMapping (widget, i);
+        }
+    }
+
+    mWidgetMapper->setCurrentModelIndex (
+        dynamic_cast<CSMWorld::IdTable&> (*model).getModelIndex (id.getId(), 0));
+}
+
+void CSVWorld::DialogueSubView::setEditLock (bool locked)
+{
+
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
new file mode 100644
index 000000000..64715f5b7
--- /dev/null
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -0,0 +1,27 @@
+#ifndef CSV_WORLD_DIALOGUESUBVIEW_H
+#define CSV_WORLD_DIALOGUESUBVIEW_H
+
+#include "../doc/subview.hpp"
+
+class QDataWidgetMapper;
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSVWorld
+{
+    class DialogueSubView : public CSVDoc::SubView
+    {
+            QDataWidgetMapper *mWidgetMapper;
+
+        public:
+
+            DialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document, bool createAndDelete);
+
+            virtual void setEditLock (bool locked);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
new file mode 100644
index 000000000..080a175ea
--- /dev/null
+++ b/apps/opencs/view/world/subviews.cpp
@@ -0,0 +1,16 @@
+
+#include "subviews.hpp"
+
+#include "../doc/subviewfactoryimp.hpp"
+
+#include "tablesubview.hpp"
+#include "dialoguesubview.hpp"
+
+void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
+{
+    manager.add (CSMWorld::UniversalId::Type_Globals,
+        new CSVDoc::SubViewFactoryWithCreateFlag<TableSubView> (true));
+
+    manager.add (CSMWorld::UniversalId::Type_Global,
+        new CSVDoc::SubViewFactoryWithCreateFlag<DialogueSubView> (true));
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/subviews.hpp b/apps/opencs/view/world/subviews.hpp
new file mode 100644
index 000000000..51e4cb083
--- /dev/null
+++ b/apps/opencs/view/world/subviews.hpp
@@ -0,0 +1,14 @@
+#ifndef CSV_WORLD_SUBVIEWS_H
+#define CSV_WORLD_SUBVIEWS_H
+
+namespace CSVDoc
+{
+    class SubViewFactoryManager;
+}
+
+namespace CSVWorld
+{
+    void addSubViewFactories (CSVDoc::SubViewFactoryManager& manager);
+}
+
+#endif
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
new file mode 100644
index 000000000..0721ead2c
--- /dev/null
+++ b/apps/opencs/view/world/table.cpp
@@ -0,0 +1,199 @@
+
+#include "table.hpp"
+
+#include <QHeaderView>
+
+#include <QAction>
+#include <QMenu>
+#include <QContextMenuEvent>
+
+#include "../../model/world/data.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/idtableproxymodel.hpp"
+#include "../../model/world/idtable.hpp"
+#include "../../model/world/record.hpp"
+
+#include "util.hpp"
+
+void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
+{
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    QMenu menu (this);
+
+    ///  \todo add menu items for select all and clear selection
+
+    if (!mEditLock)
+    {
+        if (mCreateAction)
+            menu.addAction (mCreateAction);
+
+        if (listRevertableSelectedIds().size()>0)
+            menu.addAction (mRevertAction);
+
+        if (listDeletableSelectedIds().size()>0)
+            menu.addAction (mDeleteAction);
+    }
+
+    menu.exec (event->globalPos());
+}
+
+std::vector<std::string> CSVWorld::Table::listRevertableSelectedIds() const
+{
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    std::vector<std::string> revertableIds;
+
+    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end(); ++iter)
+    {
+        std::string id = mProxyModel->data (*iter).toString().toStdString();
+
+        CSMWorld::RecordBase::State state =
+            static_cast<CSMWorld::RecordBase::State> (mModel->data (mModel->getModelIndex (id, 1)).toInt());
+
+        if (state!=CSMWorld::RecordBase::State_BaseOnly)
+            revertableIds.push_back (id);
+    }
+
+    return revertableIds;
+}
+
+std::vector<std::string> CSVWorld::Table::listDeletableSelectedIds() const
+{
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    std::vector<std::string> deletableIds;
+
+    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end(); ++iter)
+    {
+        std::string id = mProxyModel->data (*iter).toString().toStdString();
+
+        CSMWorld::RecordBase::State state =
+            static_cast<CSMWorld::RecordBase::State> (mModel->data (mModel->getModelIndex (id, 1)).toInt());
+
+        if (state!=CSMWorld::RecordBase::State_Deleted)
+            deletableIds.push_back (id);
+    }
+
+    return deletableIds;
+}
+
+CSVWorld::Table::Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack,
+    bool createAndDelete)
+: mUndoStack (undoStack), mCreateAction (0), mEditLock (false)
+{
+    mModel = &dynamic_cast<CSMWorld::IdTable&> (*data.getTableModel (id));
+
+    mProxyModel = new CSMWorld::IdTableProxyModel (this);
+    mProxyModel->setSourceModel (mModel);
+
+    setModel (mProxyModel);
+    horizontalHeader()->setResizeMode (QHeaderView::Interactive);
+    verticalHeader()->hide();
+    setSortingEnabled (true);
+    setSelectionBehavior (QAbstractItemView::SelectRows);
+    setSelectionMode (QAbstractItemView::ExtendedSelection);
+
+    int columns = mModel->columnCount();
+
+    for (int i=0; i<columns; ++i)
+    {
+        int flags = mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
+
+        if (flags & CSMWorld::ColumnBase::Flag_Table)
+        {
+            CommandDelegate *delegate = new CommandDelegate (undoStack, this);
+            mDelegates.push_back (delegate);
+            setItemDelegateForColumn (i, delegate);
+        }
+        else
+            hideColumn (i);
+    }
+
+    /// \todo make initial layout fill the whole width of the table
+
+    if (createAndDelete)
+    {
+        mCreateAction = new QAction (tr ("Add Record"), this);
+        connect (mCreateAction, SIGNAL (triggered()), this, SLOT (createRecord()));
+        addAction (mCreateAction);
+    }
+
+    mRevertAction = new QAction (tr ("Revert Record"), this);
+    connect (mRevertAction, SIGNAL (triggered()), this, SLOT (revertRecord()));
+    addAction (mRevertAction);
+
+    mDeleteAction = new QAction (tr ("Delete Record"), this);
+    connect (mDeleteAction, SIGNAL (triggered()), this, SLOT (deleteRecord()));
+    addAction (mDeleteAction);
+}
+
+void CSVWorld::Table::setEditLock (bool locked)
+{
+    for (std::vector<CommandDelegate *>::iterator iter (mDelegates.begin()); iter!=mDelegates.end(); ++iter)
+        (*iter)->setEditLock (locked);
+
+    mEditLock = locked;
+}
+
+CSMWorld::UniversalId CSVWorld::Table::getUniversalId (int row) const
+{
+    return CSMWorld::UniversalId (
+        static_cast<CSMWorld::UniversalId::Type> (mProxyModel->data (mProxyModel->index (row, 2)).toInt()),
+        mProxyModel->data (mProxyModel->index (row, 0)).toString().toStdString());
+}
+
+#include <sstream> /// \todo remove
+void CSVWorld::Table::createRecord()
+{
+    if (!mEditLock)
+    {
+        /// \todo ask the user for an ID instead.
+        static int index = 0;
+
+        std::ostringstream stream;
+        stream << "id" << index++;
+
+        mUndoStack.push (new CSMWorld::CreateCommand (*mProxyModel, stream.str()));
+    }
+}
+
+void CSVWorld::Table::revertRecord()
+{
+    if (!mEditLock)
+    {
+        std::vector<std::string> revertableIds = listRevertableSelectedIds();
+
+        if (revertableIds.size()>0)
+        {
+            if (revertableIds.size()>1)
+                mUndoStack.beginMacro (tr ("Revert multiple records"));
+
+            for (std::vector<std::string>::const_iterator iter (revertableIds.begin()); iter!=revertableIds.end(); ++iter)
+                mUndoStack.push (new CSMWorld::RevertCommand (*mModel, *iter));
+
+            if (revertableIds.size()>1)
+                mUndoStack.endMacro();
+        }
+    }
+}
+
+void CSVWorld::Table::deleteRecord()
+{
+    if (!mEditLock)
+    {
+        std::vector<std::string> deletableIds = listDeletableSelectedIds();
+
+        if (deletableIds.size()>0)
+        {
+            if (deletableIds.size()>1)
+                mUndoStack.beginMacro (tr ("Delete multiple records"));
+
+            for (std::vector<std::string>::const_iterator iter (deletableIds.begin()); iter!=deletableIds.end(); ++iter)
+                mUndoStack.push (new CSMWorld::DeleteCommand (*mModel, *iter));
+
+            if (deletableIds.size()>1)
+                mUndoStack.endMacro();
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
new file mode 100644
index 000000000..df0224583
--- /dev/null
+++ b/apps/opencs/view/world/table.hpp
@@ -0,0 +1,65 @@
+#ifndef CSV_WORLD_TABLE_H
+#define CSV_WORLD_TABLE_H
+
+#include <vector>
+#include <string>
+
+#include <QTableView>
+
+class QUndoStack;
+class QAction;
+
+namespace CSMWorld
+{
+    class Data;
+    class UniversalId;
+    class IdTableProxyModel;
+    class IdTable;
+}
+
+namespace CSVWorld
+{
+    class CommandDelegate;
+
+    ///< Table widget
+    class Table : public QTableView
+    {
+            Q_OBJECT
+
+            std::vector<CommandDelegate *> mDelegates;
+            QUndoStack& mUndoStack;
+            QAction *mCreateAction;
+            QAction *mRevertAction;
+            QAction *mDeleteAction;
+            CSMWorld::IdTableProxyModel *mProxyModel;
+            CSMWorld::IdTable *mModel;
+            bool mEditLock;
+
+        private:
+
+            void contextMenuEvent (QContextMenuEvent *event);
+
+            std::vector<std::string> listRevertableSelectedIds() const;
+
+            std::vector<std::string> listDeletableSelectedIds() const;
+
+        public:
+
+            Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack, bool createAndDelete);
+            ///< \param createAndDelete Allow creation and deletion of records.
+
+            void setEditLock (bool locked);
+
+            CSMWorld::UniversalId getUniversalId (int row) const;
+
+        private slots:
+
+            void createRecord();
+
+            void revertRecord();
+
+            void deleteRecord();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
new file mode 100644
index 000000000..f4deceb49
--- /dev/null
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -0,0 +1,26 @@
+
+#include "tablesubview.hpp"
+
+#include "../../model/doc/document.hpp"
+
+#include "table.hpp"
+
+CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
+    bool createAndDelete)
+: SubView (id)
+{
+    setWidget (mTable = new Table (id, document.getData(), document.getUndoStack(), createAndDelete));
+
+    connect (mTable, SIGNAL (doubleClicked (const QModelIndex&)), this, SLOT (rowActivated (const QModelIndex&)));
+}
+
+void CSVWorld::TableSubView::setEditLock (bool locked)
+{
+    mTable->setEditLock (locked);
+}
+
+void CSVWorld::TableSubView::rowActivated (const QModelIndex& index)
+{
+    /// \todo re-enable, after dialogue sub views have been fixed up
+//    focusId (mTable->getUniversalId (index.row()));
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp
new file mode 100644
index 000000000..0e7b8aa30
--- /dev/null
+++ b/apps/opencs/view/world/tablesubview.hpp
@@ -0,0 +1,35 @@
+#ifndef CSV_WORLD_TABLESUBVIEW_H
+#define CSV_WORLD_TABLESUBVIEW_H
+
+#include "../doc/subview.hpp"
+
+class QModelIndex;
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSVWorld
+{
+    class Table;
+
+    class TableSubView : public CSVDoc::SubView
+    {
+            Q_OBJECT
+
+            Table *mTable;
+
+        public:
+
+            TableSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document, bool createAndDelete);
+
+            virtual void setEditLock (bool locked);
+
+        private slots:
+
+            void rowActivated (const QModelIndex& index);
+    };
+}
+
+#endif
\ No newline at end of file
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
new file mode 100644
index 000000000..7181dd4d1
--- /dev/null
+++ b/apps/opencs/view/world/util.cpp
@@ -0,0 +1,57 @@
+
+#include "util.hpp"
+
+#include <QUndoStack>
+
+#include "../../model/world/commands.hpp"
+
+CSVWorld::NastyTableModelHack::NastyTableModelHack (QAbstractItemModel& model)
+: mModel (model)
+{}
+
+int CSVWorld::NastyTableModelHack::rowCount (const QModelIndex & parent) const
+{
+    return mModel.rowCount (parent);
+}
+
+int CSVWorld::NastyTableModelHack::columnCount (const QModelIndex & parent) const
+{
+    return mModel.columnCount (parent);
+}
+
+QVariant CSVWorld::NastyTableModelHack::data  (const QModelIndex & index, int role) const
+{
+    return mModel.data (index, role);
+}
+
+bool CSVWorld::NastyTableModelHack::setData ( const QModelIndex &index, const QVariant &value, int role)
+{
+    mData = value;
+    return true;
+}
+
+QVariant CSVWorld::NastyTableModelHack::getData() const
+{
+    return mData;
+}
+
+CSVWorld::CommandDelegate::CommandDelegate (QUndoStack& undoStack, QObject *parent)
+: QStyledItemDelegate (parent), mUndoStack (undoStack), mEditLock (false)
+{}
+
+void CSVWorld::CommandDelegate::setModelData (QWidget *editor, QAbstractItemModel *model,
+        const QModelIndex& index) const
+{
+    if (!mEditLock)
+    {
+        NastyTableModelHack hack (*model);
+        QStyledItemDelegate::setModelData (editor, &hack, index);
+        mUndoStack.push (new CSMWorld::ModifyCommand (*model, index, hack.getData()));
+    }
+    ///< \todo provide some kind of feedback to the user, indicating that editing is currently not possible.
+}
+
+void  CSVWorld::CommandDelegate::setEditLock (bool locked)
+{
+    mEditLock = locked;
+}
\ No newline at end of file
diff --git a/apps/opencs/view/world/util.hpp b/apps/opencs/view/world/util.hpp
new file mode 100644
index 000000000..136583118
--- /dev/null
+++ b/apps/opencs/view/world/util.hpp
@@ -0,0 +1,50 @@
+#ifndef CSV_WORLD_UTIL_H
+#define CSV_WORLD_UTIL_H
+
+#include <QAbstractTableModel>
+#include <QStyledItemDelegate>
+
+class QUndoStack;
+
+namespace CSVWorld
+{
+    ///< \brief Getting the data out of an editor widget
+    ///
+    /// Really, Qt? Really?
+    class NastyTableModelHack : public QAbstractTableModel
+    {
+            QAbstractItemModel& mModel;
+            QVariant mData;
+
+        public:
+
+            NastyTableModelHack (QAbstractItemModel& model);
+
+            int rowCount (const QModelIndex & parent = QModelIndex()) const;
+
+            int columnCount (const QModelIndex & parent = QModelIndex()) const;
+
+            QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const;
+
+            bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+
+            QVariant getData() const;
+    };
+
+    ///< \brief Use commands instead of manipulating the model directly
+    class CommandDelegate : public QStyledItemDelegate
+    {
+            QUndoStack& mUndoStack;
+            bool mEditLock;
+
+        public:
+
+            CommandDelegate (QUndoStack& undoStack, QObject *parent);
+
+            void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex& index) const;
+
+            void setEditLock (bool locked);
+    };
+}
+
+#endif
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index e2a2e7f14..482007090 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -16,7 +16,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
 add_openmw_dir (mwrender
     renderingmanager debugging sky player animation npcanimation creatureanimation actors objects
     renderinginterface localmap occlusionquery terrain terrainmaterial water shadows
-    compositors characterpreview externalrendering globalmap
+    compositors characterpreview externalrendering globalmap videoplayer
     )
 
 add_openmw_dir (mwinput
@@ -30,7 +30,7 @@ add_openmw_dir (mwgui
     formatting inventorywindow container hud countdialog tradewindow settingswindow
     confirmationdialog alchemywindow referenceinterface spellwindow mainmenu quickkeysmenu
     itemselection spellbuyingwindow loadingscreen levelupdialog waitdialog spellcreationdialog
-    enchantingdialog trainingwindow travelwindow
+    enchantingdialog trainingwindow travelwindow imagebutton
     )
 
 add_openmw_dir (mwdialogue
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index ffc770b35..cb9396863 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -8,6 +8,7 @@
 
 #include <components/bsa/bsa_archive.hpp>
 #include <components/files/configurationmanager.hpp>
+#include <components/translation/translation.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
 #include <components/nifbullet/bullet_nif_loader.hpp>
@@ -163,9 +164,6 @@ void OMW::Engine::loadBSA()
         dataDirectory = iter->string();
         std::cout << "Data dir " << dataDirectory << std::endl;
         Bsa::addDir(dataDirectory, mFSStrict);
-
-        // Workaround until resource listing capabilities are added to DirArchive, we need those to list available splash screens
-        addResourcesDirectory (dataDirectory);
     }
 }
 
@@ -255,18 +253,9 @@ void OMW::Engine::setNewGame(bool newGame)
     mNewGame = newGame;
 }
 
-// Initialise and enter main loop.
-
-void OMW::Engine::go()
+std::string OMW::Engine::loadSettings (Settings::Manager & settings)
 {
-    assert (!mCellName.empty());
-    assert (!mMaster.empty());
-    assert (!mOgre);
-
-    mOgre = new OEngine::Render::OgreRenderer;
-
     // Create the settings manager and load default settings file
-    Settings::Manager settings;
     const std::string localdefault = mCfgMgr.getLocalPath().string() + "/settings-default.cfg";
     const std::string globaldefault = mCfgMgr.getGlobalPath().string() + "/settings-default.cfg";
 
@@ -287,10 +276,6 @@ void OMW::Engine::go()
     else if (boost::filesystem::exists(globaldefault))
         settings.loadUser(globaldefault);
 
-    // Get the path for the keybinder xml file
-    std::string keybinderUser = (mCfgMgr.getUserPath() / "input.xml").string();
-    bool keybinderUserExists = boost::filesystem::exists(keybinderUser);
-
     mFpsLevel = settings.getInt("fps", "HUD");
 
     // load nif overrides
@@ -300,6 +285,13 @@ void OMW::Engine::go()
     else if (boost::filesystem::exists(mCfgMgr.getGlobalPath().string() + "/transparency-overrides.cfg"))
         nifOverrides.loadTransparencyOverrides(mCfgMgr.getGlobalPath().string() + "/transparency-overrides.cfg");
 
+    return settingspath;
+}
+
+void OMW::Engine::prepareEngine (Settings::Manager & settings)
+{
+    Nif::NIFFile::CacheLock cachelock;
+
     std::string renderSystem = settings.getString("render system", "Video");
     if (renderSystem == "")
     {
@@ -309,6 +301,9 @@ void OMW::Engine::go()
         renderSystem = "OpenGL Rendering Subsystem";
 #endif
     }
+
+    mOgre = new OEngine::Render::OgreRenderer;
+    
     mOgre->configure(
         mCfgMgr.getLogPath().string(),
         renderSystem,
@@ -345,14 +340,19 @@ void OMW::Engine::go()
 
     // Create the world
     mEnvironment.setWorld( new MWWorld::World (*mOgre, mFileCollections, mMaster, mPlugins,
-        mResDir, mCfgMgr.getCachePath(), mNewGame, mEncoding, mFallbackMap) );
+        mResDir, mCfgMgr.getCachePath(), mNewGame, mEncoder, mFallbackMap,
+        mActivationDistanceOverride));
+
+    //Load translation data
+    mTranslationDataStorage.setEncoder(mEncoder);
+    mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[0]);
 
     // Create window manager - this manages all the MW-specific GUI windows
     MWScript::registerExtensions (mExtensions);
 
     mEnvironment.setWindowManager (new MWGui::WindowManager(
         mExtensions, mFpsLevel, mNewGame, mOgre, mCfgMgr.getLogPath().string() + std::string("/"),
-        mCfgMgr.getCachePath ().string(), mScriptConsoleMode));
+        mCfgMgr.getCachePath ().string(), mScriptConsoleMode, mTranslationDataStorage));
 
     // Create sound system
     mEnvironment.setSoundManager (new MWSound::SoundManager(mUseSound));
@@ -369,9 +369,14 @@ void OMW::Engine::go()
 
     // Create dialog system
     mEnvironment.setJournal (new MWDialogue::Journal);
-    mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mVerboseScripts));
+    mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mVerboseScripts, mTranslationDataStorage));
 
     // Sets up the input system
+
+    // Get the path for the keybinder xml file
+    std::string keybinderUser = (mCfgMgr.getUserPath() / "input.xml").string();
+    bool keybinderUserExists = boost::filesystem::exists(keybinderUser);
+
     mEnvironment.setInputManager (new MWInput::InputManager (*mOgre,
         MWBase::Environment::get().getWorld()->getPlayer(),
          *MWBase::Environment::get().getWindowManager(), mDebug, *this, keybinderUser, keybinderUserExists));
@@ -395,13 +400,8 @@ void OMW::Engine::go()
         MWBase::Environment::get().getWorld()->changeToInteriorCell (mCellName, pos);
     }
 
-    std::cout << "\nPress Q/ESC or close window to exit.\n";
-
     mOgre->getRoot()->addFrameListener (this);
 
-    // Play some good 'ol tunes
-    MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
-
     // scripts
     if (mCompileAll)
     {
@@ -414,10 +414,35 @@ void OMW::Engine::go()
                 << "%)"
                 << std::endl;
     }
+}
+
+// Initialise and enter main loop.
+
+void OMW::Engine::go()
+{
+    assert (!mCellName.empty());
+    assert (!mMaster.empty());
+    assert (!mOgre);
+
+    Settings::Manager settings;
+	std::string settingspath;
+
+    settingspath = loadSettings (settings);
+
+    // Create encoder
+    ToUTF8::Utf8Encoder encoder (mEncoding);
+    mEncoder = &encoder;
+
+    prepareEngine (settings);
+
+    // Play some good 'ol tunes
+    MWBase::Environment::get().getSoundManager()->playPlaylist(std::string("Explore"));
 
     if (!mStartupScript.empty())
         MWBase::Environment::get().getWindowManager()->executeInConsole (mStartupScript);
 
+    std::cout << "\nPress Q/ESC or close window to exit.\n";
+
     // Start the main rendering loop
     mOgre->start();
 
@@ -432,12 +457,7 @@ void OMW::Engine::activate()
     if (MWBase::Environment::get().getWindowManager()->isGuiMode())
         return;
 
-    std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
-
-    if (handle.empty())
-        return;
-
-    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaHandle (handle);
+    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getFacedObject();
 
     if (ptr.isEmpty())
         return;
@@ -500,7 +520,7 @@ void OMW::Engine::showFPS(int level)
     mFpsLevel = level;
 }
 
-void OMW::Engine::setEncoding(const std::string& encoding)
+void OMW::Engine::setEncoding(const ToUTF8::FromType& encoding)
 {
     mEncoding = encoding;
 }
@@ -519,3 +539,9 @@ void OMW::Engine::setStartupScript (const std::string& path)
 {
     mStartupScript = path;
 }
+
+
+void OMW::Engine::setActivationDistanceOverride (int distance)
+{
+    mActivationDistanceOverride = distance;
+}
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 7fd27b36b..572d1013e 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -5,6 +5,8 @@
 
 #include <components/compiler/extensions.hpp>
 #include <components/files/collections.hpp>
+#include <components/translation/translation.hpp>
+#include <components/settings/settings.hpp>
 
 #include "mwbase/environment.hpp"
 
@@ -59,7 +61,8 @@ namespace OMW
     class Engine : private Ogre::FrameListener
     {
             MWBase::Environment mEnvironment;
-            std::string mEncoding;
+            ToUTF8::FromType mEncoding;
+            ToUTF8::Utf8Encoder* mEncoder;
             Files::PathContainer mDataDirs;
             boost::filesystem::path mResDir;
             OEngine::Render::OgreRenderer *mOgre;
@@ -76,13 +79,14 @@ namespace OMW
             std::map<std::string,std::string> mFallbackMap;
             bool mScriptConsoleMode;
             std::string mStartupScript;
+            int mActivationDistanceOverride;
 
             Compiler::Extensions mExtensions;
             Compiler::Context *mScriptContext;
 
-
             Files::Collections mFileCollections;
             bool mFSStrict;
+            Translation::Storage mTranslationDataStorage;
 
             // not implemented
             Engine (const Engine&);
@@ -102,6 +106,12 @@ namespace OMW
 
             virtual bool frameRenderingQueued (const Ogre::FrameEvent& evt);
 
+            /// Load settings from various files, returns the path to the user settings file
+            std::string loadSettings (Settings::Manager & settings);
+
+            /// Prepare engine for game play
+            void prepareEngine (Settings::Manager & settings);
+
         public:
             Engine(Files::ConfigurationManager& configurationManager);
             virtual ~Engine();
@@ -158,7 +168,7 @@ namespace OMW
             void setCompileAll (bool all);
 
             /// Font encoding
-            void setEncoding(const std::string& encoding);
+            void setEncoding(const ToUTF8::FromType& encoding);
 
             void setAnimationVerbose(bool animverbose);
 
@@ -170,6 +180,9 @@ namespace OMW
             /// Set path for a script that is run on startup in the console.
             void setStartupScript (const std::string& path);
 
+            /// Override the game setting specified activation distance.
+            void setActivationDistanceOverride (int distance);
+
         private:
             Files::ConfigurationManager& mCfgMgr;
     };
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index eb58da442..1be669ae0 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -131,9 +131,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
             ->default_value(false), "enable console-only script functionality")
 
         ("script-run", bpo::value<std::string>()->default_value(""),
-            "select a file that is executed in the console on startup\n\n"
-            "Note: The file contains a list of script lines, but not a complete scripts. "
-            "That means no begin/end and no variable declarations.")
+            "select a file containing a list of console commands that is executed on startup")
 
         ("new-game", bpo::value<bool>()->implicit_value(true)
             ->default_value(false), "activate char gen/new game mechanics")
@@ -151,6 +149,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("fallback", bpo::value<FallbackMap>()->default_value(FallbackMap(), "")
             ->multitoken()->composing(), "fallback values")
 
+        ("activate-dist", bpo::value <int> ()->default_value (-1), "activation distance override");
+
         ;
 
     bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv)
@@ -183,21 +183,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
 
     // Font encoding settings
     std::string encoding(variables["encoding"].as<std::string>());
-    if (encoding == "win1250")
-    {
-      std::cout << "Using Central and Eastern European font encoding." << std::endl;
-      engine.setEncoding(encoding);
-    }
-    else if (encoding == "win1251")
-    {
-      std::cout << "Using Cyrillic font encoding." << std::endl;
-      engine.setEncoding(encoding);
-    }
-    else
-    {
-      std::cout << "Using default (English) font encoding." << std::endl;
-      engine.setEncoding("win1252");
-    }
+    std::cout << ToUTF8::encodingUsingMessage(encoding) << std::endl;
+    engine.setEncoding(ToUTF8::calculateEncoding(encoding));
 
     // directory settings
     engine.enableFSStrict(variables["fs-strict"].as<bool>());
@@ -252,6 +239,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.setFallbackValues(variables["fallback"].as<FallbackMap>().mMap);
     engine.setScriptConsoleMode (variables["script-console"].as<bool>());
     engine.setStartupScript (variables["script-run"].as<std::string>());
+    engine.setActivationDistanceOverride (variables["activate-dist"].as<int>());
 
     return true;
 }
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 9aaa5af85..5a13a50ec 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -128,12 +128,6 @@ float MWBase::Environment::getFrameDuration() const
 
 void MWBase::Environment::cleanup()
 {
-    delete mInputManager;
-    mInputManager = 0;
-
-    delete mSoundManager;
-    mSoundManager = 0;
-
     delete mMechanicsManager;
     mMechanicsManager = 0;
 
@@ -146,11 +140,17 @@ void MWBase::Environment::cleanup()
     delete mScriptManager;
     mScriptManager = 0;
 
+    delete mWorld;
+    mWorld = 0;
+
+    delete mSoundManager;
+    mSoundManager = 0;
+
     delete mWindowManager;
     mWindowManager = 0;
 
-    delete mWorld;
-    mWorld = 0;
+    delete mInputManager;
+    mInputManager = 0;
 }
 
 const MWBase::Environment& MWBase::Environment::get()
diff --git a/apps/openmw/mwbase/soundmanager.hpp b/apps/openmw/mwbase/soundmanager.hpp
index 92c177ff3..5d396fac0 100644
--- a/apps/openmw/mwbase/soundmanager.hpp
+++ b/apps/openmw/mwbase/soundmanager.hpp
@@ -22,6 +22,8 @@ namespace MWWorld
 namespace MWSound
 {
     class Sound;
+    class Sound_Decoder;
+    typedef boost::shared_ptr<Sound_Decoder> DecoderPtr;
 }
 
 namespace MWBase
@@ -32,7 +34,7 @@ namespace MWBase
     class SoundManager
     {
         public:
-
+            /* These must all fit together */
             enum PlayMode {
                 Play_Normal  = 0, /* tracked, non-looping, multi-instance, environment */
                 Play_Loop    = 1<<0, /* Sound will continually loop until explicitly stopped */
@@ -41,6 +43,13 @@ namespace MWBase
                                       * but do not keep it updated (the sound will not move with
                                       * the object and will not stop when the object is deleted. */
             };
+            enum PlayType {
+                Play_TypeSfx   = 1<<3, /* Normal SFX sound */
+                Play_TypeVoice = 1<<4, /* Voice sound */
+                Play_TypeMusic = 1<<5, /* Music track */
+                Play_TypeMovie = 1<<6, /* Movie audio track */
+                Play_TypeMask  = Play_TypeSfx|Play_TypeVoice|Play_TypeMusic|Play_TypeMovie
+            };
 
         private:
 
@@ -75,7 +84,7 @@ namespace MWBase
             ///< Start playing music from the selected folder
             /// \param name of the folder that contains the playlist
 
-            virtual void say(MWWorld::Ptr reference, const std::string& filename) = 0;
+            virtual void say(const MWWorld::Ptr &reference, const std::string& filename) = 0;
             ///< Make an actor say some text.
             /// \param filename name of a sound file in "Sound/" in the data directory.
 
@@ -83,24 +92,27 @@ namespace MWBase
             ///< Say some text, without an actor ref
             /// \param filename name of a sound file in "Sound/" in the data directory.
 
-            virtual bool sayDone(MWWorld::Ptr reference=MWWorld::Ptr()) const = 0;
+            virtual bool sayDone(const MWWorld::Ptr &reference=MWWorld::Ptr()) const = 0;
             ///< Is actor not speaking?
 
-            virtual void stopSay(MWWorld::Ptr reference=MWWorld::Ptr()) = 0;
+            virtual void stopSay(const MWWorld::Ptr &reference=MWWorld::Ptr()) = 0;
             ///< Stop an actor speaking
 
+            virtual SoundPtr playTrack(const MWSound::DecoderPtr& decoder, PlayType type) = 0;
+            ///< Play a 2D audio track, using a custom decoder
+
             virtual SoundPtr playSound(const std::string& soundId, float volume, float pitch,
-                int mode=Play_Normal) = 0;
+                                       PlayMode mode=Play_Normal) = 0;
             ///< Play a sound, independently of 3D-position
 
-            virtual SoundPtr playSound3D(MWWorld::Ptr reference, const std::string& soundId,
-                                 float volume, float pitch, int mode=Play_Normal) = 0;
+            virtual SoundPtr playSound3D(const MWWorld::Ptr &reference, const std::string& soundId,
+                                         float volume, float pitch, PlayMode mode=Play_Normal) = 0;
             ///< Play a sound from an object
 
-            virtual void stopSound3D(MWWorld::Ptr reference, const std::string& soundId) = 0;
+            virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId) = 0;
             ///< Stop the given object from playing the given sound,
 
-            virtual void stopSound3D(MWWorld::Ptr reference) = 0;
+            virtual void stopSound3D(const MWWorld::Ptr &reference) = 0;
             ///< Stop the given object from playing all sounds.
 
             virtual void stopSound(const MWWorld::CellStore *cell) = 0;
@@ -109,18 +121,19 @@ namespace MWBase
             virtual void stopSound(const std::string& soundId) = 0;
             ///< Stop a non-3d looping sound
 
-            virtual bool getSoundPlaying(MWWorld::Ptr reference, const std::string& soundId) const = 0;
+            virtual bool getSoundPlaying(const MWWorld::Ptr &reference, const std::string& soundId) const = 0;
             ///< Is the given sound currently playing on the given object?
 
+            virtual void pauseSounds(int types=Play_TypeMask) = 0;
+            ///< Pauses all currently playing sounds, including music.
+
+            virtual void resumeSounds(int types=Play_TypeMask) = 0;
+            ///< Resumes all previously paused sounds.
+
             virtual void update(float duration) = 0;
 
             virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir, const Ogre::Vector3 &up) = 0;
     };
-
-    inline int operator|(SoundManager::PlayMode a, SoundManager::PlayMode b)
-    { return static_cast<int> (a) | static_cast<int> (b); }
-    inline int operator&(SoundManager::PlayMode a, SoundManager::PlayMode b)
-    { return static_cast<int> (a) & static_cast<int> (b); }
 }
 
 #endif
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index c177912d4..30bfced06 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -7,6 +7,8 @@
 
 #include <components/settings/settings.hpp>
 
+#include <components/translation/translation.hpp>
+
 #include "../mwmechanics/stat.hpp"
 
 #include "../mwgui/mode.hpp"
@@ -233,6 +235,8 @@ namespace MWBase
             virtual void startSpellMaking(MWWorld::Ptr actor) = 0;
             virtual void startEnchanting(MWWorld::Ptr actor) = 0;
             virtual void startTraining(MWWorld::Ptr actor) = 0;
+
+            virtual const Translation::Storage& getTranslationDataStorage() const = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index f594f0566..a1b884411 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -45,6 +45,7 @@ namespace MWWorld
     class Ptr;
     class TimeStamp;
     class ESMStore;
+    class RefData;
 }
 
 namespace MWBase
@@ -133,6 +134,13 @@ namespace MWBase
 
             virtual char getGlobalVariableType (const std::string& name) const = 0;
             ///< Return ' ', if there is no global variable with this name.
+            
+            virtual std::vector<std::string> getGlobals () const = 0;
+
+            virtual std::string getCurrentCellName() const = 0;
+
+            virtual void removeRefScript (MWWorld::RefData *ref) = 0;
+            //< Remove the script attached to ref from mLocalScripts
 
             virtual MWWorld::Ptr getPtr (const std::string& name, bool activeOnly) = 0;
             ///< Return a pointer to a liveCellRef with the given name.
@@ -195,8 +203,8 @@ namespace MWBase
 
             virtual void markCellAsUnchanged() = 0;
 
-            virtual std::string getFacedHandle() = 0;
-            ///< Return handle of the object the player is looking at
+            virtual MWWorld::Ptr  getFacedObject() = 0;
+            ///< Return pointer to the object the player is looking at, if it is within activation range
 
             virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
 
@@ -276,7 +284,7 @@ namespace MWBase
             /// @param cursor Y (relative 0-1)
             /// @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& object) = 0;
+            virtual void dropObjectOnGround (const MWWorld::Ptr& actor, const MWWorld::Ptr& object) = 0;
 
             virtual bool canPlaceObject (float cursorX, float cursorY) = 0;
             ///< @return true if it is possible to place on object at specified cursor location
@@ -302,6 +310,11 @@ namespace MWBase
             /// 1 - only waiting \n
             /// 2 - player is underwater \n
             /// 3 - enemies are nearby (not implemented)
+
+
+            /// \todo this does not belong here
+            virtual void playVideo(const std::string& name, bool allowSkipping) = 0;
+            virtual void stopVideo() = 0;
     };
 }
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 76c1c40f1..bbe005955 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -97,11 +97,11 @@ namespace MWClass
 
         // make key id lowercase
         std::string keyId = ptr.getCellRef().mKey;
-        std::transform(keyId.begin(), keyId.end(), keyId.begin(), ::tolower);
+        Misc::StringUtils::toLower(keyId);
         for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
         {
             std::string refId = it->getCellRef().mRefID;
-            std::transform(refId.begin(), refId.end(), refId.begin(), ::tolower);
+            Misc::StringUtils::toLower(refId);
             if (refId == keyId)
             {
                 hasKey = true;
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 843d1af4c..fb6329939 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -84,11 +84,11 @@ namespace MWClass
 
         // make key id lowercase
         std::string keyId = ptr.getCellRef().mKey;
-        std::transform(keyId.begin(), keyId.end(), keyId.begin(), ::tolower);
+        Misc::StringUtils::toLower(keyId);
         for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
         {
             std::string refId = it->getCellRef().mRefID;
-            std::transform(refId.begin(), refId.end(), refId.begin(), ::tolower);
+            Misc::StringUtils::toLower(refId);
             if (refId == keyId)
             {
                 hasKey = true;
@@ -204,33 +204,10 @@ namespace MWClass
 
         std::string text;
 
-        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
-
         if (ref->mRef.mTeleport)
         {
-            std::string dest;
-            if (ref->mRef.mDestCell != "")
-            {
-                // door leads to an interior, use interior name as tooltip
-                dest = ref->mRef.mDestCell;
-            }
-            else
-            {
-                // door leads to exterior, use cell name (if any), otherwise translated region name
-                int x,y;
-                MWBase::Environment::get().getWorld()->positionToIndex (ref->mRef.mDoorDest.pos[0], ref->mRef.mDoorDest.pos[1], x, y);
-                const ESM::Cell* cell = store.get<ESM::Cell>().find(x,y);
-                if (cell->mName != "")
-                    dest = cell->mName;
-                else
-                {
-                    const ESM::Region* region =
-                        store.get<ESM::Region>().find(cell->mRegion);
-                    dest = region->mName;
-                }
-            }
             text += "\n#{sTo}";
-            text += "\n"+dest;
+            text += "\n" + getDestination(*ref);
         }
 
         if (ref->mRef.mLockLevel > 0)
@@ -246,6 +223,37 @@ namespace MWClass
         return info;
     }
 
+    std::string Door::getDestination (const MWWorld::LiveCellRef<ESM::Door>& door)
+    {
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+
+        std::string dest;
+        if (door.mRef.mDestCell != "")
+        {
+            // door leads to an interior, use interior name as tooltip
+            dest = door.mRef.mDestCell;
+        }
+        else
+        {
+            // door leads to exterior, use cell name (if any), otherwise translated region name
+            int x,y;
+            MWBase::Environment::get().getWorld()->positionToIndex (door.mRef.mDoorDest.pos[0], door.mRef.mDoorDest.pos[1], x, y);
+            const ESM::Cell* cell = store.get<ESM::Cell>().find(x,y);
+            if (cell->mName != "")
+                dest = cell->mName;
+            else
+            {
+                const ESM::Region* region =
+                    store.get<ESM::Region>().find(cell->mRegion);
+
+                //name as is, not a token
+                return region->mName;
+            }
+        }
+
+        return "#{sCell=" + dest + "}";
+    }
+
     MWWorld::Ptr
     Door::copyToCellImpl(const MWWorld::Ptr &ptr, MWWorld::CellStore &cell) const
     {
diff --git a/apps/openmw/mwclass/door.hpp b/apps/openmw/mwclass/door.hpp
index b0f86f12d..05ba0248b 100644
--- a/apps/openmw/mwclass/door.hpp
+++ b/apps/openmw/mwclass/door.hpp
@@ -31,6 +31,9 @@ namespace MWClass
             virtual MWGui::ToolTipInfo getToolTipInfo (const MWWorld::Ptr& ptr) const;
             ///< @return the content of the tool tip to be displayed. raises exception if the object has no tooltip.
 
+            static std::string getDestination (const MWWorld::LiveCellRef<ESM::Door>& door);
+            ///< @return destination cell name or token
+
             virtual void lock (const MWWorld::Ptr& ptr, int lockLevel) const;
             ///< Lock object
 
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index 1be8d66b3..7ad8f1b47 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -12,6 +12,9 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/physicssystem.hpp"
 #include "../mwworld/actioneat.hpp"
+#include "../mwworld/player.hpp"
+
+#include "../mwmechanics/npcstats.hpp"
 
 #include "../mwgui/tooltips.hpp"
 
@@ -154,6 +157,10 @@ namespace MWClass
             text += MWGui::ToolTips::getMiscString(ref->mBase->mScript, "Script");
         }
 
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer();
+        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(player).getNpcStats (player);
+        int alchemySkill = npcStats.getSkill (ESM::Skill::Alchemy).getBase();
+
         MWGui::Widgets::SpellEffectList list;
         for (int i=0; i<4; ++i)
         {
@@ -163,6 +170,12 @@ namespace MWClass
             params.mEffectID = ref->mBase->mData.mEffectID[i];
             params.mAttribute = ref->mBase->mData.mAttributes[i];
             params.mSkill = ref->mBase->mData.mSkills[i];
+
+            params.mKnown = ( (i == 0 && alchemySkill >= 15)
+                 || (i == 1 && alchemySkill >= 30)
+                 || (i == 2 && alchemySkill >= 45)
+                 || (i == 3 && alchemySkill >= 60));
+
             list.push_back(params);
         }
         info.effects = list;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 83a002447..cfbc64b87 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -65,7 +65,7 @@ namespace MWClass
             if (!ref->mBase->mFaction.empty())
             {
                 std::string faction = ref->mBase->mFaction;
-                boost::algorithm::to_lower(faction);
+                Misc::StringUtils::toLower(faction);
                 if(ref->mBase->mNpdt52.mGold != -10)
                 {
                     data->mNpcStats.getFactionRanks()[faction] = (int)ref->mBase->mNpdt52.mRank;
@@ -100,14 +100,15 @@ namespace MWClass
             }
             else
             {
-                /// \todo do something with mNpdt12 maybe:p
                 for (int i=0; i<8; ++i)
                     data->mCreatureStats.getAttribute (i).set (10);
 
                 for (int i=0; i<3; ++i)
                     data->mCreatureStats.setDynamic (i, 10);
 
-                data->mCreatureStats.setLevel (1);
+                data->mCreatureStats.setLevel(ref->mBase->mNpdt12.mLevel);
+                data->mNpcStats.setBaseDisposition(ref->mBase->mNpdt12.mDisposition);
+                data->mNpcStats.setReputation(ref->mBase->mNpdt12.mReputation);
             }
 
             data->mCreatureStats.setAiSetting (0, ref->mBase->mAiData.mHello);
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index a97cf98de..f548c46f7 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -16,9 +16,11 @@
 #include <components/compiler/scriptparser.hpp>
 
 #include <components/interpreter/interpreter.hpp>
+#include <components/interpreter/defines.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/journal.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -39,47 +41,14 @@
 
 #include "filter.hpp"
 
-namespace
-{
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-
-    bool stringCompareNoCase (std::string first, std::string second)
-    {
-        unsigned int i=0;
-        while ( (i<first.length()) && (i<second.length()) )
-        {
-            if (tolower(first[i])<tolower(second[i])) return true;
-            else if (tolower(first[i])>tolower(second[i])) return false;
-            ++i;
-        }
-        if (first.length()<second.length())
-            return true;
-        else
-            return false;
-    }
-
-    //helper function
-    std::string::size_type find_str_ci(const std::string& str, const std::string& substr,size_t pos)
-    {
-        return toLower(str).find(toLower(substr),pos);
-    }
-}
-
 namespace MWDialogue
 {
-    DialogueManager::DialogueManager (const Compiler::Extensions& extensions, bool scriptVerbose) :
+    DialogueManager::DialogueManager (const Compiler::Extensions& extensions, bool scriptVerbose, Translation::Storage& translationDataStorage) :
       mCompilerContext (MWScript::CompilerContext::Type_Dialgoue),
         mErrorStream(std::cout.rdbuf()),mErrorHandler(mErrorStream)
       , mTemporaryDispositionChange(0.f)
       , mPermanentDispositionChange(0.f), mScriptVerbose (scriptVerbose)
+      , mTranslationDataStorage(translationDataStorage)
     {
         mChoice = -1;
         mIsInChoice = false;
@@ -93,26 +62,55 @@ namespace MWDialogue
         MWWorld::Store<ESM::Dialogue>::iterator it = dialogs.begin();
         for (; it != dialogs.end(); ++it)
         {
-            mDialogueMap[toLower(it->mId)] = *it;
+            mDialogueMap[Misc::StringUtils::lowerCase(it->mId)] = *it;
         }
     }
 
     void DialogueManager::addTopic (const std::string& topic)
     {
-        mKnownTopics[toLower(topic)] = true;
+        mKnownTopics[Misc::StringUtils::lowerCase(topic)] = true;
     }
 
     void DialogueManager::parseText (const std::string& text)
     {
-        std::list<std::string>::iterator it;
-        for(it = mActorKnownTopics.begin();it != mActorKnownTopics.end();++it)
+        std::vector<HyperTextToken> hypertext = ParseHyperText(text);
+
+        //calculation of standard form fir all hyperlinks
+        for (size_t i = 0; i < hypertext.size(); ++i)
         {
-            size_t pos = find_str_ci(text,*it,0);
-            if(pos !=std::string::npos)
+            if (hypertext[i].mLink)
             {
-                mKnownTopics[*it] = true;
+                size_t asterisk_count = MWDialogue::RemovePseudoAsterisks(hypertext[i].mText);
+                for(; asterisk_count > 0; --asterisk_count)
+                    hypertext[i].mText.append("*");
+
+                hypertext[i].mText = mTranslationDataStorage.topicStandardForm(hypertext[i].mText);
             }
         }
+
+        for (size_t i = 0; i < hypertext.size(); ++i)
+        {
+            std::list<std::string>::iterator it;
+            for(it = mActorKnownTopics.begin(); it != mActorKnownTopics.end(); ++it)
+            {
+                if (hypertext[i].mLink)
+                {
+                    if( hypertext[i].mText == *it )
+                    {
+                        mKnownTopics[hypertext[i].mText] = true;
+                    }
+                }
+                else if( !mTranslationDataStorage.hasTranslation() )
+                {
+                    size_t pos = Misc::StringUtils::lowerCase(hypertext[i].mText).find(*it, 0);
+                    if(pos !=std::string::npos)
+                    {
+                        mKnownTopics[*it] = true;
+                    }
+                }
+            }
+        }
+
         updateTopics();
     }
 
@@ -125,15 +123,9 @@ namespace MWDialogue
 
         MWMechanics::CreatureStats& creatureStats = MWWorld::Class::get (actor).getCreatureStats (actor);
         mTalkedTo = creatureStats.hasTalkedToPlayer();
-        creatureStats.talkedToPlayer();
 
         mActorKnownTopics.clear();
 
-        //initialise the GUI
-        MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue);
-        MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
-        win->startDialogue(actor, MWWorld::Class::get (actor).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();
 
@@ -147,15 +139,25 @@ namespace MWDialogue
         {
             if(it->mType == ESM::Dialogue::Greeting)
             {
-                if (const ESM::DialInfo *info = filter.search (*it))
+                // Search a response (we do not accept a fallback to "Info refusal" here)
+                if (const ESM::DialInfo *info = filter.search (*it, false))
                 {
+                    //initialise the GUI
+                    MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue);
+                    MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
+                    win->startDialogue(actor, MWWorld::Class::get (actor).getName (actor));
+
+                    creatureStats.talkedToPlayer();
+
                     if (!info->mSound.empty())
                     {
                         // TODO play sound
                     }
 
                     parseText (info->mResponse);
-                    win->addText (info->mResponse);
+
+                    MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+                    win->addText (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
                     executeScript (info->mResultScript);
                     mLastTopic = it->mId;
                     mLastDialogue = *info;
@@ -238,6 +240,53 @@ namespace MWDialogue
         }
     }
 
+    void DialogueManager::executeTopic (const std::string& topic)
+    {
+        Filter filter (mActor, mChoice, mTalkedTo);
+
+        const MWWorld::Store<ESM::Dialogue> &dialogues =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+
+        const ESM::Dialogue& dialogue = *dialogues.find (topic);
+
+        MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
+
+        if (const ESM::DialInfo *info = filter.search (dialogue, true))
+        {
+            parseText (info->mResponse);
+
+            if (dialogue.mType==ESM::Dialogue::Persuasion)
+            {
+                std::string modifiedTopic = "s" + topic;
+
+                modifiedTopic.erase (std::remove (modifiedTopic.begin(), modifiedTopic.end(), ' '), modifiedTopic.end());
+
+                const MWWorld::Store<ESM::GameSetting>& gmsts =
+                    MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+
+                win->addTitle (gmsts.find (modifiedTopic)->getString());
+            }
+            else
+                win->addTitle (topic);
+
+            MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+            win->addText (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
+            MWBase::Environment::get().getJournal()->addTopic (topic, info->mId);
+
+            executeScript (info->mResultScript);
+
+            mLastTopic = topic;
+            mLastDialogue = *info;
+        }
+        else
+        {
+            // no response found, print a fallback text
+            win->addTitle (topic);
+            win->addText ("…");
+
+        }
+    }
+
     void DialogueManager::updateTopics()
     {
         std::list<std::string> keywordList;
@@ -254,12 +303,13 @@ namespace MWDialogue
         {
             if (iter->mType == ESM::Dialogue::Topic)
             {
-                if (filter.search (*iter))
+                if (filter.responseAvailable (*iter))
                 {
-                    mActorKnownTopics.push_back (toLower (iter->mId));
+                    std::string lower = Misc::StringUtils::lowerCase(iter->mId);
+                    mActorKnownTopics.push_back (lower);
 
                     //does the player know the topic?
-                    if (mKnownTopics.find (toLower (iter->mId)) != mKnownTopics.end())
+                    if (mKnownTopics.find (lower) != mKnownTopics.end())
                     {
                         keywordList.push_back (iter->mId);
                     }
@@ -317,7 +367,7 @@ namespace MWDialogue
         win->setServices (windowServices);
 
         // sort again, because the previous sort was case-sensitive
-        keywordList.sort(stringCompareNoCase);
+        keywordList.sort(Misc::StringUtils::ciEqual);
         win->setKeywords(keywordList);
 
         mChoice = choice;
@@ -332,24 +382,7 @@ namespace MWDialogue
                 ESM::Dialogue ndialogue = mDialogueMap[keyword];
                 if (mDialogueMap[keyword].mType == ESM::Dialogue::Topic)
                 {
-                    Filter filter (mActor, mChoice, mTalkedTo);
-
-                    if (const ESM::DialInfo *info = filter.search (mDialogueMap[keyword]))
-                    {
-                        std::string text = info->mResponse;
-                        std::string script = info->mResultScript;
-
-                        parseText (text);
-
-                        MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
-                        win->addTitle (keyword);
-                        win->addText (info->mResponse);
-
-                        executeScript (script);
-
-                        mLastTopic = keyword;
-                        mLastDialogue = *info;
-                    }
+                    executeTopic (keyword);
                 }
             }
         }
@@ -359,6 +392,10 @@ namespace MWDialogue
 
     void DialogueManager::goodbyeSelected()
     {
+        // Do not close the dialogue window if the player has to answer a question
+        if (mIsInChoice)
+            return;
+
         MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
 
         // Apply disposition change to NPC's base disposition
@@ -383,14 +420,17 @@ namespace MWDialogue
                 {
                     Filter filter (mActor, mChoice, mTalkedTo);
 
-                    if (const ESM::DialInfo *info = filter.search (mDialogueMap[mLastTopic]))
+                    if (const ESM::DialInfo *info = filter.search (mDialogueMap[mLastTopic], true))
                     {
                         mChoiceMap.clear();
                         mChoice = -1;
                         mIsInChoice = false;
                         std::string text = info->mResponse;
                         parseText (text);
-                        MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addText (text);
+
+                        MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
+                        MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addText (Interpreter::fixDefinesDialog(text, interpreterContext));
+                        MWBase::Environment::get().getJournal()->addTopic (mLastTopic, info->mId);
                         executeScript (info->mResultScript);
                         mLastTopic = mLastTopic;
                         mLastDialogue = *info;
@@ -412,7 +452,7 @@ namespace MWDialogue
     {
         MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
         win->askQuestion(question);
-        mChoiceMap[toLower(question)] = choice;
+        mChoiceMap[Misc::StringUtils::lowerCase(question)] = choice;
         mIsInChoice = true;
     }
 
@@ -445,30 +485,22 @@ namespace MWDialogue
         else if (curDisp + mTemporaryDispositionChange > 100)
             mTemporaryDispositionChange = 100 - curDisp;
 
-        // practice skill
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+        MWWorld::Class::get(player).skillUsageSucceeded(player, ESM::Skill::Speechcraft, success ? 0 : 1);
 
-        if (success)
-            MWWorld::Class::get(player).skillUsageSucceeded(player, ESM::Skill::Speechcraft, 0);
-
-        // add status message to dialogue window
         std::string text;
 
         if (type == MWBase::MechanicsManager::PT_Admire)
-            text = "sAdmire";
+            text = "Admire";
         else if (type == MWBase::MechanicsManager::PT_Taunt)
-            text = "sTaunt";
+            text = "Taunt";
         else if (type == MWBase::MechanicsManager::PT_Intimidate)
-            text = "sIntimidate";
-        else
-            text = "sBribe";
+            text = "Intimidate";
+        else{
+            text = "Bribe";
+        }
 
-        text += (success ? "Success" : "Fail");
-
-        MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
-        win->addTitle(MyGUI::LanguageManager::getInstance().replaceTags("#{"+text+"}"));
-
-        /// \todo text from INFO record, how to get the ID?
+        executeTopic (text + (success ? " Success" : " Fail"));
     }
 
     int DialogueManager::getTemporaryDispositionChange() const
@@ -480,4 +512,57 @@ namespace MWDialogue
     {
         mTemporaryDispositionChange += delta;
     }
+
+    std::vector<HyperTextToken> ParseHyperText(const std::string& text)
+    {
+        std::vector<HyperTextToken> result;
+
+        MyGUI::UString utext(text);
+
+        size_t pos_begin, pos_end, iteration_pos = 0;
+        for(;;)
+        {
+            pos_begin = utext.find('@', iteration_pos);
+            if (pos_begin != std::string::npos)
+                pos_end = utext.find('#', pos_begin);
+
+            if (pos_begin != std::string::npos && pos_end != std::string::npos)
+            {
+                result.push_back( HyperTextToken(utext.substr(iteration_pos, pos_begin - iteration_pos), false) );
+
+                std::string link = utext.substr(pos_begin + 1, pos_end - pos_begin - 1);
+                result.push_back( HyperTextToken(link, true) );
+
+                iteration_pos = pos_end + 1;
+            }
+            else
+            {
+                result.push_back( HyperTextToken(utext.substr(iteration_pos), false) );
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    size_t RemovePseudoAsterisks(std::string& phrase)
+    {
+        size_t pseudoAsterisksCount = 0;
+        const char specialPseudoAsteriskCharacter = 127;
+
+        if( !phrase.empty() )
+        {
+            std::string::reverse_iterator rit = phrase.rbegin();
+
+            while( rit != phrase.rend() && *rit == specialPseudoAsteriskCharacter )
+            {
+                pseudoAsterisksCount++;
+                ++rit;
+            }
+        }
+
+        phrase = phrase.substr(0, phrase.length() - pseudoAsterisksCount);
+
+        return pseudoAsterisksCount;
+    }
 }
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
index 9e1971b0f..1ca2ae5eb 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.hpp
@@ -7,6 +7,7 @@
 #include <list>
 
 #include <components/compiler/streamerrorhandler.hpp>
+#include <components/translation/translation.hpp>
 
 #include "../mwworld/ptr.hpp"
 
@@ -20,10 +21,11 @@ namespace MWDialogue
             std::map<std::string, bool> mKnownTopics;// Those are the topics the player knows.
             std::list<std::string> mActorKnownTopics;
 
+            Translation::Storage& mTranslationDataStorage;
             MWScript::CompilerContext mCompilerContext;
             std::ostream mErrorStream;
             Compiler::StreamErrorHandler mErrorHandler;
-            
+
             MWWorld::Ptr mActor;
             bool mTalkedTo;
 
@@ -46,9 +48,11 @@ namespace MWDialogue
 
             void printError (const std::string& error);
 
+            void executeTopic (const std::string& topic);
+
         public:
 
-            DialogueManager (const Compiler::Extensions& extensions, bool scriptVerbose);
+            DialogueManager (const Compiler::Extensions& extensions, bool scriptVerbose, Translation::Storage& translationDataStorage);
 
             virtual void startDialogue (const MWWorld::Ptr& actor);
 
@@ -70,6 +74,21 @@ namespace MWDialogue
             virtual int getTemporaryDispositionChange () const;
             virtual void applyTemporaryDispositionChange (int delta);
     };
+
+
+    struct HyperTextToken
+    {
+        HyperTextToken(const std::string& text, bool link) : mText(text), mLink(link) {}
+
+        std::string mText;
+        bool mLink;
+    };
+
+    // In translations (at least Russian) the links are marked with @#, so
+    // it should be a function to parse it
+    std::vector<HyperTextToken> ParseHyperText(const std::string& text);
+
+    size_t RemovePseudoAsterisks(std::string& phrase);
 }
 
 #endif
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 0deef7fd0..09bb0ddc4 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -17,27 +17,21 @@
 
 #include "selectwrapper.hpp"
 
-namespace
-{
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-}
-
 bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 {
+    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+
     // actor id
     if (!info.mActor.empty())
-        if (toLower (info.mActor)!=MWWorld::Class::get (mActor).getId (mActor))
+    {
+        if ( Misc::StringUtils::lowerCase (info.mActor)!=MWWorld::Class::get (mActor).getId (mActor))
             return false;
-
-    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+    }
+    else if (isCreature)
+    {
+        // Creatures must not have topics aside of those specific to their id
+        return false;
+    }
 
     // NPC race
     if (!info.mRace.empty())
@@ -47,7 +41,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 
         MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
 
-        if (toLower (info.mRace)!=toLower (cellRef->mBase->mRace))
+        if (Misc::StringUtils::lowerCase (info.mRace)!= Misc::StringUtils::lowerCase (cellRef->mBase->mRace))
             return false;
     }
 
@@ -59,7 +53,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 
         MWWorld::LiveCellRef<ESM::NPC> *cellRef = mActor.get<ESM::NPC>();
 
-        if (toLower (info.mClass)!=toLower (cellRef->mBase->mClass))
+        if ( Misc::StringUtils::lowerCase (info.mClass)!= Misc::StringUtils::lowerCase (cellRef->mBase->mClass))
             return false;
     }
 
@@ -70,7 +64,7 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
             return false;
 
         MWMechanics::NpcStats& stats = MWWorld::Class::get (mActor).getNpcStats (mActor);
-        std::map<std::string, int>::iterator iter = stats.getFactionRanks().find (toLower (info.mNpcFaction));
+        std::map<std::string, int>::iterator iter = stats.getFactionRanks().find ( Misc::StringUtils::lowerCase (info.mNpcFaction));
 
         if (iter==stats.getFactionRanks().end())
             return false;
@@ -99,7 +93,7 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
     if (!info.mPcFaction.empty())
     {
         MWMechanics::NpcStats& stats = MWWorld::Class::get (player).getNpcStats (player);
-        std::map<std::string,int>::iterator iter = stats.getFactionRanks().find (toLower (info.mPcFaction));
+        std::map<std::string,int>::iterator iter = stats.getFactionRanks().find (Misc::StringUtils::lowerCase (info.mPcFaction));
 
         if(iter==stats.getFactionRanks().end())
             return false;
@@ -111,7 +105,7 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
 
     // check cell
     if (!info.mCell.empty())
-        if (toLower (player.getCell()->mCell->mName) != toLower (info.mCell))
+        if (Misc::StringUtils::lowerCase (player.getCell()->mCell->mName) != Misc::StringUtils::lowerCase (info.mCell))
             return false;
 
     return true;
@@ -127,6 +121,18 @@ bool MWDialogue::Filter::testSelectStructs (const ESM::DialInfo& info) const
     return true;
 }
 
+bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info) const
+{
+    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+
+    if (isCreature)
+        return true;
+
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor);
+
+    return actorDisposition >= info.mData.mDisposition;
+}
+
 bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
 {
     if (select.isNpcOnly() && mActor.getTypeName()!=typeid (ESM::NPC).name())
@@ -168,7 +174,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
             int i = 0;
 
             for (; i<static_cast<int> (script->mVarNames.size()); ++i)
-                if (script->mVarNames[i]==name)
+                if (Misc::StringUtils::lowerCase(script->mVarNames[i]) == name)
                     break;
 
             if (i>=static_cast<int> (script->mVarNames.size()))
@@ -242,7 +248,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
             std::string name = select.getName();
 
             for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
-                if (toLower(iter->getCellRef().mRefID) == name)
+                if (Misc::StringUtils::lowerCase(iter->getCellRef().mRefID) == name)
                     sum += iter->getRefData().getCount();
 
             return sum;
@@ -408,23 +414,23 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_Id:
 
-            return select.getName()==toLower (MWWorld::Class::get (mActor).getId (mActor));
+            return select.getName()==Misc::StringUtils::lowerCase (MWWorld::Class::get (mActor).getId (mActor));
 
         case SelectWrapper::Function_Faction:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mFaction)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mFaction)==select.getName();
 
         case SelectWrapper::Function_Class:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mClass)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mClass)==select.getName();
 
         case SelectWrapper::Function_Race:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mRace)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mRace)==select.getName();
 
         case SelectWrapper::Function_Cell:
 
-            return toLower (mActor.getCell()->mCell->mName)==select.getName();
+            return Misc::StringUtils::lowerCase (mActor.getCell()->mCell->mName)==select.getName();
 
         case SelectWrapper::Function_SameGender:
 
@@ -433,8 +439,8 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
 
         case SelectWrapper::Function_SameRace:
 
-            return toLower (mActor.get<ESM::NPC>()->mBase->mRace)!=
-                toLower (player.get<ESM::NPC>()->mBase->mRace);
+            return Misc::StringUtils::lowerCase (mActor.get<ESM::NPC>()->mBase->mRace)!=
+                Misc::StringUtils::lowerCase (player.get<ESM::NPC>()->mBase->mRace);
 
         case SelectWrapper::Function_SameFaction:
 
@@ -553,18 +559,50 @@ MWDialogue::Filter::Filter (const MWWorld::Ptr& actor, int choice, bool talkedTo
 : mActor (actor), mChoice (choice), mTalkedToPlayer (talkedToPlayer)
 {}
 
-bool MWDialogue::Filter::operator() (const ESM::DialInfo& info) const
+const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const
 {
-    return testActor (info) && testPlayer (info) && testSelectStructs (info);
-}
+    bool infoRefusal = false;
 
-const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue) const
-{
+    // Iterate over topic responses to find a matching one
     for (std::vector<ESM::DialInfo>::const_iterator iter = dialogue.mInfo.begin();
         iter!=dialogue.mInfo.end(); ++iter)
-        if ((*this) (*iter))
-            return &*iter;
+    {
+        if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
+        {
+            if (testDisposition (*iter))
+                return &*iter;
+            else
+                infoRefusal = true;
+        }
+    }
+
+    if (infoRefusal && fallbackToInfoRefusal)
+    {
+        // No response is valid because of low NPC disposition,
+        // search a response in the topic "Info Refusal"
+
+        const MWWorld::Store<ESM::Dialogue> &dialogues =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+
+        const ESM::Dialogue& infoRefusalDialogue = *dialogues.find ("Info Refusal");
+
+        for (std::vector<ESM::DialInfo>::const_iterator iter = infoRefusalDialogue.mInfo.begin();
+            iter!=infoRefusalDialogue.mInfo.end(); ++iter)
+            if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter) && testDisposition(*iter))
+                return &*iter;
+    }
 
     return 0;
 }
 
+bool MWDialogue::Filter::responseAvailable (const ESM::Dialogue& dialogue) const
+{
+    for (std::vector<ESM::DialInfo>::const_iterator iter = dialogue.mInfo.begin();
+        iter!=dialogue.mInfo.end(); ++iter)
+    {
+        if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
+            return true;
+    }
+
+    return false;
+}
diff --git a/apps/openmw/mwdialogue/filter.hpp b/apps/openmw/mwdialogue/filter.hpp
index 7c8f1116f..707c0154b 100644
--- a/apps/openmw/mwdialogue/filter.hpp
+++ b/apps/openmw/mwdialogue/filter.hpp
@@ -18,40 +18,45 @@ namespace MWDialogue
             MWWorld::Ptr mActor;
             int mChoice;
             bool mTalkedToPlayer;
-    
+
             bool testActor (const ESM::DialInfo& info) const;
             ///< Is this the right actor for this \a info?
-    
+
             bool testPlayer (const ESM::DialInfo& info) const;
             ///< Do the player and the cell the player is currently in match \a info?
-    
+
             bool testSelectStructs (const ESM::DialInfo& info) const;
             ///< Are all select structs matching?
-    
+
+            bool testDisposition (const ESM::DialInfo& info) const;
+            ///< Is the actor disposition toward the player high enough?
+
             bool testSelectStruct (const SelectWrapper& select) const;
-    
+
             bool testSelectStructNumeric (const SelectWrapper& select) const;
-            
+
             int getSelectStructInteger (const SelectWrapper& select) const;
-            
+
             bool getSelectStructBoolean (const SelectWrapper& select) const;
-    
+
             int getFactionRank (const MWWorld::Ptr& actor, const std::string& factionId) const;
-            
+
             bool hasFactionRankSkillRequirements (const MWWorld::Ptr& actor, const std::string& factionId,
                 int rank) const;
 
             bool hasFactionRankReputationRequirements (const MWWorld::Ptr& actor, const std::string& factionId,
                 int rank) const;
-    
-        public:
-        
-            Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);    
 
-            bool operator() (const ESM::DialInfo& info) const;    
-            ///< \return does the dialogue match?
-            
-            const ESM::DialInfo *search (const ESM::Dialogue& dialogue) const;
+        public:
+
+            Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);
+
+            const ESM::DialInfo *search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const;
+            ///< Get a matching response for the requested dialogue.
+            ///  Redirect to "Info Refusal" topic if a response fulfills all conditions but disposition.
+
+            bool responseAvailable (const ESM::Dialogue& dialogue) const;
+            ///< Does a matching response exist? (disposition is ignored for this check)
     };
 }
 
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index e6141884c..5ffde5499 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -61,8 +61,8 @@ namespace MWDialogue
     StampedJournalEntry StampedJournalEntry::makeFromQuest (const std::string& topic, int index)
     {
         int day = MWBase::Environment::get().getWorld()->getGlobalVariable ("dayspassed").mLong;
-        int month = MWBase::Environment::get().getWorld()->getGlobalVariable ("day").mLong;
-        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalVariable ("month").mLong;
+        int month = MWBase::Environment::get().getWorld()->getGlobalVariable ("month").mLong;
+        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalVariable ("day").mLong;
 
         return StampedJournalEntry (topic, idFromIndex (topic, index), day, month, dayOfMonth);
     }
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 2b2c60381..5e2bc6bc0 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -31,6 +31,12 @@ namespace MWDialogue
 
     void Journal::addEntry (const std::string& id, int index)
     {
+        // bail out of we already have heard this...
+        std::string infoId = JournalEntry::idFromIndex (id, index);
+        for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i)
+            if (i->mTopic == id && i->mInfoId == infoId)
+                return;
+
         StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index);
 
         mJournal.push_back (entry);
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index 1462ee8ba..9cc528a11 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -8,18 +8,10 @@
 #include <sstream>
 #include <iterator>
 
+#include <components/misc/stringops.hpp>
+
 namespace
 {
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-
     template<typename T1, typename T2>
     bool selectCompareImp (char comp, T1 value1, T2 value2)
     {
@@ -307,5 +299,5 @@ bool MWDialogue::SelectWrapper::selectCompare (bool value) const
 
 std::string MWDialogue::SelectWrapper::getName() const
 {
-    return toLower (mSelect.mSelectRule.substr (5));
+    return Misc::StringUtils::lowerCase (mSelect.mSelectRule.substr (5));
 }
diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp
index b6e7c07ae..3253b20d6 100644
--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@@ -27,17 +27,17 @@ namespace MWDialogue
         mEntries.push_back (entry.mInfoId);
     }
 
-    Topic::TEntryIter Topic::begin()
+    Topic::TEntryIter Topic::begin() const
     {
         return mEntries.begin();
     }
 
-    Topic::TEntryIter Topic::end()
+    Topic::TEntryIter Topic::end() const
     {
         return mEntries.end();
     }
 
-    JournalEntry Topic::getEntry (const std::string& infoId)
+    JournalEntry Topic::getEntry (const std::string& infoId) const
     {
         return JournalEntry (mTopic, infoId);
     }
diff --git a/apps/openmw/mwdialogue/topic.hpp b/apps/openmw/mwdialogue/topic.hpp
index 566f60ab0..c3f0baabc 100644
--- a/apps/openmw/mwdialogue/topic.hpp
+++ b/apps/openmw/mwdialogue/topic.hpp
@@ -34,13 +34,15 @@ namespace MWDialogue
             ///
             /// \note Redundant entries are ignored.
 
-            TEntryIter begin();
+            std::string const & getName () const { return mTopic; }
+
+            TEntryIter begin() const;
             ///< Iterator pointing to the begin of the journal for this topic.
 
-            TEntryIter end();
+            TEntryIter end() const;
             ///< Iterator pointing past the end of the journal for this topic.
 
-            JournalEntry getEntry (const std::string& infoId);
+            JournalEntry getEntry (const std::string& infoId) const;
     };
 }
 
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index fc06e866c..db1a81c2c 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -63,7 +63,7 @@ namespace MWGui
     void AlchemyWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
         mAlchemy.clear();
-        
+
         mWindowManager.removeGuiMode(GM_Alchemy);
         mWindowManager.removeGuiMode(GM_Inventory);
     }
@@ -119,7 +119,6 @@ namespace MWGui
             if (mIngredients[i]->isUserString("ToolTipType"))
             {
                 MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>();
-                ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
                 if (ingred.getRefData().getCount() == 0)
                     removeIngredient(mIngredients[i]);
         }
diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp
index bc3cd7b40..659795e18 100644
--- a/apps/openmw/mwgui/bookwindow.cpp
+++ b/apps/openmw/mwgui/bookwindow.cpp
@@ -88,7 +88,7 @@ void BookWindow::setTakeButtonShow(bool show)
     mTakeButton->setVisible(show);
 }
 
-void BookWindow::onCloseButtonClicked (MyGUI::Widget* _sender)
+void BookWindow::onCloseButtonClicked (MyGUI::Widget* sender)
 {
     // no 3d sounds because the object could be in a container.
     MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
@@ -96,7 +96,7 @@ void BookWindow::onCloseButtonClicked (MyGUI::Widget* _sender)
     mWindowManager.removeGuiMode(GM_Book);
 }
 
-void BookWindow::onTakeButtonClicked (MyGUI::Widget* _sender)
+void BookWindow::onTakeButtonClicked (MyGUI::Widget* sender)
 {
     MWBase::Environment::get().getSoundManager()->playSound ("Item Book Up", 1.0, 1.0, MWBase::SoundManager::Play_NoTrack);
 
@@ -106,7 +106,7 @@ void BookWindow::onTakeButtonClicked (MyGUI::Widget* _sender)
     mWindowManager.removeGuiMode(GM_Book);
 }
 
-void BookWindow::onNextPageButtonClicked (MyGUI::Widget* _sender)
+void BookWindow::onNextPageButtonClicked (MyGUI::Widget* sender)
 {
     if ((mCurrentPage+1)*2 < mPages.size())
     {
@@ -118,7 +118,7 @@ void BookWindow::onNextPageButtonClicked (MyGUI::Widget* _sender)
     }
 }
 
-void BookWindow::onPrevPageButtonClicked (MyGUI::Widget* _sender)
+void BookWindow::onPrevPageButtonClicked (MyGUI::Widget* sender)
 {
     if (mCurrentPage > 0)
     {
diff --git a/apps/openmw/mwgui/bookwindow.hpp b/apps/openmw/mwgui/bookwindow.hpp
index fedb783b2..5887975ea 100644
--- a/apps/openmw/mwgui/bookwindow.hpp
+++ b/apps/openmw/mwgui/bookwindow.hpp
@@ -5,6 +5,8 @@
 
 #include "../mwworld/ptr.hpp"
 
+#include "imagebutton.hpp"
+
 namespace MWGui
 {
     class BookWindow : public WindowBase
@@ -16,19 +18,19 @@ namespace MWGui
             void setTakeButtonShow(bool show);
 
         protected:
-            void onNextPageButtonClicked (MyGUI::Widget* _sender);
-            void onPrevPageButtonClicked (MyGUI::Widget* _sender);
-            void onCloseButtonClicked (MyGUI::Widget* _sender);
-            void onTakeButtonClicked (MyGUI::Widget* _sender);
+            void onNextPageButtonClicked (MyGUI::Widget* sender);
+            void onPrevPageButtonClicked (MyGUI::Widget* sender);
+            void onCloseButtonClicked (MyGUI::Widget* sender);
+            void onTakeButtonClicked (MyGUI::Widget* sender);
 
             void updatePages();
             void clearPages();
 
         private:
-            MyGUI::Button* mCloseButton;
-            MyGUI::Button* mTakeButton;
-            MyGUI::Button* mNextPageButton;
-            MyGUI::Button* mPrevPageButton;
+            MWGui::ImageButton* mCloseButton;
+            MWGui::ImageButton* mTakeButton;
+            MWGui::ImageButton* mNextPageButton;
+            MWGui::ImageButton* mPrevPageButton;
             MyGUI::TextBox* mLeftPageNumber;
             MyGUI::TextBox* mRightPageNumber;
             MyGUI::Widget* mLeftPage;
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 20bc95445..479a82efa 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -195,13 +195,13 @@ void ContainerBase::sellAlreadyBoughtItem(MyGUI::Widget* _sender, int count)
     if (isInventory())
     {
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->addItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count, true);
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->drawItems();
     }
     else
     {
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->addItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count, true);
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->drawItems();
     }
 
@@ -218,13 +218,13 @@ void ContainerBase::sellItem(MyGUI::Widget* _sender, int count)
     if (isInventory())
     {
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->addBarteredItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count, false);
         MWBase::Environment::get().getWindowManager()->getTradeWindow()->drawItems();
     }
     else
     {
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->addBarteredItem(object, count);
-        MWBase::Environment::get().getWindowManager()->getTradeWindow()->sellToNpc(object, count);
+        MWBase::Environment::get().getWindowManager()->getTradeWindow()->buyFromNpc(object, count, false);
         MWBase::Environment::get().getWindowManager()->getInventoryWindow()->drawItems();
     }
 
diff --git a/apps/openmw/mwgui/cursorreplace.cpp b/apps/openmw/mwgui/cursorreplace.cpp
index a4b6a100b..2079538fc 100644
--- a/apps/openmw/mwgui/cursorreplace.cpp
+++ b/apps/openmw/mwgui/cursorreplace.cpp
@@ -2,7 +2,6 @@
 
 #include <boost/filesystem.hpp>
 #include <openengine/ogre/imagerotate.hpp>
-#include <openengine/ogre/atlas.hpp>
 
 #include <OgreResourceGroupManager.h>
 #include <OgreRoot.h>
@@ -14,7 +13,4 @@ CursorReplace::CursorReplace()
     OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_vresize.png", 90);
     OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_dresize1.png", -45);
     OEngine::Render::ImageRotate::rotate("textures\\tx_cursormove.dds", "mwpointer_dresize2.png", 45);
-
-    OEngine::Render::Atlas::createFromFile("atlas1.cfg", "mwgui1", "textures\\");
-    OEngine::Render::Atlas::createFromFile("mainmenu.cfg", "mwgui2", "textures\\");
 }
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 827da1085..c7918ceb7 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -16,6 +16,8 @@
 
 #include "../mwmechanics/npcstats.hpp"
 
+#include "../mwdialogue/dialoguemanagerimp.hpp"
+
 #include "dialogue_history.hpp"
 #include "widgets.hpp"
 #include "list.hpp"
@@ -35,10 +37,7 @@ namespace {
 
 std::string lower_string(const std::string& str)
 {
-        std::string lowerCase;
-
-        std::transform (str.begin(), str.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
+        std::string lowerCase = Misc::StringUtils::lowerCase (str);
 
         return lowerCase;
 }
@@ -52,7 +51,6 @@ bool sortByLength (const std::string& left, const std::string& right)
 {
     return left.size() > right.size();
 }
-
 }
 
 
@@ -180,9 +178,30 @@ void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
     if(color != "#B29154")
     {
         MyGUI::UString key = mHistory->getColorTextAt(cursorPosition);
-        if(color == "#686EBA") MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(key));
 
-        if(color == "#572D21") MWBase::Environment::get().getDialogueManager()->questionAnswered(lower_string(key));
+        if(color == "#686EBA")
+        {
+            std::map<size_t, HyperLink>::iterator i = mHyperLinks.upper_bound(cursorPosition);
+            if( !mHyperLinks.empty() )
+            {
+                --i;
+
+                if( i->first + i->second.mLength > cursorPosition)
+                {
+                    MWBase::Environment::get().getDialogueManager()->keywordSelected(i->second.mTrueValue);
+                }
+            }
+            else
+            {
+                // the link was colored, but it is not in  mHyperLinks.
+                // It means that those liunks are not marked with @# and found
+                // by topic name search
+                MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(key));
+            }
+        }
+
+        if(color == "#572D21")
+            MWBase::Environment::get().getDialogueManager()->questionAnswered(lower_string(key));
     }
 }
 
@@ -258,6 +277,7 @@ void DialogueWindow::startDialogue(MWWorld::Ptr actor, std::string npcName)
     setTitle(npcName);
 
     mTopicsList->clear();
+    mHyperLinks.clear();
     mHistory->setCaption("");
     updateOptions();
 }
@@ -316,6 +336,22 @@ void addColorInString(std::string& str, const std::string& keyword,std::string c
     size_t pos = 0;
     while((pos = find_str_ci(str,keyword, pos)) != std::string::npos)
     {
+        // do not add color if this portion of text is already colored.
+        {
+            MyGUI::TextIterator iterator (str);
+            MyGUI::UString colour;
+            while(iterator.moveNext())
+            {
+                size_t iteratorPos = iterator.getPosition();
+                iterator.getTagColour(colour);
+                if (iteratorPos == pos)
+                    break;
+            }
+
+            if (colour == color1)
+                return;
+        }
+
         str.insert(pos,color1);
         pos += color1.length();
         pos += keyword.length();
@@ -324,7 +360,7 @@ void addColorInString(std::string& str, const std::string& keyword,std::string c
     }
 }
 
-std::string DialogueWindow::parseText(std::string text)
+std::string DialogueWindow::parseText(const std::string& text)
 {
     bool separatorReached = false; // only parse topics that are below the separator (this prevents actions like "Barter" that are not topics from getting blue-colored)
 
@@ -342,11 +378,56 @@ std::string DialogueWindow::parseText(std::string text)
     // sort by length to make sure longer topics are replaced first
     std::sort(topics.begin(), topics.end(), sortByLength);
 
-    for(std::vector<std::string>::const_iterator it = topics.begin(); it != topics.end(); ++it)
+    std::vector<MWDialogue::HyperTextToken> hypertext = MWDialogue::ParseHyperText(text);
+
+    size_t historySize = 0;
+    if(mHistory->getClient()->getSubWidgetText() != nullptr)
     {
-        addColorInString(text,*it,"#686EBA","#B29154");
+        historySize = mHistory->getOnlyText().size();
     }
-    return text;
+
+    std::string result;
+    size_t hypertextPos = 0;
+    for (size_t i = 0; i < hypertext.size(); ++i)
+    {
+        if (hypertext[i].mLink)
+        {
+            size_t asterisk_count = MWDialogue::RemovePseudoAsterisks(hypertext[i].mText);
+            std::string standardForm = hypertext[i].mText;
+            for(; asterisk_count > 0; --asterisk_count)
+                standardForm.append("*");
+
+            standardForm =
+                MWBase::Environment::get().getWindowManager()->
+                getTranslationDataStorage().topicStandardForm(standardForm);
+
+            if( std::find(topics.begin(), topics.end(), std::string(standardForm) ) != topics.end() )
+            {
+                result.append("#686EBA").append(hypertext[i].mText).append("#B29154");
+
+                mHyperLinks[historySize+hypertextPos].mLength = MyGUI::UString(hypertext[i].mText).length();
+                mHyperLinks[historySize+hypertextPos].mTrueValue = lower_string(standardForm);
+            }
+            else
+                result += hypertext[i].mText;
+        }
+        else
+        {
+            if( !mWindowManager.getTranslationDataStorage().hasTranslation() )
+            {
+                for(std::vector<std::string>::const_iterator it = topics.begin(); it != topics.end(); ++it)
+                {
+                    addColorInString(hypertext[i].mText, *it, "#686EBA", "#B29154");
+                }
+            }
+
+            result += hypertext[i].mText;
+        }
+
+        hypertextPos += MyGUI::UString(hypertext[i].mText).length();
+    }
+
+    return result;
 }
 
 void DialogueWindow::addText(std::string text)
@@ -354,6 +435,11 @@ void DialogueWindow::addText(std::string text)
     mHistory->addDialogText("#B29154"+parseText(text)+"#B29154");
 }
 
+void DialogueWindow::addMessageBox(const std::string& text)
+{
+    mHistory->addDialogText("\n#FFFFFF"+text+"#B29154");
+}
+
 void DialogueWindow::addTitle(std::string text)
 {
     // This is called from the dialogue manager, so text is
@@ -378,6 +464,7 @@ void DialogueWindow::updateOptions()
 {
     //Clear the list of topics
     mTopicsList->clear();
+    mHyperLinks.clear();
     mHistory->eraseText(0, mHistory->getTextLength());
 
     if (mPtr.getTypeName() == typeid(ESM::NPC).name())
@@ -403,7 +490,7 @@ void DialogueWindow::onReferenceUnavailable()
 
 void DialogueWindow::onFrame()
 {
-    if(mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
+    if(mMainWidget->getVisible() && mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
     {
         int disp = std::max(0, std::min(100,
             MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 082d92524..5c11c311a 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -65,6 +65,7 @@ namespace MWGui
         void setKeywords(std::list<std::string> keyWord);
         void removeKeyword(std::string keyWord);
         void addText(std::string text);
+        void addMessageBox(const std::string& text);
         void addTitle(std::string text);
         void askQuestion(std::string question);
         void goodbye();
@@ -92,12 +93,18 @@ namespace MWGui
 
         virtual void onReferenceUnavailable();
 
+        struct HyperLink
+        {
+            size_t mLength;
+            std::string mTrueValue;
+        };
+
     private:
         void updateOptions();
         /**
         *Helper function that add topic keyword in blue in a text.
         */
-        std::string parseText(std::string text);
+        std::string parseText(const std::string& text);
 
         int mServices;
 
@@ -109,6 +116,8 @@ namespace MWGui
         MyGUI::EditPtr     mDispositionText;
 
         PersuasionDialog mPersuasionDialog;
+
+        std::map<size_t, HyperLink> mHyperLinks;
     };
 }
 #endif
diff --git a/apps/openmw/mwgui/formatting.cpp b/apps/openmw/mwgui/formatting.cpp
index 53c23c25d..4090b592d 100644
--- a/apps/openmw/mwgui/formatting.cpp
+++ b/apps/openmw/mwgui/formatting.cpp
@@ -1,5 +1,10 @@
 #include "formatting.hpp"
 
+#include <components/interpreter/defines.hpp>
+
+#include "../mwscript/interpretercontext.hpp"
+#include "../mwworld/ptr.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/lexical_cast.hpp>
 
@@ -68,6 +73,9 @@ std::vector<std::string> BookTextParser::split(std::string text, const int width
 {
     std::vector<std::string> result;
 
+    MWScript::InterpreterContext interpreterContext(NULL, MWWorld::Ptr()); // empty arguments, because there is no locals or actor
+    text = Interpreter::fixDefinesBook(text, interpreterContext);
+
     boost::algorithm::replace_all(text, "<BR>", "\n");
     boost::algorithm::replace_all(text, "<P>", "\n\n");
 
@@ -167,6 +175,10 @@ std::vector<std::string> BookTextParser::split(std::string text, const int width
 
 MyGUI::IntSize BookTextParser::parse(std::string text, MyGUI::Widget* parent, const int width)
 {
+    MWScript::InterpreterContext interpreterContext(NULL, MWWorld::Ptr()); // empty arguments, because there is no locals or actor
+    text = Interpreter::fixDefinesBook(text, interpreterContext);
+
+
     mParent = parent;
     mWidth = width;
     mHeight = 0;
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 9b4075f57..a2c3a318b 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -220,7 +220,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
         if (world->canPlaceObject(mouseX, mouseY))
             world->placeObject(object, mouseX, mouseY);
         else
-            world->dropObjectOnGround(object);
+            world->dropObjectOnGround(world->getPlayer().getPlayer(), object);
 
         MyGUI::PointerManager::getInstance().setPointer("arrow");
 
@@ -244,8 +244,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
         if ( (mode != GM_Console) && (mode != GM_Container) && (mode != GM_Inventory) )
             return;
 
-        std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
-        MWWorld::Ptr object = MWBase::Environment::get().getWorld()->searchPtrViaHandle(handle);
+        MWWorld::Ptr object = MWBase::Environment::get().getWorld()->getFacedObject();
 
         if (mode == GM_Console)
             MWBase::Environment::get().getWindowManager()->getConsole()->setSelectedObject(object);
@@ -319,7 +318,7 @@ void HUD::setCellName(const std::string& cellName)
         mCellNameTimer = 5.0f;
         mCellName = cellName;
 
-        mCellNameBox->setCaption(mCellName);
+        mCellNameBox->setCaptionWithReplacing("#{sCell=" + mCellName + "}");
         mCellNameBox->setVisible(mMapVisible);
     }
 }
diff --git a/apps/openmw/mwgui/imagebutton.cpp b/apps/openmw/mwgui/imagebutton.cpp
new file mode 100644
index 000000000..98f05373b
--- /dev/null
+++ b/apps/openmw/mwgui/imagebutton.cpp
@@ -0,0 +1,63 @@
+#include "imagebutton.hpp"
+
+#include <OgreTextureManager.h>
+
+namespace MWGui
+{
+
+    void ImageButton::setPropertyOverride(const std::string &_key, const std::string &_value)
+    {
+        if (_key == "ImageHighlighted")
+            mImageHighlighted = _value;
+        else if (_key == "ImagePushed")
+            mImagePushed = _value;
+        else if (_key == "ImageNormal")
+        {
+            if (mImageNormal == "")
+            {
+                setImageTexture(_value);
+            }
+            mImageNormal = _value;
+        }
+        else
+            ImageBox::setPropertyOverride(_key, _value);
+    }
+    void ImageButton::onMouseSetFocus(Widget* _old)
+    {
+        setImageTexture(mImageHighlighted);
+        ImageBox::onMouseSetFocus(_old);
+    }
+
+    void ImageButton::onMouseLostFocus(Widget* _new)
+    {
+        setImageTexture(mImageNormal);
+        ImageBox::onMouseLostFocus(_new);
+    }
+
+    void ImageButton::onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id)
+    {
+        if (_id == MyGUI::MouseButton::Left)
+            setImageTexture(mImagePushed);
+
+        ImageBox::onMouseButtonPressed(_left, _top, _id);
+    }
+
+    MyGUI::IntSize ImageButton::getRequestedSize()
+    {
+        Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().getByName(mImageNormal);
+        if (texture.isNull())
+        {
+            std::cerr << "ImageButton: can't find " << mImageNormal << std::endl;
+            return MyGUI::IntSize(0,0);
+        }
+        return MyGUI::IntSize (texture->getWidth(), texture->getHeight());
+    }
+
+    void ImageButton::onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id)
+    {
+        if (_id == MyGUI::MouseButton::Left)
+            setImageTexture(mImageHighlighted);
+
+        ImageBox::onMouseButtonReleased(_left, _top, _id);
+    }
+}
diff --git a/apps/openmw/mwgui/imagebutton.hpp b/apps/openmw/mwgui/imagebutton.hpp
new file mode 100644
index 000000000..9fce12da1
--- /dev/null
+++ b/apps/openmw/mwgui/imagebutton.hpp
@@ -0,0 +1,33 @@
+#ifndef MWGUI_IMAGEBUTTON_H
+#define MWGUI_IMAGEBUTTON_H
+
+#include "MyGUI_ImageBox.h"
+
+namespace MWGui
+{
+
+    /**
+     * @brief allows using different image textures depending on the button state
+     */
+    class ImageButton : public MyGUI::ImageBox
+    {
+        MYGUI_RTTI_DERIVED(ImageButton)
+
+    public:
+        MyGUI::IntSize getRequestedSize();
+
+    protected:
+        virtual void setPropertyOverride(const std::string& _key, const std::string& _value);
+        virtual void onMouseLostFocus(MyGUI::Widget* _new);
+        virtual void onMouseSetFocus(MyGUI::Widget* _old);
+        virtual void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id);
+        virtual void onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id);
+
+        std::string mImageHighlighted;
+        std::string mImageNormal;
+        std::string mImagePushed;
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index bb3dc67e6..5390f1602 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -24,19 +24,6 @@
 #include "scrollwindow.hpp"
 #include "spellwindow.hpp"
 
-namespace
-{
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-}
-
 namespace MWGui
 {
 
@@ -80,7 +67,7 @@ namespace MWGui
 
         setCoord(0, 342, 498, 258);
 
-        MWBase::Environment::get().getWorld ()->setupExternalRendering (mPreview);
+        mPreview.setup();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         openContainer(player);
@@ -284,7 +271,7 @@ namespace MWGui
         for (MWWorld::ContainerStoreIterator it = invStore.begin();
                 it != invStore.end(); ++it)
         {
-            if (toLower(it->getCellRef().mRefID) == "gold_001")
+            if (Misc::StringUtils::ciEqual(it->getCellRef().mRefID, "gold_001"))
                 return it->getRefData().getCount();
         }
         return 0;
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 9d5d236be..ba39b0101 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -83,10 +83,9 @@ book formatText(std::string text,book mBook,int maxLine, int lineSize)
 
 MWGui::JournalWindow::JournalWindow (MWBase::WindowManager& parWindowManager)
     : WindowBase("openmw_journal.layout", parWindowManager)
-    , mLastPos(0)
-    , mVisible(false)
     , mPageNumber(0)
 {
+    mMainWidget->setVisible(false);
     //setCoord(0,0,498, 342);
     center();
 
@@ -115,20 +114,15 @@ MWGui::JournalWindow::JournalWindow (MWBase::WindowManager& parWindowManager)
     //displayLeftText(list.front());
 }
 
-void MWGui::JournalWindow::setVisible(bool visible)
+void MWGui::JournalWindow::close()
 {
-    if (mVisible && !visible)
-        MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
-    mVisible = visible;
-
-    mMainWidget->setVisible(visible);
+    MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
 }
 
 void MWGui::JournalWindow::open()
 {
     mPageNumber = 0;
-    std::string journalOpenSound = "book open";
-    MWBase::Environment::get().getSoundManager()->playSound (journalOpenSound, 1.0, 1.0);
+    MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
     if(MWBase::Environment::get().getJournal()->begin()!=MWBase::Environment::get().getJournal()->end())
     {
         book journal;
@@ -182,7 +176,7 @@ void MWGui::JournalWindow::displayRightText(std::string text)
 }
 
 
-void MWGui::JournalWindow::notifyNextPage(MyGUI::WidgetPtr _sender)
+void MWGui::JournalWindow::notifyNextPage(MyGUI::Widget* _sender)
 {
     if(mPageNumber < int(mLeftPages.size())-1)
     {
@@ -194,7 +188,7 @@ void MWGui::JournalWindow::notifyNextPage(MyGUI::WidgetPtr _sender)
     }
 }
 
-void MWGui::JournalWindow::notifyPrevPage(MyGUI::WidgetPtr _sender)
+void MWGui::JournalWindow::notifyPrevPage(MyGUI::Widget* _sender)
 {
     if(mPageNumber > 0)
     {
diff --git a/apps/openmw/mwgui/journalwindow.hpp b/apps/openmw/mwgui/journalwindow.hpp
index a62e48803..044a2b2a4 100644
--- a/apps/openmw/mwgui/journalwindow.hpp
+++ b/apps/openmw/mwgui/journalwindow.hpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "window_base.hpp"
+#include "imagebutton.hpp"
 
 namespace MWGui
 {
@@ -15,8 +16,7 @@ namespace MWGui
         public:
             JournalWindow(MWBase::WindowManager& parWindowManager);
             virtual void open();
-
-            virtual void setVisible(bool visible); // only used to play close sound
+            virtual void close();
 
         private:
             void displayLeftText(std::string text);
@@ -26,22 +26,16 @@ namespace MWGui
             /**
             *Called when next/prev button is used.
             */
-            void notifyNextPage(MyGUI::WidgetPtr _sender);
-            void notifyPrevPage(MyGUI::WidgetPtr _sender);
+            void notifyNextPage(MyGUI::Widget* _sender);
+            void notifyPrevPage(MyGUI::Widget* _sender);
 
-            static const int sLineHeight;
-
-            MyGUI::WidgetPtr mSkillAreaWidget, mSkillClientWidget;
-            MyGUI::ScrollBar* mSkillScrollerWidget;
-            int mLastPos, mClientHeight;
             MyGUI::EditPtr mLeftTextWidget;
             MyGUI::EditPtr mRightTextWidget;
-            MyGUI::ButtonPtr mPrevBtn;
-            MyGUI::ButtonPtr mNextBtn;
+            MWGui::ImageButton* mPrevBtn;
+            MWGui::ImageButton* mNextBtn;
             std::vector<std::string> mLeftPages;
             std::vector<std::string> mRightPages;
             int mPageNumber; //store the number of the current left page
-            bool mVisible;
     };
 
 }
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 8bcaa6ce0..dd5289edb 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -6,6 +6,7 @@
 #include <OgreCompositorChain.h>
 #include <OgreMaterial.h>
 
+
 #include <boost/algorithm/string.hpp>
 
 #include <openengine/ogre/fader.hpp>
@@ -16,6 +17,9 @@
 
 #include "../mwbase/windowmanager.hpp"
 
+#include <components/esm/records.hpp>
+
+
 namespace MWGui
 {
 
@@ -213,22 +217,19 @@ namespace MWGui
 
     void LoadingScreen::changeWallpaper ()
     {
-        std::vector<std::string> splash;
+        if (mResources.isNull ())
+            mResources = Ogre::ResourceGroupManager::getSingleton ().findResourceNames ("General", "Splash_*.tga");
 
-        Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton ().listResourceNames ("General", false);
-        for (Ogre::StringVector::const_iterator it = resources->begin(); it != resources->end(); ++it)
+
+        if (mResources->size())
         {
-            if (it->size() < 6)
-                continue;
-            std::string start = it->substr(0, 6);
-            boost::to_lower(start);
+            std::string const & randomSplash = mResources->at (rand() % mResources->size());
 
-            if (start == "splash")
-                splash.push_back (*it);
+            Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General");
+
+            mBackgroundImage->setImageTexture (randomSplash);
         }
-        std::string randomSplash = splash[rand() % splash.size()];
-
-        Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General");
-        mBackgroundImage->setImageTexture (randomSplash);
+        else
+            std::cerr << "No loading screens found!" << std::endl;
     }
 }
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index a012793ca..c14087a3b 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -42,6 +42,7 @@ namespace MWGui
         Ogre::Rectangle2D* mRectangle;
         Ogre::MaterialPtr mBackgroundMaterial;
 
+        Ogre::StringVectorPtr mResources;
 
         bool mLoadingOn;
 
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index e98b75e9b..14309abc5 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -20,65 +20,57 @@ namespace MWGui
     {
         setCoord(0,0,w,h);
 
-        int height = 64 * 3;
 
         if (mButtonBox)
             MyGUI::Gui::getInstance ().destroyWidget(mButtonBox);
 
-        mButtonBox = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(w/2 - 64, h/2 - height/2, 128, height), MyGUI::Align::Default);
+        mButtonBox = mMainWidget->createWidget<MyGUI::Widget>("", MyGUI::IntCoord(0, 0, 0, 0), MyGUI::Align::Default);
         int curH = 0;
 
-        mReturn = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mReturn->setImageResource ("Menu_Return");
-        mReturn->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::returnToGame);
-        curH += 64;
+        std::vector<std::string> buttons;
+        buttons.push_back("return");
+        //buttons.push_back("newgame");
+        //buttons.push_back("loadgame");
+        //buttons.push_back("savegame");
+        buttons.push_back("options");
+        //buttons.push_back("credits");
+        buttons.push_back("exitgame");
 
+        int maxwidth = 0;
 
-        /*
-        mNewGame = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mNewGame->setImageResource ("Menu_NewGame");
-        curH += 64;
+        mButtons.clear();
+        for (std::vector<std::string>::iterator it = buttons.begin(); it != buttons.end(); ++it)
+        {
+            MWGui::ImageButton* button = mButtonBox->createWidget<MWGui::ImageButton>
+                    ("ImageBox", MyGUI::IntCoord(0, curH, 0, 0), MyGUI::Align::Default);
+            button->setProperty("ImageHighlighted", "textures\\menu_" + *it + "_over.dds");
+            button->setProperty("ImageNormal", "textures\\menu_" + *it + ".dds");
+            button->setProperty("ImagePushed", "textures\\menu_" + *it + "_pressed.dds");
+            MyGUI::IntSize requested = button->getRequestedSize();
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::onButtonClicked);
+            mButtons[*it] = button;
+            curH += requested.height;
 
-        mLoadGame = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mLoadGame->setImageResource ("Menu_LoadGame");
-        curH += 64;
+            if (requested.width > maxwidth)
+                maxwidth = requested.width;
+        }
+        for (std::map<std::string, MWGui::ImageButton*>::iterator it = mButtons.begin(); it != mButtons.end(); ++it)
+        {
+            MyGUI::IntSize requested = it->second->getRequestedSize();
+            it->second->setCoord((maxwidth-requested.width) / 2, it->second->getTop(), requested.width, requested.height);
+        }
 
-
-        mSaveGame = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mSaveGame->setImageResource ("Menu_SaveGame");
-        curH += 64;
-        */
-
-        mOptions = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mOptions->setImageResource ("Menu_Options");
-        mOptions->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::showOptions);
-        curH += 64;
-
-        /*
-        mCredits = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mCredits->setImageResource ("Menu_Credits");
-        curH += 64;
-        */
-
-        mExitGame = mButtonBox->createWidget<MyGUI::Button> ("ButtonImage", MyGUI::IntCoord(0, curH, 128, 64), MyGUI::Align::Default);
-        mExitGame->setImageResource ("Menu_ExitGame");
-        mExitGame->eventMouseButtonClick += MyGUI::newDelegate(this, &MainMenu::exitGame);
-        curH += 64;
+        mButtonBox->setCoord (w/2 - maxwidth/2, h/2 - curH/2, maxwidth, curH);
     }
 
-    void MainMenu::returnToGame(MyGUI::Widget* sender)
+    void MainMenu::onButtonClicked(MyGUI::Widget *sender)
     {
-        MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu);
-    }
-
-    void MainMenu::showOptions(MyGUI::Widget* sender)
-    {
-        MWBase::Environment::get().getWindowManager ()->pushGuiMode (GM_Settings);
-    }
-
-    void MainMenu::exitGame(MyGUI::Widget* sender)
-    {
-        Ogre::Root::getSingleton ().queueEndRendering ();
+        if (sender == mButtons["return"])
+            MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu);
+        else if (sender == mButtons["options"])
+            MWBase::Environment::get().getWindowManager ()->pushGuiMode (GM_Settings);
+        else if (sender == mButtons["exitgame"])
+            Ogre::Root::getSingleton ().queueEndRendering ();
     }
 
 }
diff --git a/apps/openmw/mwgui/mainmenu.hpp b/apps/openmw/mwgui/mainmenu.hpp
index fd583d187..4e76a64df 100644
--- a/apps/openmw/mwgui/mainmenu.hpp
+++ b/apps/openmw/mwgui/mainmenu.hpp
@@ -1,5 +1,7 @@
 #include <openengine/gui/layout.hpp>
 
+#include "imagebutton.hpp"
+
 namespace MWGui
 {
 
@@ -11,19 +13,11 @@ namespace MWGui
         void onResChange(int w, int h);
 
     private:
-        MyGUI::Button* mReturn;
-        MyGUI::Button* mNewGame;
-        MyGUI::Button* mLoadGame;
-        MyGUI::Button* mSaveGame;
-        MyGUI::Button* mOptions;
-        MyGUI::Button* mCredits;
-        MyGUI::Button* mExitGame;
-
         MyGUI::Widget* mButtonBox;
 
-        void returnToGame(MyGUI::Widget* sender);
-        void showOptions(MyGUI::Widget* sender);
-        void exitGame(MyGUI::Widget* sender);
+        std::map<std::string, MWGui::ImageButton*> mButtons;
+
+        void onButtonClicked (MyGUI::Widget* sender);
     };
 
 }
diff --git a/apps/openmw/mwgui/map_window.cpp b/apps/openmw/mwgui/map_window.cpp
index 0a26ebb8f..4e2ee517e 100644
--- a/apps/openmw/mwgui/map_window.cpp
+++ b/apps/openmw/mwgui/map_window.cpp
@@ -299,7 +299,7 @@ MapWindow::~MapWindow()
 
 void MapWindow::setCellName(const std::string& cellName)
 {
-    setTitle(cellName);
+    setTitle("#{sCell=" + cellName + "}");
 }
 
 void MapWindow::addVisitedLocation(const std::string& name, int x, int y)
diff --git a/apps/openmw/mwgui/mode.hpp b/apps/openmw/mwgui/mode.hpp
index d791a1c99..319537297 100644
--- a/apps/openmw/mwgui/mode.hpp
+++ b/apps/openmw/mwgui/mode.hpp
@@ -45,7 +45,9 @@ namespace MWGui
       GM_Loading,
       GM_LoadingWallpaper,
 
-      GM_QuickKeysMenu
+      GM_QuickKeysMenu,
+
+      GM_Video
     };
 
   // Windows shown in inventory mode
diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 02512425d..6d51420f0 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -440,7 +440,7 @@ namespace MWGui
 
         for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
         {
-            spellList.push_back(*it);
+            spellList.push_back (it->first);
         }
 
         const MWWorld::ESMStore &esmStore =
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index d2714fb51..df6c99340 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -106,7 +106,7 @@ void RaceDialog::open()
     updateSpellPowers();
 
     mPreview = new MWRender::RaceSelectionPreview();
-    MWBase::Environment::get().getWorld ()->setupExternalRendering (*mPreview);
+    mPreview->setup();
     mPreview->update (0);
 
     const ESM::NPC proto = mPreview->getPrototype();
diff --git a/apps/openmw/mwgui/scrollwindow.hpp b/apps/openmw/mwgui/scrollwindow.hpp
index b8f52fb65..7932a215b 100644
--- a/apps/openmw/mwgui/scrollwindow.hpp
+++ b/apps/openmw/mwgui/scrollwindow.hpp
@@ -2,6 +2,7 @@
 #define MWGUI_SCROLLWINDOW_H
 
 #include "window_base.hpp"
+#include "imagebutton.hpp"
 
 #include "../mwworld/ptr.hpp"
 
@@ -20,8 +21,8 @@ namespace MWGui
             void onTakeButtonClicked (MyGUI::Widget* _sender);
 
         private:
-            MyGUI::Button* mCloseButton;
-            MyGUI::Button* mTakeButton;
+            MWGui::ImageButton* mCloseButton;
+            MWGui::ImageButton* mTakeButton;
             MyGUI::ScrollView* mTextView;
 
             MWWorld::Ptr mScroll;
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index a41f401a5..11f090494 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -98,19 +98,19 @@ namespace MWGui
 
         MWMechanics::Spells& playerSpells = MWWorld::Class::get (player).getCreatureStats (player).getSpells();
         MWMechanics::Spells& merchantSpells = MWWorld::Class::get (actor).getCreatureStats (actor).getSpells();
-         
+
         for (MWMechanics::Spells::TIterator iter = merchantSpells.begin(); iter!=merchantSpells.end(); ++iter)
         {
             const ESM::Spell* spell =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
-            
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
+
             if (spell->mData.mType!=ESM::Spell::ST_Spell)
                 continue; // don't try to sell diseases, curses or powers
-            
+
             if (std::find (playerSpells.begin(), playerSpells.end(), *iter)!=playerSpells.end())
                 continue; // we have that spell already
-            
-            addSpell (*iter);
+
+            addSpell (iter->first);
         }
 
         updateLabels();
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 69d69519f..839586452 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -436,7 +436,7 @@ namespace MWGui
         for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
         {
             const ESM::Spell* spell =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(*it);
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (it->first);
 
             // only normal spells count
             if (spell->mData.mType != ESM::Spell::ST_Spell)
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index d62b23de4..47e1d739a 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -139,7 +139,7 @@ namespace MWGui
 
         for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
         {
-            spellList.push_back(*it);
+            spellList.push_back (it->first);
         }
 
         const MWWorld::ESMStore &esmStore =
diff --git a/apps/openmw/mwgui/stats_window.cpp b/apps/openmw/mwgui/stats_window.cpp
index 38a06940f..70ceed857 100644
--- a/apps/openmw/mwgui/stats_window.cpp
+++ b/apps/openmw/mwgui/stats_window.cpp
@@ -252,6 +252,7 @@ void StatsWindow::onFrame ()
     }
 
     setFactions(PCstats.getFactionRanks());
+    setExpelled(PCstats.getExpelled ());
 
     const std::string &signId =
         MWBase::Environment::get().getWorld()->getPlayer().getBirthSign();
@@ -273,6 +274,15 @@ void StatsWindow::setFactions (const FactionList& factions)
     }
 }
 
+void StatsWindow::setExpelled (const std::set<std::string>& expelled)
+{
+    if (mExpelled != expelled)
+    {
+        mExpelled = expelled;
+        mChanged = true;
+    }
+}
+
 void StatsWindow::setBirthSign (const std::string& signId)
 {
     if (signId != mBirthSignId)
@@ -462,6 +472,10 @@ void StatsWindow::updateSkillArea()
         if (!mSkillWidgets.empty())
             addSeparator(coord1, coord2);
 
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+        MWMechanics::NpcStats PCstats = MWWorld::Class::get(player).getNpcStats(player);
+        std::set<std::string>& expelled = PCstats.getExpelled ();
+
         addGroup(mWindowManager.getGameSettingString("sFaction", "Faction"), coord1, coord2);
         FactionList::const_iterator end = mFactions.end();
         for (FactionList::const_iterator it = mFactions.begin(); it != end; ++it)
@@ -473,36 +487,42 @@ void StatsWindow::updateSkillArea()
             std::string text;
 
             text += std::string("#DDC79E") + faction->mName;
-            text += std::string("\n#BF9959") + faction->mRanks[it->second];
 
-            if (it->second < 9)
+            if (expelled.find(it->first) != expelled.end())
+                text += "\n#{sExpelled}";
+            else
             {
-                // player doesn't have max rank yet
-                text += std::string("\n\n#DDC79E#{sNextRank} ") + faction->mRanks[it->second+1];
+                text += std::string("\n#BF9959") + faction->mRanks[it->second];
 
-                ESM::RankData rankData = faction->mData.mRankData[it->second+1];
-                const ESM::Attribute* attr1 = store.get<ESM::Attribute>().find(faction->mData.mAttribute1);
-                const ESM::Attribute* attr2 = store.get<ESM::Attribute>().find(faction->mData.mAttribute2);
-                assert(attr1 && attr2);
-
-                text += "\n#BF9959#{" + attr1->mName + "}: " + boost::lexical_cast<std::string>(rankData.mAttribute1)
-                        + ", #{" + attr2->mName + "}: " + boost::lexical_cast<std::string>(rankData.mAttribute2);
-
-                text += "\n\n#DDC79E#{sFavoriteSkills}";
-                text += "\n#BF9959";
-                for (int i=0; i<6; ++i)
+                if (it->second < 9)
                 {
-                    text += "#{"+ESM::Skill::sSkillNameIds[faction->mData.mSkillID[i]]+"}";
-                    if (i<5)
-                        text += ", ";
+                    // player doesn't have max rank yet
+                    text += std::string("\n\n#DDC79E#{sNextRank} ") + faction->mRanks[it->second+1];
+
+                    ESM::RankData rankData = faction->mData.mRankData[it->second+1];
+                    const ESM::Attribute* attr1 = store.get<ESM::Attribute>().find(faction->mData.mAttribute1);
+                    const ESM::Attribute* attr2 = store.get<ESM::Attribute>().find(faction->mData.mAttribute2);
+                    assert(attr1 && attr2);
+
+                    text += "\n#BF9959#{" + attr1->mName + "}: " + boost::lexical_cast<std::string>(rankData.mAttribute1)
+                            + ", #{" + attr2->mName + "}: " + boost::lexical_cast<std::string>(rankData.mAttribute2);
+
+                    text += "\n\n#DDC79E#{sFavoriteSkills}";
+                    text += "\n#BF9959";
+                    for (int i=0; i<6; ++i)
+                    {
+                        text += "#{"+ESM::Skill::sSkillNameIds[faction->mData.mSkillID[i]]+"}";
+                        if (i<5)
+                            text += ", ";
+                    }
+
+                    text += "\n";
+
+                    if (rankData.mSkill1 > 0)
+                        text += "\n#{sNeedOneSkill} " + boost::lexical_cast<std::string>(rankData.mSkill1);
+                    if (rankData.mSkill2 > 0)
+                        text += "\n#{sNeedTwoSkills} " + boost::lexical_cast<std::string>(rankData.mSkill2);
                 }
-
-                text += "\n";
-
-                if (rankData.mSkill1 > 0)
-                    text += "\n#{sNeedOneSkill} " + boost::lexical_cast<std::string>(rankData.mSkill1);
-                if (rankData.mSkill2 > 0)
-                    text += "\n#{sNeedTwoSkills} " + boost::lexical_cast<std::string>(rankData.mSkill2);
             }
 
             w->setUserString("ToolTipType", "Layout");
diff --git a/apps/openmw/mwgui/stats_window.hpp b/apps/openmw/mwgui/stats_window.hpp
index f43682c96..6619680fa 100644
--- a/apps/openmw/mwgui/stats_window.hpp
+++ b/apps/openmw/mwgui/stats_window.hpp
@@ -50,6 +50,7 @@ namespace MWGui
             MyGUI::Widget* addItem(const std::string& text, MyGUI::IntCoord &coord1, MyGUI::IntCoord &coord2);
 
             void setFactions (const FactionList& factions);
+            void setExpelled (const std::set<std::string>& expelled);
             void setBirthSign (const std::string &signId);
 
             void onWindowResize(MyGUI::Window* window);
@@ -71,6 +72,7 @@ namespace MWGui
             std::string mBirthSignId;
             int mReputation, mBounty;
             std::vector<MyGUI::WidgetPtr> mSkillWidgets; //< Skills and other information
+            std::set<std::string> mExpelled;
 
             bool mChanged;
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 510bcb58f..c7acf568d 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -31,6 +31,7 @@ ToolTips::ToolTips(MWBase::WindowManager* windowManager) :
     , mRemainingDelay(0.0)
     , mLastMouseX(0)
     , mLastMouseY(0)
+    , mHorizontalScrollIndex(0)
 {
     getWidget(mDynamicToolTipBox, "DynamicToolTipBox");
 
@@ -52,6 +53,7 @@ void ToolTips::setEnabled(bool enabled)
 
 void ToolTips::onFrame(float frameDuration)
 {
+
     while (mDynamicToolTipBox->getChildCount())
     {
         MyGUI::Gui::getInstance().destroyWidget(mDynamicToolTipBox->getChildAt(0));
@@ -78,9 +80,8 @@ void ToolTips::onFrame(float frameDuration)
             || (mWindowManager->getMode() == GM_Container)
             || (mWindowManager->getMode() == GM_Inventory)))
         {
-            std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
+            mFocusObject = MWBase::Environment::get().getWorld()->getFacedObject();
 
-            mFocusObject = MWBase::Environment::get().getWorld()->searchPtrViaHandle(handle);
             if (mFocusObject.isEmpty ())
                 return;
 
@@ -103,7 +104,7 @@ void ToolTips::onFrame(float frameDuration)
 
         else
         {
-            const MyGUI::IntPoint& lastPressed = InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
+	    const MyGUI::IntPoint& lastPressed = InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
 
             if (mousePos == lastPressed) // mouseclick makes tooltip disappear
                 return;
@@ -114,11 +115,13 @@ void ToolTips::onFrame(float frameDuration)
             }
             else
             {
+		mHorizontalScrollIndex = 0;
                 mRemainingDelay = mDelay;
             }
             mLastMouseX = mousePos.left;
             mLastMouseY = mousePos.top;
 
+	    
             if (mRemainingDelay > 0)
                 return;
 
@@ -148,7 +151,8 @@ void ToolTips::onFrame(float frameDuration)
             {
                 return;
             }
-
+	    
+	
             // special handling for markers on the local map: the tooltip should only be visible
             // if the marker is not hidden due to the fog of war.
             if (focus->getUserString ("IsMarker") == "true")
@@ -354,7 +358,7 @@ void ToolTips::findImageExtension(std::string& image)
 }
 
 IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
-{
+{    
     mDynamicToolTipBox->setVisible(true);
 
     std::string caption = info.caption;
@@ -388,6 +392,8 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
     setCoord(0, 0, 300, 300);
 
     const IntPoint padding(8, 8);
+    
+    const int maximumWidth = 500;
 
     const int imageCaptionHPadding = (caption != "" ? 8 : 0);
     const int imageCaptionVPadding = (caption != "" ? 4 : 0);
@@ -411,7 +417,7 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
     IntSize textSize = textWidget->getTextSize();
 
     captionSize += IntSize(imageSize, 0); // adjust for image
-    IntSize totalSize = IntSize( std::max(textSize.width, captionSize.width + ((image != "") ? imageCaptionHPadding : 0)),
+    IntSize totalSize = IntSize( std::min(std::max(textSize.width,captionSize.width + ((image != "") ? imageCaptionHPadding : 0)),maximumWidth),
         ((text != "") ? textSize.height + imageCaptionVPadding : 0) + captionHeight );
 
     if (!info.effects.empty())
@@ -499,8 +505,24 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
         (captionHeight-captionSize.height)/2,
         captionSize.width-imageSize,
         captionSize.height);
+    
+     //if its too long we do hscroll with the caption
+    if (captionSize.width > maximumWidth){
+      mHorizontalScrollIndex = mHorizontalScrollIndex + 2;
+      if (mHorizontalScrollIndex > captionSize.width){
+        mHorizontalScrollIndex = -totalSize.width;
+      }      
+      int horizontal_scroll = mHorizontalScrollIndex;
+      if (horizontal_scroll < 40){
+       horizontal_scroll = 40;	
+      }else{
+        horizontal_scroll = 80 - mHorizontalScrollIndex;
+      }
+      captionWidget->setPosition (IntPoint(horizontal_scroll, captionWidget->getPosition().top + padding.top));
+    } else {
+      captionWidget->setPosition (captionWidget->getPosition() + padding);
+    }
 
-    captionWidget->setPosition (captionWidget->getPosition() + padding);
     textWidget->setPosition (textWidget->getPosition() + IntPoint(0, padding.top)); // only apply vertical padding, the horizontal works automatically due to Align::HCenter
 
     if (image != "")
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index 270df4ae2..4048d0d5a 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -90,6 +90,9 @@ namespace MWGui
 
         float mFocusToolTipX;
         float mFocusToolTipY;
+	
+	int mHorizontalScrollIndex;
+	
 
         float mDelay;
         float mRemainingDelay; // remaining time until tooltip will show
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index c6a21c461..51eb3d87e 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -211,7 +211,7 @@ namespace MWGui
                 + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange()),100));
 
             MWMechanics::NpcStats sellerSkill = MWWorld::Class::get(mPtr).getNpcStats(mPtr);
-            MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(mPtr).getCreatureStats(mPtr); 
+            MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(mPtr).getCreatureStats(mPtr);
             MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
             MWMechanics::NpcStats playerSkill = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
             MWMechanics::CreatureStats playerStats = MWWorld::Class::get(playerPtr).getCreatureStats(playerPtr);
@@ -239,7 +239,10 @@ namespace MWGui
                 MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterFailDisposition);
                 return;
             }
-        }
+
+            //skill use!
+            MWWorld::Class::get(playerPtr).skillUsageSucceeded(playerPtr, ESM::Skill::Mercantile, 0);
+	}
 
         int iBarterSuccessDisposition = gmst.find("iBarterSuccessDisposition")->getInt();
         MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterSuccessDisposition);
@@ -398,19 +401,23 @@ namespace MWGui
         return items;
     }
 
-    void TradeWindow::sellToNpc(MWWorld::Ptr item, int count)
+    void TradeWindow::sellToNpc(MWWorld::Ptr item, int count, bool boughtItem)
     {
+        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count, boughtItem);
+
+        mCurrentBalance += diff;
+        mCurrentMerchantOffer += diff;
 
-        mCurrentBalance -= MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,true);
-        mCurrentMerchantOffer -= MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,true);
         updateLabels();
     }
 
-    void TradeWindow::buyFromNpc(MWWorld::Ptr item, int count)
+    void TradeWindow::buyFromNpc(MWWorld::Ptr item, int count, bool soldItem)
     {
+        int diff = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count, !soldItem);
+
+        mCurrentBalance -= diff;
+        mCurrentMerchantOffer -= diff;
 
-        mCurrentBalance += MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,false);
-        mCurrentMerchantOffer += MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, MWWorld::Class::get(item).getValue(item) * count,false);
         updateLabels();
     }
 
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index db386d8b6..219e44036 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -27,8 +27,8 @@ namespace MWGui
 
             void startTrade(MWWorld::Ptr actor);
 
-            void sellToNpc(MWWorld::Ptr item, int count); ///< only used for adjusting the gold balance
-            void buyFromNpc(MWWorld::Ptr item, int count); ///< only used for adjusting the gold balance
+            void sellToNpc(MWWorld::Ptr item, int count, bool boughtItem); ///< only used for adjusting the gold balance
+            void buyFromNpc(MWWorld::Ptr item, int count, bool soldItem); ///< only used for adjusting the gold balance
 
             bool npcAcceptsItem(MWWorld::Ptr item);
 
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index abbc6172f..9615e95f7 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -82,7 +82,7 @@ namespace MWGui
         oss << price;
         toAdd->setUserString("price",oss.str());
 
-        toAdd->setCaptionWithReplacing(travelId+"   -   "+boost::lexical_cast<std::string>(price)+"#{sgp}");
+        toAdd->setCaptionWithReplacing("#{sCell=" + travelId + "}   -   " + boost::lexical_cast<std::string>(price)+"#{sgp}");
         toAdd->setSize(toAdd->getTextSize().width,sLineHeight);
         toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel);
         toAdd->setUserString("Destination", travelId);
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 31b5cce35..4f2c98c08 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -204,6 +204,7 @@ namespace MWGui
         MWBase::Environment::get().getWorld ()->getFader ()->fadeIn(0.2);
         mProgressBar.setVisible (false);
         mWindowManager.removeGuiMode (GM_Rest);
+        mWindowManager.removeGuiMode (GM_RestBed);
         mWaiting = false;
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 82e112826..f932c1f03 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -390,8 +390,13 @@ void MWSpellEffect::setSpellEffect(const SpellEffectParams& params)
 
 void MWSpellEffect::updateWidgets()
 {
-    if (!mWindowManager)
+    if (!mEffectParams.mKnown)
+    {
+        mTextWidget->setCaption ("?");
+        mRequestedWidth = mTextWidget->getTextSize().width + 24;
+        mImageWidget->setImageTexture ("");
         return;
+    }
 
     const MWWorld::ESMStore &store =
         MWBase::Environment::get().getWorld()->getStore();
@@ -400,7 +405,6 @@ void MWSpellEffect::updateWidgets()
         store.get<ESM::MagicEffect>().search(mEffectParams.mEffectID);
 
     assert(magicEffect);
-    assert(mWindowManager);
 
     std::string pt =  mWindowManager->getGameSettingString("spoint", "");
     std::string pts =  mWindowManager->getGameSettingString("spoints", "");
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 4ac5383f7..7cbb5e53a 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -37,12 +37,15 @@ namespace MWGui
                 , mEffectID(-1)
                 , mNoTarget(false)
                 , mIsConstant(false)
+                , mKnown(true)
             {
             }
 
             bool mNoTarget; // potion effects for example have no target (target is always the player)
             bool mIsConstant; // constant effect means that duration will not be displayed
 
+            bool mKnown; // is this effect known to the player? (If not, will display as a question mark instead)
+
             // value of -1 here means the effect is unknown to the player
             short mEffectID;
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 376eca88d..8ec495550 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -9,6 +9,7 @@
 #include <openengine/gui/manager.hpp>
 
 #include <components/settings/settings.hpp>
+#include <components/translation/translation.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -50,12 +51,14 @@
 #include "spellcreationdialog.hpp"
 #include "enchantingdialog.hpp"
 #include "trainingwindow.hpp"
+#include "imagebutton.hpp"
 
 using namespace MWGui;
 
 WindowManager::WindowManager(
     const Compiler::Extensions& extensions, int fpsLevel, bool newGame, OEngine::Render::OgreRenderer *mOgre,
-        const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts)
+        const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
+        Translation::Storage& translationDataStorage)
   : mGuiManager(NULL)
   , mHud(NULL)
   , mMap(NULL)
@@ -104,6 +107,7 @@ WindowManager::WindowManager(
   , mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
   , mSubtitlesEnabled(Settings::Manager::getBool ("subtitles", "GUI"))
   , mHudEnabled(true)
+  , mTranslationDataStorage (translationDataStorage)
 {
 
     // Set up the GUI system
@@ -123,6 +127,7 @@ WindowManager::WindowManager(
     MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::VBox>("Widget");
     MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::AutoSizedTextBox>("Widget");
     MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::AutoSizedButton>("Widget");
+    MyGUI::FactoryManager::getInstance().registerFactory<MWGui::ImageButton>("Widget");
 
     MyGUI::LanguageManager::getInstance().eventRequestTag = MyGUI::newDelegate(this, &WindowManager::onRetrieveTag);
 
@@ -225,6 +230,8 @@ WindowManager::~WindowManager()
     delete mSpellCreationDialog;
     delete mEnchantingDialog;
     delete mTrainingWindow;
+    delete mCountDialog;
+    delete mQuickKeysMenu;
 
     cleanupGarbage();
 
@@ -402,6 +409,10 @@ void WindowManager::updateVisible()
         case GM_Loading:
             MyGUI::PointerManager::getInstance().setVisible(false);
             break;
+        case GM_Video:
+            MyGUI::PointerManager::getInstance().setVisible(false);
+            mHud->setVisible(false);
+            break;
         default:
             // Unsupported mode, switch back to game
             break;
@@ -534,10 +545,14 @@ void WindowManager::removeDialog(OEngine::GUI::Layout*dialog)
 
 void WindowManager::messageBox (const std::string& message, const std::vector<std::string>& buttons)
 {
-    if (buttons.empty())
-    {
-        mMessageBoxManager->createMessageBox(message);
+    if(buttons.empty()){
+        /* If there are no buttons, and there is a dialogue window open, messagebox goes to the dialogue window */
+        if(!mGuiModes.empty() && mGuiModes.back() == GM_Dialogue)
+            mDialogueWindow->addMessageBox(MyGUI::LanguageManager::getInstance().replaceTags(message));
+        else
+            mMessageBoxManager->createMessageBox(message);
     }
+    
     else
     {
         mMessageBoxManager->createInteractiveMessageBox(message, buttons);
@@ -612,7 +627,7 @@ void WindowManager::changeCell(MWWorld::Ptr::CellStore* cell)
         if (cell->mCell->mName != "")
         {
             name = cell->mCell->mName;
-            mMap->addVisitedLocation (name, cell->mCell->getGridX (), cell->mCell->getGridY ());
+            mMap->addVisitedLocation ("#{sCell=" + name + "}", cell->mCell->getGridX (), cell->mCell->getGridY ());
         }
         else
         {
@@ -722,13 +737,25 @@ void WindowManager::setDragDrop(bool dragDrop)
 
 void WindowManager::onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result)
 {
-    const ESM::GameSetting *setting =
-        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(_tag);
+    std::string tag(_tag);
 
-    if (setting && setting->mType == ESM::VT_String)
-        _result = setting->getString();
+    std::string tokenToFind = "sCell=";
+    size_t tokenLength = tokenToFind.length();
+
+    if (tag.substr(0, tokenLength) == tokenToFind)
+    {
+        _result = mTranslationDataStorage.translateCellName(tag.substr(tokenLength));
+    }
     else
-        _result = _tag;
+    {
+        const ESM::GameSetting *setting =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(tag);
+
+        if (setting && setting->mType == ESM::VT_String)
+            _result = setting->getString();
+        else
+            _result = tag;
+    }
 }
 
 void WindowManager::processChangedSettings(const Settings::CategorySettingVector& changed)
@@ -1035,3 +1062,8 @@ void WindowManager::startTraining(MWWorld::Ptr actor)
 {
     mTrainingWindow->startTraining(actor);
 }
+
+const Translation::Storage& WindowManager::getTranslationDataStorage() const
+{
+    return mTranslationDataStorage;
+}
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 2e684b5da..8bcb88e22 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -29,6 +29,11 @@ namespace Compiler
     class Extensions;
 }
 
+namespace Translation
+{
+    class Storage;
+}
+
 namespace OEngine
 {
     namespace GUI
@@ -76,7 +81,8 @@ namespace MWGui
 
     WindowManager(const Compiler::Extensions& extensions, int fpsLevel, bool newGame,
                   OEngine::Render::OgreRenderer *mOgre, const std::string& logpath,
-                  const std::string& cacheDir, bool consoleOnlyScripts);
+                  const std::string& cacheDir, bool consoleOnlyScripts,
+                  Translation::Storage& translationDataStorage);
     virtual ~WindowManager();
 
     /**
@@ -219,6 +225,8 @@ namespace MWGui
     virtual void startEnchanting(MWWorld::Ptr actor);
     virtual void startTraining(MWWorld::Ptr actor);
 
+    virtual const Translation::Storage& getTranslationDataStorage() const;
+
   private:
     OEngine::GUI::MyGUIManager *mGuiManager;
     HUD *mHud;
@@ -250,6 +258,7 @@ namespace MWGui
     SpellCreationDialog* mSpellCreationDialog;
     EnchantingDialog* mEnchantingDialog;
     TrainingWindow* mTrainingWindow;
+    Translation::Storage& mTranslationDataStorage;
 
     CharacterCreation* mCharGen;
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index af30c9b04..1f270df8b 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -40,6 +40,7 @@ namespace MWInput
         , mMouseLookEnabled(true)
         , mMouseX(ogre.getWindow()->getWidth ()/2.f)
         , mMouseY(ogre.getWindow()->getHeight ()/2.f)
+        , mMouseWheel(0)
         , mUserFile(userFile)
         , mDragDrop(false)
         , mGuiCursorEnabled(false)
@@ -242,6 +243,11 @@ namespace MWInput
         mKeyboard->capture();
         mMouse->capture();
 
+        // inject some fake mouse movement to force updating MyGUI's widget states
+        // this shouldn't do any harm since we're moving back to the original position afterwards
+        MyGUI::InputManager::getInstance().injectMouseMove( int(mMouseX+1), int(mMouseY+1), mMouseWheel);
+        MyGUI::InputManager::getInstance().injectMouseMove( int(mMouseX), int(mMouseY), mMouseWheel);
+
         // update values of channels (as a result of pressed keys)
         if (!loading)
             mInputCtrl->update(dt);
@@ -486,8 +492,9 @@ namespace MWInput
             mMouseY += float(arg.state.Y.rel) * mUISensitivity * mUIYMultiplier;
             mMouseX = std::max(0.f, std::min(mMouseX, float(viewSize.width)));
             mMouseY = std::max(0.f, std::min(mMouseY, float(viewSize.height)));
+            mMouseWheel = arg.state.Z.abs;
 
-            MyGUI::InputManager::getInstance().injectMouseMove( int(mMouseX), int(mMouseY), arg.state.Z.abs);
+            MyGUI::InputManager::getInstance().injectMouseMove( int(mMouseX), int(mMouseY), mMouseWheel);
         }
 
         if (mMouseLookEnabled)
@@ -508,6 +515,8 @@ namespace MWInput
     {
         if (mWindows.isGuiMode () && (mWindows.getMode () == MWGui::GM_MainMenu || mWindows.getMode () == MWGui::GM_Settings))
             mWindows.popGuiMode();
+        else if (mWindows.isGuiMode () && mWindows.getMode () == MWGui::GM_Video)
+            MWBase::Environment::get().getWorld ()->stopVideo ();
         else
             mWindows.pushGuiMode (MWGui::GM_MainMenu);
     }
@@ -624,7 +633,9 @@ namespace MWInput
     void InputManager::toggleAutoMove()
     {
         if (mWindows.isGuiMode()) return;
-        mPlayer.setAutoMove (!mPlayer.getAutoMove());
+
+        if (mControlSwitch["playercontrols"])
+            mPlayer.setAutoMove (!mPlayer.getAutoMove());
     }
 
     void InputManager::toggleWalking()
diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 718d6b76f..9deed1f28 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -147,6 +147,7 @@ namespace MWInput
 
         float mMouseX;
         float mMouseY;
+        int mMouseWheel;
 
         std::map<std::string, bool> mControlSwitch;
 
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 989bdedd7..ee1e9da36 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -3,6 +3,8 @@
 
 #include <cstdlib>
 
+#include <boost/algorithm/string.hpp>
+
 #include <components/esm/loadalch.hpp>
 #include <components/esm/loadspel.hpp>
 #include <components/esm/loadingr.hpp>
@@ -258,4 +260,18 @@ namespace MWMechanics
 
         return scaledDuration-usedUp;
     }
+
+    bool ActiveSpells::isSpellActive(std::string id) const
+    {
+        Misc::StringUtils::toLower(id);
+        for (TContainer::iterator iter = mSpells.begin(); iter != mSpells.end(); ++iter)
+        {
+            std::string left = iter->first;
+            Misc::StringUtils::toLower(left);
+
+            if (iter->first == id)
+                return true;
+        }
+        return false;
+    }
 }
diff --git a/apps/openmw/mwmechanics/activespells.hpp b/apps/openmw/mwmechanics/activespells.hpp
index e7a239854..6b832f4cd 100644
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@@ -58,6 +58,9 @@ namespace MWMechanics
 
             void removeSpell (const std::string& id);
 
+            bool isSpellActive (std::string id) const;
+            ///< case insensitive
+
             const MagicEffects& getMagicEffects() const;
 
             TIterator begin() const;
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 27cd9095d..ebbea55b0 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -5,6 +5,12 @@ MWMechanics::AiEscort::AiEscort(const std::string &actorId,int duration, float x
 : mActorId(actorId), mX(x), mY(y), mZ(z), mDuration(duration)
 {
 }
+
+MWMechanics::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)
+{
+}
+
 
 MWMechanics::AiEscort *MWMechanics::AiEscort::clone() const
 {
diff --git a/apps/openmw/mwmechanics/aiescort.hpp b/apps/openmw/mwmechanics/aiescort.hpp
index fef70f508..d89a9586c 100644
--- a/apps/openmw/mwmechanics/aiescort.hpp
+++ b/apps/openmw/mwmechanics/aiescort.hpp
@@ -10,6 +10,10 @@ namespace MWMechanics
     {
         public:
             AiEscort(const std::string &actorId,int duration, float x, float y, float z);
+            ///< \implement AiEscort
+            AiEscort(const std::string &actorId,const std::string &cellId,int duration, float x, float y, float z);
+            ///< \implement AiEscortCell
+
             virtual AiEscort *clone() const;
 
             virtual bool execute (const MWWorld::Ptr& actor);
@@ -19,6 +23,7 @@ namespace MWMechanics
 
         private:
             std::string mActorId;
+            std::string mCellId;
             float mX;
             float mY;
             float mZ;
diff --git a/apps/openmw/mwmechanics/aifollow.cpp b/apps/openmw/mwmechanics/aifollow.cpp
index 3fee6d98c..dab9e0283 100644
--- a/apps/openmw/mwmechanics/aifollow.cpp
+++ b/apps/openmw/mwmechanics/aifollow.cpp
@@ -5,6 +5,11 @@ MWMechanics::AiFollow::AiFollow(const std::string &actorId,float duration, float
 : mDuration(duration), mX(x), mY(y), mZ(z), mActorId(actorId)
 {
 }
+MWMechanics::AiFollow::AiFollow(const std::string &actorId,const std::string &cellId,float duration, float x, float y, float z)
+: mDuration(duration), mX(x), mY(y), mZ(z), mActorId(actorId), mCellId(cellId)
+{
+}
+
 MWMechanics::AiFollow *MWMechanics::AiFollow::clone() const
 {
     return new AiFollow(*this);
diff --git a/apps/openmw/mwmechanics/aifollow.hpp b/apps/openmw/mwmechanics/aifollow.hpp
index ded13d780..0b37b0a2d 100644
--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@@ -11,6 +11,7 @@ namespace MWMechanics
     {
         public:
             AiFollow(const std::string &ActorId,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);
             virtual AiFollow *clone() const;
             virtual bool execute (const MWWorld::Ptr& actor);
                     ///< \return Package completed?
@@ -21,7 +22,8 @@ namespace MWMechanics
             float mX;
             float mY;
             float mZ;
-            std::string mActorId;
+            std::string mActorId;
+            std::string mCellId;
     };
 }
 #endif
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index c07c60209..8ab81bfdf 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -203,7 +203,7 @@ const ESM::Potion *MWMechanics::Alchemy::getRecord() const
          
         bool mismatch = false; 
 
-        for (int i=0; i<static_cast<int> (iter->mEffects.mList.size()); ++iter)
+        for (int i=0; i<static_cast<int> (iter->mEffects.mList.size()); ++i)
         {
             const ESM::ENAMstruct& first = iter->mEffects.mList[i];
             const ESM::ENAMstruct& second = mEffects[i];
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 94363cb79..1a7b34817 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -68,7 +68,7 @@ namespace MWMechanics
         }
     }
 
-    void MagicEffects::add (const ESM::EffectList& list)
+    void MagicEffects::add (const ESM::EffectList& list, float magnitude)
     {
         for (std::vector<ESM::ENAMstruct>::const_iterator iter (list.mList.begin()); iter!=list.mList.end();
             ++iter)
@@ -78,9 +78,13 @@ namespace MWMechanics
             if (iter->mMagnMin>=iter->mMagnMax)
                 param.mMagnitude = iter->mMagnMin;
             else
+            {
+                if (magnitude==-1)
+                    magnitude = static_cast<float> (std::rand()) / RAND_MAX;
+
                 param.mMagnitude = static_cast<int> (
-                    (iter->mMagnMax-iter->mMagnMin+1)*
-                    (static_cast<float> (std::rand()) / RAND_MAX) + iter->mMagnMin);
+                    (iter->mMagnMax-iter->mMagnMin+1)*magnitude + iter->mMagnMin);
+            }
 
             add (*iter, param);
         }
diff --git a/apps/openmw/mwmechanics/magiceffects.hpp b/apps/openmw/mwmechanics/magiceffects.hpp
index 2f61d7eeb..b80b5a863 100644
--- a/apps/openmw/mwmechanics/magiceffects.hpp
+++ b/apps/openmw/mwmechanics/magiceffects.hpp
@@ -67,7 +67,8 @@ namespace MWMechanics
 
             void add (const EffectKey& key, const EffectParam& param);
 
-            void add (const ESM::EffectList& list);
+            void add (const ESM::EffectList& list, float magnitude = -1);
+            ///< \param magnitude normalised magnitude (-1: random)
 
             MagicEffects& operator+= (const MagicEffects& effects);
 
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 1b6e4b9f3..dae417d44 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -38,7 +38,7 @@ namespace MWMechanics
         creatureStats.getAttribute(5).setBase (player->mNpdt52.mEndurance);
         creatureStats.getAttribute(6).setBase (player->mNpdt52.mPersonality);
         creatureStats.getAttribute(7).setBase (player->mNpdt52.mLuck);
-        
+
         const MWWorld::ESMStore &esmStore =
             MWBase::Environment::get().getWorld()->getStore();
 
@@ -46,7 +46,7 @@ namespace MWMechanics
         if (mRaceSelected)
         {
             const ESM::Race *race =
-                esmStore.get<ESM::Race>().find(player->mRace); 
+                esmStore.get<ESM::Race>().find(player->mRace);
 
             bool male = (player->mFlags & ESM::NPC::Female) == 0;
 
@@ -72,14 +72,14 @@ namespace MWMechanics
             for (int i=0; i<27; ++i)
             {
                 int bonus = 0;
-                
+
                 for (int i2=0; i2<7; ++i2)
                     if (race->mData.mBonus[i2].mSkill==i)
                     {
                         bonus = race->mData.mBonus[i2].mBonus;
                         break;
                     }
-            
+
                 npcStats.getSkill (i).setBase (5 + bonus);
             }
 
@@ -270,7 +270,7 @@ namespace MWMechanics
             // basic player profile; should not change anymore after the creation phase is finished.
             MWBase::WindowManager *winMgr =
                 MWBase::Environment::get().getWindowManager();
-           
+
             MWBase::World *world = MWBase::Environment::get().getWorld();
             const ESM::NPC *player =
                 world->getPlayer().getPlayer().get<ESM::NPC>()->mBase;
@@ -377,16 +377,6 @@ namespace MWMechanics
         mUpdatePlayer = true;
     }
 
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-
     int MechanicsManager::getDerivedDisposition(const MWWorld::Ptr& ptr)
     {
         MWMechanics::NpcStats npcSkill = MWWorld::Class::get(ptr).getNpcStats(ptr);
@@ -398,7 +388,7 @@ namespace MWMechanics
         MWMechanics::CreatureStats playerStats = MWWorld::Class::get(playerPtr).getCreatureStats(playerPtr);
         MWMechanics::NpcStats playerNpcStats = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
 
-        if (toLower(npc->mBase->mRace) == toLower(player->mBase->mRace)) x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispRaceMod")->getFloat();
+        if (Misc::StringUtils::lowerCase(npc->mBase->mRace) == Misc::StringUtils::lowerCase(player->mBase->mRace)) x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispRaceMod")->getFloat();
 
         x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispPersonalityMult")->getFloat()
             * (playerStats.getAttribute(ESM::Attribute::Personality).getModified() - MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispPersonalityBase")->getFloat());
@@ -408,21 +398,21 @@ namespace MWMechanics
         std::string npcFaction = "";
         if(!npcSkill.getFactionRanks().empty()) npcFaction = npcSkill.getFactionRanks().begin()->first;
 
-        if (playerNpcStats.getFactionRanks().find(toLower(npcFaction)) != playerNpcStats.getFactionRanks().end())
+        if (playerNpcStats.getFactionRanks().find(Misc::StringUtils::lowerCase(npcFaction)) != playerNpcStats.getFactionRanks().end())
         {
-            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.begin();
-                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.end(); it++)
+            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.begin();
+                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.end(); it++)
             {
-                if(toLower(it->mFaction) == toLower(npcFaction)) reaction = it->mReaction;
+                if(Misc::StringUtils::lowerCase(it->mFaction) == Misc::StringUtils::lowerCase(npcFaction)) reaction = it->mReaction;
             }
-            rank = playerNpcStats.getFactionRanks().find(toLower(npcFaction))->second;
+            rank = playerNpcStats.getFactionRanks().find(Misc::StringUtils::lowerCase(npcFaction))->second;
         }
         else if (npcFaction != "")
         {
-            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.begin();
-                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(toLower(npcFaction))->mReactions.end();it++)
+            for(std::vector<ESM::Faction::Reaction>::const_iterator it = MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.begin();
+                it != MWBase::Environment::get().getWorld()->getStore().get<ESM::Faction>().find(Misc::StringUtils::lowerCase(npcFaction))->mReactions.end();it++)
             {
-                if(playerNpcStats.getFactionRanks().find(toLower(it->mFaction)) != playerNpcStats.getFactionRanks().end() )
+                if(playerNpcStats.getFactionRanks().find(Misc::StringUtils::lowerCase(it->mFaction)) != playerNpcStats.getFactionRanks().end() )
                 {
                     if(it->mReaction<reaction) reaction = it->mReaction;
                 }
@@ -442,7 +432,7 @@ namespace MWMechanics
         if (playerStats.hasCommonDisease() || playerStats.hasBlightDisease())
             x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispDiseaseMod")->getFloat();
 
-        if (playerNpcStats.getDrawState() == MWMechanics::DrawState_::DrawState_Weapon)
+        if (playerNpcStats.getDrawState() == MWMechanics::DrawState_Weapon)
             x += MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fDispWeaponDrawn")->getFloat();
 
         int effective_disposition = std::max(0,std::min(int(x),100));//, normally clamped to [0..100] when used
@@ -455,7 +445,7 @@ namespace MWMechanics
             return basePrice;
 
         MWMechanics::NpcStats sellerSkill = MWWorld::Class::get(ptr).getNpcStats(ptr);
-        MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(ptr).getCreatureStats(ptr); 
+        MWMechanics::CreatureStats sellerStats = MWWorld::Class::get(ptr).getCreatureStats(ptr);
 
         MWWorld::Ptr playerPtr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
         MWMechanics::NpcStats playerSkill = MWWorld::Class::get(playerPtr).getNpcStats(playerPtr);
@@ -471,13 +461,13 @@ namespace MWMechanics
         float d = std::min(sellerSkill.getSkill(ESM::Skill::Mercantile).getModified(), 100.f);
         float e = std::min(0.1f * sellerStats.getAttribute(ESM::Attribute::Luck).getModified(), 10.f);
         float f = std::min(0.2f * sellerStats.getAttribute(ESM::Attribute::Personality).getModified(), 10.f);
- 
+
         float pcTerm = (clampedDisposition - 50 + a + b + c) * playerStats.getFatigueTerm();
         float npcTerm = (d + e + f) * sellerStats.getFatigueTerm();
         float buyTerm = 0.01 * (100 - 0.5 * (pcTerm - npcTerm));
         float sellTerm = 0.01 * (50 - 0.5 * (npcTerm - pcTerm));
 
-        float x; 
+        float x;
         if(buying) x = buyTerm;
         else x = std::min(buyTerm, sellTerm);
         int offerPrice;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
index f8d470a4e..d3a97db36 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
@@ -90,6 +90,7 @@ namespace MWMechanics
             
             virtual void getPersuasionDispositionChange (const MWWorld::Ptr& npc, PersuasionType type,
                 float currentTemporaryDispositionDelta, bool& success, float& tempChange, float& permChange);
+            void toLower(std::string npcFaction);
             ///< Perform a persuasion action on NPC
     };
 }
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 20a0360e7..26c4c8e9a 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -117,12 +117,15 @@ float MWMechanics::NpcStats::getSkillGain (int skillIndex, const ESM::Class& cla
     if (usageType>=4)
         throw std::runtime_error ("skill usage type out of range");
 
-    if (usageType>0)
+    if (usageType>=0)
     {
         skillFactor = skill->mData.mUseValue[usageType];
 
-        if (skillFactor<=0)
+        if (skillFactor<0)
             throw std::runtime_error ("invalid skill gain factor");
+
+        if (skillFactor==0)
+            return 0;
     }
 
     const MWWorld::Store<ESM::GameSetting> &gmst =
@@ -217,7 +220,7 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
     std::stringstream message;
     message << boost::format(MWBase::Environment::get().getWindowManager ()->getGameSettingString ("sNotifyMessage39", ""))
                % std::string("#{" + ESM::Skill::sSkillNameIds[skillIndex] + "}")
-               % base;
+               % static_cast<int> (base);
     MWBase::Environment::get().getWindowManager ()->messageBox(message.str(), std::vector<std::string>());
 
     if (mLevelProgress >= 10)
@@ -350,4 +353,4 @@ void MWMechanics::NpcStats::setWerewolf (bool set)
 int MWMechanics::NpcStats::getWerewolfKills() const
 {
     return mWerewolfKills;
-}
\ No newline at end of file
+}
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index ef084f479..e2da7cdc8 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -1,22 +1,19 @@
 
 #include "spells.hpp"
 
-#include "../mwworld/esmstore.hpp"
+#include <cstdlib>
 
 #include <components/esm/loadspel.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/esmstore.hpp"
+
 #include "magiceffects.hpp"
 
 namespace MWMechanics
 {
-    void Spells::addSpell (const ESM::Spell *spell, MagicEffects& effects) const
-    {
-        effects.add (spell->mEffects);
-    }
-
     Spells::TIterator Spells::begin() const
     {
         return mSpells.begin();
@@ -29,13 +26,13 @@ namespace MWMechanics
 
     void Spells::add (const std::string& spellId)
     {
-        if (std::find (mSpells.begin(), mSpells.end(), spellId)==mSpells.end())
-            mSpells.push_back (spellId);
+        if (mSpells.find (spellId)==mSpells.end())
+            mSpells.insert (std::make_pair (spellId, static_cast<float> (std::rand()) / RAND_MAX));
     }
 
     void Spells::remove (const std::string& spellId)
     {
-        TContainer::iterator iter = std::find (mSpells.begin(), mSpells.end(), spellId);
+        TContainer::iterator iter = mSpells.find (spellId);
 
         if (iter!=mSpells.end())
             mSpells.erase (iter);
@@ -51,11 +48,11 @@ namespace MWMechanics
         for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
         {
             const ESM::Spell *spell =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
 
             if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
                 spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
-                addSpell (spell, effects);
+                effects.add (spell->mEffects, iter->second);
         }
 
         return effects;
@@ -75,18 +72,18 @@ namespace MWMechanics
     {
         return mSelectedSpell;
     }
-    
+
     bool Spells::hasCommonDisease() const
     {
         for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
         {
             const ESM::Spell *spell =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
-        
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
+
             if (spell->mData.mFlags & ESM::Spell::ST_Disease)
                 return true;
         }
-        
+
         return false;
     }
 
@@ -95,12 +92,12 @@ namespace MWMechanics
         for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
         {
             const ESM::Spell *spell =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
-        
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
+
             if (spell->mData.mFlags & ESM::Spell::ST_Blight)
                 return true;
         }
-        
-        return false;    
+
+        return false;
     }
 }
diff --git a/apps/openmw/mwmechanics/spells.hpp b/apps/openmw/mwmechanics/spells.hpp
index 12308661b..e00ac259f 100644
--- a/apps/openmw/mwmechanics/spells.hpp
+++ b/apps/openmw/mwmechanics/spells.hpp
@@ -1,7 +1,7 @@
 #ifndef GAME_MWMECHANICS_SPELLS_H
 #define GAME_MWMECHANICS_SPELLS_H
 
-#include <vector>
+#include <map>
 #include <string>
 
 namespace ESM
@@ -21,16 +21,14 @@ namespace MWMechanics
     {
         public:
 
-            typedef std::vector<std::string> TContainer;
+            typedef std::map<std::string, float> TContainer; // ID, normalised magnitude
             typedef TContainer::const_iterator TIterator;
 
         private:
 
-            std::vector<std::string> mSpells;
+            TContainer mSpells;
             std::string mSelectedSpell;
 
-            void addSpell (const ESM::Spell *, MagicEffects& effects) const;
-
         public:
 
             TIterator begin() const;
@@ -55,10 +53,10 @@ namespace MWMechanics
 
             const std::string getSelectedSpell() const;
             ///< May return an empty string.
-            
+
             bool hasCommonDisease() const;
 
-            bool hasBlightDisease() const;            
+            bool hasBlightDisease() const;
     };
 }
 
diff --git a/apps/openmw/mwrender/actors.cpp b/apps/openmw/mwrender/actors.cpp
index 05bb030d7..92f5cbe28 100644
--- a/apps/openmw/mwrender/actors.cpp
+++ b/apps/openmw/mwrender/actors.cpp
@@ -6,41 +6,42 @@
 #include "renderconst.hpp"
 
 
-using namespace Ogre;
-using namespace MWRender;
-using namespace NifOgre;
+namespace MWRender
+{
 
 Actors::~Actors(){
 
-    std::map<MWWorld::Ptr, Animation*>::iterator it = mAllActors.begin();
-    for (; it != mAllActors.end(); ++it) {
+    PtrAnimationMap::iterator it = mAllActors.begin();
+    for(;it != mAllActors.end();++it)
+    {
         delete it->second;
         it->second = NULL;
     }
 }
 
-void Actors::setMwRoot(Ogre::SceneNode* root){
-    mMwRoot = root;
-}
-void Actors::insertNPC(const MWWorld::Ptr& ptr, MWWorld::InventoryStore& inv){
+void Actors::setMwRoot(Ogre::SceneNode* root)
+{ mMwRoot = root; }
 
+void Actors::insertNPC(const MWWorld::Ptr &ptr, MWWorld::InventoryStore &inv)
+{
     insertBegin(ptr, true, true);
     NpcAnimation* anim = new MWRender::NpcAnimation(ptr, ptr.getRefData ().getBaseNode (), inv, RV_Actors);
 
     mAllActors[ptr] = anim;
 }
-void Actors::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
+
+void Actors::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_)
+{
     Ogre::SceneNode* cellnode;
-    if(mCellSceneNodes.find(ptr.getCell()) == mCellSceneNodes.end())
+    CellSceneNodeMap::const_iterator celliter = mCellSceneNodes.find(ptr.getCell());
+    if(celliter != mCellSceneNodes.end())
+        cellnode = celliter->second;
+    else
     {
         //Create the scenenode and put it in the map
         cellnode = mMwRoot->createChildSceneNode();
         mCellSceneNodes[ptr.getCell()] = cellnode;
     }
-    else
-    {
-        cellnode = mCellSceneNodes[ptr.getCell()];
-    }
 
     Ogre::SceneNode* insert = cellnode->createChildSceneNode();
     const float *f = ptr.getRefData().getPosition().pos;
@@ -51,13 +52,13 @@ void Actors::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
     f = ptr.getCellRef().mPos.rot;
 
     // Rotate around X axis
-    Quaternion xr(Radian(-f[0]), Vector3::UNIT_X);
+    Ogre::Quaternion xr(Ogre::Radian(-f[0]), Ogre::Vector3::UNIT_X);
 
     // Rotate around Y axis
-    Quaternion yr(Radian(-f[1]), Vector3::UNIT_Y);
+    Ogre::Quaternion yr(Ogre::Radian(-f[1]), Ogre::Vector3::UNIT_Y);
 
     // Rotate around Z axis
-    Quaternion zr(Radian(-f[2]), Vector3::UNIT_Z);
+    Ogre::Quaternion zr(Ogre::Radian(-f[2]), Ogre::Vector3::UNIT_Z);
 
    // Rotates first around z, then y, then x
     insert->setOrientation(xr*yr*zr);
@@ -71,30 +72,30 @@ void Actors::insertCreature (const MWWorld::Ptr& ptr){
 
     insertBegin(ptr, true, true);
     CreatureAnimation* anim = new MWRender::CreatureAnimation(ptr);
-    //mAllActors.insert(std::pair<MWWorld::Ptr, Animation*>(ptr,anim));
+
     delete mAllActors[ptr];
     mAllActors[ptr] = anim;
-   //mAllActors.push_back(&anim);*/
 }
 
 bool Actors::deleteObject (const MWWorld::Ptr& ptr)
 {
-	delete mAllActors[ptr];
-	mAllActors.erase(ptr);
-    if (Ogre::SceneNode *base = ptr.getRefData().getBaseNode())
+    delete mAllActors[ptr];
+    mAllActors.erase(ptr);
+
+    if(Ogre::SceneNode *base=ptr.getRefData().getBaseNode())
     {
-
         Ogre::SceneNode *parent = base->getParentSceneNode();
-
-        for (std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *>::const_iterator iter (
-            mCellSceneNodes.begin()); iter!=mCellSceneNodes.end(); ++iter)
-            if (iter->second==parent)
+        CellSceneNodeMap::const_iterator iter(mCellSceneNodes.begin());
+        for(;iter != mCellSceneNodes.end();++iter)
+        {
+            if(iter->second == parent)
             {
                 base->removeAndDestroyAllChildren();
                 mRend.getScene()->destroySceneNode (base);
                 ptr.getRefData().setBaseNode (0);
                 return true;
             }
+        }
 
         return false;
     }
@@ -102,57 +103,70 @@ bool Actors::deleteObject (const MWWorld::Ptr& ptr)
     return true;
 }
 
-void Actors::removeCell(MWWorld::Ptr::CellStore* store){
-    if(mCellSceneNodes.find(store) != mCellSceneNodes.end())
+void Actors::removeCell(MWWorld::Ptr::CellStore* store)
+{
+    for(PtrAnimationMap::iterator iter = mAllActors.begin();iter != mAllActors.end();)
     {
-        Ogre::SceneNode* base = mCellSceneNodes[store];
-        base->removeAndDestroyAllChildren();
-        mCellSceneNodes.erase(store);
-        mRend.getScene()->destroySceneNode(base);
-        base = 0;
-    }
-    for(std::map<MWWorld::Ptr, Animation*>::iterator iter = mAllActors.begin(); iter != mAllActors.end(); )
-    {
-        if(iter->first.getCell() == store){
+        if(iter->first.getCell() == store)
+        {
             delete iter->second;
             mAllActors.erase(iter++);
         }
         else
             ++iter;
     }
+    CellSceneNodeMap::iterator celliter = mCellSceneNodes.find(store);
+    if(celliter != mCellSceneNodes.end())
+    {
+        Ogre::SceneNode *base = celliter->second;
+        base->removeAndDestroyAllChildren();
+        mRend.getScene()->destroySceneNode(base);
+        mCellSceneNodes.erase(celliter);
+    }
 }
 
-void Actors::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number){
-    if(mAllActors.find(ptr) != mAllActors.end())
-        mAllActors[ptr]->playGroup(groupName, mode, number);
+void Actors::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number)
+{
+    PtrAnimationMap::const_iterator iter = mAllActors.find(ptr);
+    if(iter != mAllActors.end())
+        iter->second->playGroup(groupName, mode, number);
 }
-void Actors::skipAnimation (const MWWorld::Ptr& ptr){
-    if(mAllActors.find(ptr) != mAllActors.end())
-        mAllActors[ptr]->skipAnim();
+void Actors::skipAnimation (const MWWorld::Ptr& ptr)
+{
+    PtrAnimationMap::const_iterator iter = mAllActors.find(ptr);
+    if(iter != mAllActors.end())
+        iter->second->skipAnim();
 }
-void Actors::update (float duration){
-    for(std::map<MWWorld::Ptr, Animation*>::iterator iter = mAllActors.begin(); iter != mAllActors.end(); iter++)
+void Actors::update (float duration)
+{
+    for(PtrAnimationMap::const_iterator iter = mAllActors.begin();iter != mAllActors.end();iter++)
         iter->second->runAnimation(duration);
 }
 
-void
-Actors::updateObjectCell(const MWWorld::Ptr &ptr)
+void Actors::updateObjectCell(const MWWorld::Ptr &ptr)
 {
     Ogre::SceneNode *node;
     MWWorld::CellStore *newCell = ptr.getCell();
 
-    if(mCellSceneNodes.find(newCell) == mCellSceneNodes.end()) {
+    CellSceneNodeMap::const_iterator celliter = mCellSceneNodes.find(newCell);
+    if(celliter != mCellSceneNodes.end())
+        node = celliter->second;
+    else
+    {
         node = mMwRoot->createChildSceneNode();
         mCellSceneNodes[newCell] = node;
-    } else {
-        node = mCellSceneNodes[newCell];
     }
     node->addChild(ptr.getRefData().getBaseNode());
-    if (mAllActors.find(ptr) != mAllActors.end()) {
+
+    PtrAnimationMap::iterator iter = mAllActors.find(ptr);
+    if(iter != mAllActors.end())
+    {
         /// \note Update key (Ptr's are compared only with refdata so mCell
         /// on key is outdated), maybe redundant
-        Animation *anim = mAllActors[ptr];
-        mAllActors.erase(ptr);
+        Animation *anim = iter->second;
+        mAllActors.erase(iter);
         mAllActors[ptr] = anim;
     }
 }
+
+}
diff --git a/apps/openmw/mwrender/actors.hpp b/apps/openmw/mwrender/actors.hpp
index 073c5d51f..efb6247e4 100644
--- a/apps/openmw/mwrender/actors.hpp
+++ b/apps/openmw/mwrender/actors.hpp
@@ -10,18 +10,22 @@ namespace MWWorld
     class CellStore;
 }
 
-namespace MWRender{
-    class Actors{
+namespace MWRender
+{
+    class Actors
+    {
+        typedef std::map<MWWorld::CellStore*,Ogre::SceneNode*> CellSceneNodeMap;
+        typedef std::map<MWWorld::Ptr,Animation*> PtrAnimationMap;
+
         OEngine::Render::OgreRenderer &mRend;
-        std::map<MWWorld::CellStore *, Ogre::SceneNode *> mCellSceneNodes;
         Ogre::SceneNode* mMwRoot;
-        std::map<MWWorld::Ptr, Animation*> mAllActors;
+        CellSceneNodeMap mCellSceneNodes;
+        PtrAnimationMap mAllActors;
 
-
-
-        public:
+    public:
         Actors(OEngine::Render::OgreRenderer& _rend): mRend(_rend) {}
         ~Actors();
+
         void setMwRoot(Ogre::SceneNode* root);
         void insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_);
         void insertCreature (const MWWorld::Ptr& ptr);
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index 0a11dc281..b034e098b 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -2,6 +2,7 @@
 
 
 #include <OgreSceneManager.h>
+#include <OgreRoot.h>
 #include <OgreHardwarePixelBuffer.h>
 
 #include <libs/openengine/ogre/selectionbuffer.hpp>
@@ -35,13 +36,18 @@ namespace MWRender
 
     }
 
-    void CharacterPreview::setup (Ogre::SceneManager *sceneManager)
+    void CharacterPreview::setup ()
     {
-        mSceneMgr = sceneManager;
+        mSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
         mCamera = mSceneMgr->createCamera (mName);
         mCamera->setAspectRatio (float(mSizeX) / float(mSizeY));
 
-        mNode = static_cast<Ogre::SceneNode*>(mSceneMgr->getRootSceneNode()->getChild("mwRoot"))->createChildSceneNode ();
+        Ogre::SceneNode* renderRoot = mSceneMgr->getRootSceneNode()->createChildSceneNode("renderRoot");
+
+        //we do this with mwRoot in renderingManager, do it here too.
+        renderRoot->pitch(Ogre::Degree(-90));
+
+        mNode = renderRoot->createChildSceneNode();
 
         mAnimation = new NpcAnimation(mCharacter, mNode,
             MWWorld::Class::get(mCharacter).getInventoryStore (mCharacter), RV_PlayerPreview);
@@ -79,6 +85,7 @@ namespace MWRender
         //Ogre::TextureManager::getSingleton().remove(mName);
         mSceneMgr->destroyCamera (mName);
         delete mAnimation;
+        Ogre::Root::getSingleton().destroySceneManager(mSceneMgr);
     }
 
     void CharacterPreview::rebuild()
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index 18362d1db..d07a03be7 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -23,14 +23,14 @@ namespace MWRender
 
     class NpcAnimation;
 
-    class CharacterPreview : public ExternalRendering
+    class CharacterPreview
     {
     public:
         CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name,
                          Ogre::Vector3 position, Ogre::Vector3 lookAt);
         virtual ~CharacterPreview();
 
-        virtual void setup (Ogre::SceneManager *sceneManager);
+        virtual void setup ();
         virtual void onSetup();
 
         virtual void rebuild();
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index e6a8006e2..d33bdda91 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -80,7 +80,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, MWWor
     mHairModel = "meshes\\" + store.get<ESM::BodyPart>().find(mNpc->mHair)->mModel;
 
     mBodyPrefix = "b_n_" + mNpc->mRace;
-    std::transform(mBodyPrefix.begin(), mBodyPrefix.end(), mBodyPrefix.begin(), ::tolower);
+    Misc::StringUtils::toLower(mBodyPrefix);
 
     mInsert = node;
     assert(mInsert);
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 36f09e6d9..ee36126f8 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -17,7 +17,7 @@
 
 using namespace MWRender;
 
-// These are the Morrowind.ini defaults
+/// \todo Replace these, once fallback values from the ini file are available.
 float Objects::lightLinearValue = 3;
 float Objects::lightLinearRadiusMult = 1;
 
@@ -31,7 +31,6 @@ int Objects::uniqueID = 0;
 
 void Objects::clearSceneNode (Ogre::SceneNode *node)
 {
-    /// \todo This should probably be moved into OpenEngine at some point.
     for (int i=node->numAttachedObjects()-1; i>=0; --i)
     {
         Ogre::MovableObject *object = node->getAttachedObject (i);
@@ -235,8 +234,9 @@ void Objects::insertLight (const MWWorld::Ptr& ptr, float r, float g, float b, f
     else
         info.type = LT_Normal;
 
-    // random starting phase for the animation
-    info.time = Ogre::Math::RangeRandom(0, 2 * Ogre::Math::PI);
+    // randomize lights animations
+    info.time = Ogre::Math::RangeRandom(-500, +500);
+    info.phase = Ogre::Math::RangeRandom(-500, +500);
 
     // adjust the lights depending if we're in an interior or exterior cell
     // quadratic means the light intensity falls off quite fast, resulting in a
@@ -373,6 +373,46 @@ void Objects::disableLights()
     }
 }
 
+namespace MWRender
+{
+    namespace Pulse
+    {
+        static float amplitude (float phase)
+        {
+            return sin (phase);
+        }
+    }
+
+    namespace Flicker
+    {
+        static const float fa = 0.785398f;
+        static const float fb = 1.17024f;
+
+        static const float tdo = 0.94f;
+        static const float tdm = 2.48f;
+
+        static const float f [3] = { 1.5708f,   4.18774f, 5.19934f };
+        static const float o [3] = { 0.804248f, 2.11115f, 3.46832f };
+        static const float m [3] = { 1.0f,      0.785f,   0.876f   };
+        static const float s = 0.394f;
+
+        static const float phase_wavelength = 120.0f * 3.14159265359f / fa;
+
+        static float frequency (float x)
+        {
+            return tdo + tdm * sin (fa * x);
+        }
+
+        static float amplitude (float x)
+        {
+            float v = 0.0f;
+            for (int i = 0; i < 3; ++i)
+                v += sin (fb*x*f[i] + o[1])*m[i];
+            return v * s;
+        }
+    }
+}
+
 void Objects::update(const float dt)
 {
     std::vector<LightInfo>::iterator it = mLights.begin();
@@ -382,77 +422,63 @@ void Objects::update(const float dt)
         {
             Ogre::Light* light = mMwRoot->getCreator()->getLight(it->name);
 
-            // Light animation (pulse & flicker)
-            it->time += dt;
-            const float phase = std::fmod(static_cast<double> (it->time), static_cast<double>(32 * 2 * Ogre::Math::PI)) * 20;
-            float pulseConstant;
+            float brightness;
+            float cycle_time;
+            float time_distortion;
+
+            if ((it->type == LT_Pulse) && (it->type == LT_PulseSlow))
+            {
+                cycle_time = 2 * Ogre::Math::PI;
+                time_distortion = 20.0f;
+            }
+            else
+            {
+                cycle_time = 500.0f;
+                it->phase = fmod (it->phase + dt, Flicker::phase_wavelength);
+                time_distortion = Flicker::frequency (it->phase);
+            }
+
+            it->time += it->dir*dt*time_distortion;
+            if (it->dir > 0 && it->time > +cycle_time)
+            {
+                it->dir = -1.0f;
+                it->time = +2*cycle_time - it->time;
+            }
+            if (it->dir < 0 && it->time < -cycle_time)
+            {
+                it->dir = +1.0f;
+                it->time = -2*cycle_time - it->time;
+            }
+
+            static const float fast = 4.0f/1.0f;
+            static const float slow = 1.0f/1.0f;
 
             // These formulas are just guesswork, but they work pretty well
             if (it->type == LT_Normal)
             {
                 // Less than 1/255 light modifier for a constant light:
-                pulseConstant = (const float)(1.0 + sin(phase) / 255.0 );
+                brightness = (const float)(1.0 + Flicker::amplitude(it->time*slow) / 255.0 );
             }
             else if (it->type == LT_Flicker)
             {
-                // Let's do a 50% -> 100% sine wave pulse over 1 second:
-                // This is 75% +/- 25%
-                pulseConstant = (const float)(0.75 + sin(phase) * 0.25);
-
-                // Then add a 25% flicker variation:
-                it->resetTime -= dt;
-                if (it->resetTime < 0)
-                {
-                    it->flickerVariation = (rand() % 1000) / 1000 * 0.25;
-                    it->resetTime = 0.5;
-                }
-                if (it->resetTime > 0.25)
-                {
-                    pulseConstant = (pulseConstant+it->flickerVariation) * (1-it->resetTime * 2.0f) + pulseConstant * it->resetTime * 2.0f;
-                }
-                else
-                {
-                    pulseConstant = (pulseConstant+it->flickerVariation) * (it->resetTime * 2.0f) + pulseConstant * (1-it->resetTime * 2.0f);
-                }
+                brightness = (const float)(0.75 + Flicker::amplitude(it->time*fast) * 0.25);
             }
             else if (it->type == LT_FlickerSlow)
             {
-                // Let's do a 50% -> 100% sine wave pulse over 1 second:
-                // This is 75% +/- 25%
-                pulseConstant = (const float)(0.75 + sin(phase / 4.0) * 0.25);
-
-                // Then add a 25% flicker variation:
-                it->resetTime -= dt;
-                if (it->resetTime < 0)
-                {
-                    it->flickerVariation = (rand() % 1000) / 1000 * 0.25;
-                    it->resetTime = 0.5;
-                }
-                if (it->resetTime > 0.5)
-                {
-                    pulseConstant = (pulseConstant+it->flickerVariation) * (1-it->resetTime) + pulseConstant * it->resetTime;
-                }
-                else
-                {
-                    pulseConstant = (pulseConstant+it->flickerVariation) * (it->resetTime) + pulseConstant * (1-it->resetTime);
-                }
+                brightness = (const float)(0.75 + Flicker::amplitude(it->time*slow) * 0.25);
             }
             else if (it->type == LT_Pulse)
             {
-                // Let's do a 75% -> 125% sine wave pulse over 1 second:
-                // This is 100% +/- 25%
-                pulseConstant = (const float)(1.0 + sin(phase) * 0.25);
+                brightness = (const float)(1.0 + Pulse::amplitude (it->time*fast) * 0.25);
             }
             else if (it->type == LT_PulseSlow)
             {
-                // Let's do a 75% -> 125% sine wave pulse over 1 second:
-                // This is 100% +/- 25%
-                pulseConstant = (const float)(1.0 + sin(phase / 4.0) * 0.25);
+                brightness = (const float)(1.0 + Pulse::amplitude (it->time*slow) * 0.25);
             }
             else
                 assert(0 && "Invalid light type");
 
-            light->setDiffuseColour( it->colour * pulseConstant );
+            light->setDiffuseColour(it->colour * brightness);
 
             ++it;
         }
@@ -476,8 +502,7 @@ void Objects::rebuildStaticGeometry()
     }
 }
 
-void
-Objects::updateObjectCell(const MWWorld::Ptr &ptr)
+void Objects::updateObjectCell(const MWWorld::Ptr &ptr)
 {
     Ogre::SceneNode *node;
     MWWorld::CellStore *newCell = ptr.getCell();
diff --git a/apps/openmw/mwrender/objects.hpp b/apps/openmw/mwrender/objects.hpp
index 8594e4fe4..48632dba8 100644
--- a/apps/openmw/mwrender/objects.hpp
+++ b/apps/openmw/mwrender/objects.hpp
@@ -34,16 +34,13 @@ struct LightInfo
     LightType type;
 
     // Runtime variables
-	float flickerVariation; // 25% flicker variation, reset once every 0.5 seconds
-	float flickerSlowVariation; // 25% flicker variation, reset once every 1.0 seconds
-	float resetTime;
-    long double time;
-
+    float dir;   // direction time is running...
+    float time;  // current time
+    float phase; // current phase
 
     LightInfo() :
-        flickerVariation(0), resetTime(0.5),
-        flickerSlowVariation(0), time(0), interior(true),
-        type(LT_Normal), radius(1.0)
+        dir(1.0f), time(0.0f), phase (0.0f),
+        interior(true), type(LT_Normal), radius(1.0)
     {
     }
 };
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5f1f1ad43..ae7d6612b 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -37,6 +37,7 @@
 #include "npcanimation.hpp"
 #include "externalrendering.hpp"
 #include "globalmap.hpp"
+#include "videoplayer.hpp"
 
 using namespace MWRender;
 using namespace Ogre;
@@ -160,6 +161,9 @@ RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const
 
     mOcclusionQuery = new OcclusionQuery(&mRendering, mSkyManager->getSunNode());
 
+    mVideoPlayer = new VideoPlayer(mRendering.getScene ());
+    mVideoPlayer->setResolution (Settings::Manager::getInt ("resolution x", "Video"), Settings::Manager::getInt ("resolution y", "Video"));
+
     mSun = 0;
 
     mDebugging = new Debugging(mMwRoot, engine);
@@ -181,7 +185,7 @@ RenderingManager::~RenderingManager ()
     delete mOcclusionQuery;
     delete mCompositors;
     delete mWater;
-
+    delete mVideoPlayer;
     delete mFactory;
 }
 
@@ -332,6 +336,10 @@ void RenderingManager::update (float duration, bool paused)
     }
     mOcclusionQuery->update(duration);
     
+    mVideoPlayer->update ();
+
+    mRendering.update(duration);
+
     if(paused)
     {
         Ogre::ControllerManager::getSingleton().setTimeFactor(0.f);
@@ -350,8 +358,6 @@ void RenderingManager::update (float duration, bool paused)
 
     mSkyManager->setGlare(mOcclusionQuery->getSunVisibility());
 
-    mRendering.update(duration);
-
     MWWorld::RefData &data = 
         MWBase::Environment::get()
             .getWorld()
@@ -838,6 +844,8 @@ void RenderingManager::windowResized(Ogre::RenderWindow* rw)
     mCompositors->recreate();
     mWater->assignTextures();
 
+    mVideoPlayer->setResolution (rw->getWidth(), rw->getHeight());
+
     const Settings::CategorySettingVector& changed = Settings::Manager::apply();
     MWBase::Environment::get().getInputManager()->processChangedSettings(changed); //FIXME
     MWBase::Environment::get().getWindowManager()->processChangedSettings(changed); // FIXME
@@ -921,4 +929,14 @@ void RenderingManager::setupExternalRendering (MWRender::ExternalRendering& rend
     rendering.setup (mRendering.getScene());
 }
 
+void RenderingManager::playVideo(const std::string& name, bool allowSkipping)
+{
+    mVideoPlayer->playVideo ("video/" + name, allowSkipping);
+}
+
+void RenderingManager::stopVideo()
+{
+    mVideoPlayer->stopVideo ();
+}
+
 } // namespace
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 86346d1d6..68f2d79c3 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -45,6 +45,7 @@ namespace MWRender
     class Compositors;
     class ExternalRendering;
     class GlobalMap;
+    class VideoPlayer;
 
 class RenderingManager: private RenderingInterface, public Ogre::WindowEventListener {
 
@@ -195,6 +196,9 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
 
     void setupExternalRendering (MWRender::ExternalRendering& rendering);
 
+    void playVideo(const std::string& name, bool allowSkipping);
+    void stopVideo();
+
   protected:
 	virtual void windowResized(Ogre::RenderWindow* rw);
     virtual void windowClosed(Ogre::RenderWindow* rw);
@@ -248,6 +252,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
     MWRender::Shadows* mShadows;
 
     MWRender::Compositors* mCompositors;
+
+    VideoPlayer* mVideoPlayer;
 };
 
 }
diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
new file mode 100644
index 000000000..baec2f740
--- /dev/null
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -0,0 +1,1151 @@
+#include "videoplayer.hpp"
+
+#define __STDC_CONSTANT_MACROS
+#include <stdint.h>
+
+#include <cstdio>
+#include <cmath>
+
+#include <OgreRoot.h>
+#include <OgreHardwarePixelBuffer.h>
+
+#include <boost/thread.hpp>
+
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwsound/sound_decoder.hpp"
+#include "../mwsound/sound.hpp"
+
+
+namespace MWRender
+{
+
+#ifdef OPENMW_USE_FFMPEG
+
+extern "C"
+{
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+}
+
+#define MAX_AUDIOQ_SIZE (5 * 16 * 1024)
+#define MAX_VIDEOQ_SIZE (5 * 256 * 1024)
+#define AV_SYNC_THRESHOLD 0.01
+#define AUDIO_DIFF_AVG_NB 20
+#define VIDEO_PICTURE_QUEUE_SIZE 1
+
+enum {
+    AV_SYNC_AUDIO_MASTER,
+    AV_SYNC_VIDEO_MASTER,
+    AV_SYNC_EXTERNAL_MASTER,
+
+    AV_SYNC_DEFAULT = AV_SYNC_EXTERNAL_MASTER
+};
+
+
+struct PacketQueue {
+    PacketQueue()
+      : first_pkt(NULL), last_pkt(NULL), flushing(false), nb_packets(0), size(0)
+    { }
+    ~PacketQueue()
+    { clear(); }
+
+    AVPacketList *first_pkt, *last_pkt;
+    volatile bool flushing;
+    int nb_packets;
+    int size;
+
+    boost::mutex mutex;
+    boost::condition_variable cond;
+
+    void put(AVPacket *pkt);
+    int get(AVPacket *pkt, VideoState *is);
+
+    void flush();
+    void clear();
+};
+
+struct VideoPicture {
+    VideoPicture() : pts(0.0)
+    { }
+
+    std::vector<uint8_t> data;
+    double pts;
+};
+
+struct VideoState {
+    VideoState()
+      : format_ctx(NULL), av_sync_type(AV_SYNC_DEFAULT)
+      , external_clock_base(0.0)
+      , audio_st(NULL)
+      , video_st(NULL), frame_last_pts(0.0), frame_last_delay(0.0),
+        video_clock(0.0), sws_context(NULL), rgbaFrame(NULL), pictq_size(0),
+        pictq_rindex(0), pictq_windex(0)
+      , refresh_rate_ms(10), refresh(false), quit(false), display_ready(false)
+    {
+        // Register all formats and codecs
+        av_register_all();
+    }
+
+    ~VideoState()
+    { deinit(); }
+
+    void init(const std::string& resourceName);
+    void deinit();
+
+    int stream_open(int stream_index, AVFormatContext *pFormatCtx);
+
+    bool update(Ogre::MaterialPtr &mat, Ogre::Rectangle2D *rect, int screen_width, int screen_height);
+
+    static void video_thread_loop(VideoState *is);
+    static void decode_thread_loop(VideoState *is);
+
+    void video_display();
+    void video_refresh_timer();
+
+    int queue_picture(AVFrame *pFrame, double pts);
+    double synchronize_video(AVFrame *src_frame, double pts);
+
+    static void video_refresh(VideoState *is);
+
+
+    double get_audio_clock()
+    { return this->AudioTrack->getTimeOffset(); }
+
+    double get_video_clock()
+    { return this->frame_last_pts; }
+
+    double get_external_clock()
+    { return ((uint64_t)av_gettime()-this->external_clock_base) / 1000000.0; }
+
+    double get_master_clock()
+    {
+        if(this->av_sync_type == AV_SYNC_VIDEO_MASTER)
+            return this->get_video_clock();
+        if(this->av_sync_type == AV_SYNC_AUDIO_MASTER)
+            return this->get_audio_clock();
+        return this->get_external_clock();
+    }
+
+
+    static int OgreResource_Read(void *user_data, uint8_t *buf, int buf_size);
+    static int OgreResource_Write(void *user_data, uint8_t *buf, int buf_size);
+    static int64_t OgreResource_Seek(void *user_data, int64_t offset, int whence);
+
+
+    Ogre::DataStreamPtr stream;
+    AVFormatContext* format_ctx;
+
+    int av_sync_type;
+    uint64_t external_clock_base;
+
+    AVStream**  audio_st;
+    PacketQueue audioq;
+    MWBase::SoundPtr AudioTrack;
+
+    AVStream**  video_st;
+    double      frame_last_pts;
+    double      frame_last_delay;
+    double      video_clock; ///<pts of last decoded frame / predicted pts of next decoded frame
+    PacketQueue videoq;
+    SwsContext*  sws_context;
+    VideoPicture pictq[VIDEO_PICTURE_QUEUE_SIZE];
+    AVFrame*     rgbaFrame; // used as buffer for the frame converted from its native format to RGBA
+    int          pictq_size, pictq_rindex, pictq_windex;
+    boost::mutex pictq_mutex;
+    boost::condition_variable pictq_cond;
+
+
+    boost::thread parse_thread;
+    boost::thread video_thread;
+
+    boost::thread refresh_thread;
+    volatile int refresh_rate_ms;
+
+    volatile bool refresh;
+    volatile bool quit;
+    volatile bool display_ready;
+};
+
+
+void PacketQueue::put(AVPacket *pkt)
+{
+    AVPacketList *pkt1;
+    pkt1 = (AVPacketList*)av_malloc(sizeof(AVPacketList));
+    if(!pkt1) throw std::bad_alloc();
+    pkt1->pkt = *pkt;
+    pkt1->next = NULL;
+
+    if(pkt1->pkt.destruct == NULL)
+    {
+        if(av_dup_packet(&pkt1->pkt) < 0)
+        {
+            av_free(pkt1);
+            throw std::runtime_error("Failed to duplicate packet");
+        }
+        av_free_packet(pkt);
+    }
+
+    this->mutex.lock ();
+
+    if(!last_pkt)
+        this->first_pkt = pkt1;
+    else
+        this->last_pkt->next = pkt1;
+    this->last_pkt = pkt1;
+    this->nb_packets++;
+    this->size += pkt1->pkt.size;
+    this->cond.notify_one();
+
+    this->mutex.unlock();
+}
+
+int PacketQueue::get(AVPacket *pkt, VideoState *is)
+{
+    boost::unique_lock<boost::mutex> lock(this->mutex);
+    while(!is->quit)
+    {
+        AVPacketList *pkt1 = this->first_pkt;
+        if(pkt1)
+        {
+            this->first_pkt = pkt1->next;
+            if(!this->first_pkt)
+                this->last_pkt = NULL;
+            this->nb_packets--;
+            this->size -= pkt1->pkt.size;
+
+            *pkt = pkt1->pkt;
+            av_free(pkt1);
+
+            return 1;
+        }
+
+        if(this->flushing)
+            break;
+        this->cond.wait(lock);
+    }
+
+    return -1;
+}
+
+void PacketQueue::flush()
+{
+    this->flushing = true;
+    this->cond.notify_one();
+}
+
+void PacketQueue::clear()
+{
+    AVPacketList *pkt, *pkt1;
+
+    this->mutex.lock();
+    for(pkt = this->first_pkt; pkt != NULL; pkt = pkt1)
+    {
+        pkt1 = pkt->next;
+        av_free_packet(&pkt->pkt);
+        av_freep(&pkt);
+    }
+    this->last_pkt = NULL;
+    this->first_pkt = NULL;
+    this->nb_packets = 0;
+    this->size = 0;
+    this->mutex.unlock ();
+}
+
+
+class MovieAudioDecoder : public MWSound::Sound_Decoder
+{
+    static void fail(const std::string &str)
+    {
+        throw std::runtime_error(str);
+    }
+
+    struct AutoAVPacket : public AVPacket {
+        AutoAVPacket(int size=0)
+        {
+            if(av_new_packet(this, size) < 0)
+                throw std::bad_alloc();
+        }
+        ~AutoAVPacket()
+        { av_free_packet(this); }
+    };
+
+    VideoState *mVideoState;
+    AVStream *mAVStream;
+
+    AutoAVPacket mPacket;
+    AVFrame *mFrame;
+    ssize_t mFramePos;
+    ssize_t mFrameSize;
+
+    double mAudioClock;
+
+    /* averaging filter for audio sync */
+    double mAudioDiffAccum;
+    const double mAudioDiffAvgCoef;
+    const double mAudioDiffThreshold;
+    int mAudioDiffAvgCount;
+
+    /* Add or subtract samples to get a better sync, return number of bytes to
+     * skip (negative means to duplicate). */
+    int synchronize_audio()
+    {
+        if(mVideoState->av_sync_type == AV_SYNC_AUDIO_MASTER)
+            return 0;
+
+        int sample_skip = 0;
+
+        // accumulate the clock difference
+        double diff = mVideoState->get_master_clock() - mVideoState->get_audio_clock();
+        mAudioDiffAccum = diff + mAudioDiffAvgCoef * mAudioDiffAccum;
+        if(mAudioDiffAvgCount < AUDIO_DIFF_AVG_NB)
+            mAudioDiffAvgCount++;
+        else
+        {
+            double avg_diff = mAudioDiffAccum * (1.0 - mAudioDiffAvgCoef);
+            if(fabs(avg_diff) >= mAudioDiffThreshold)
+            {
+                int n = av_get_bytes_per_sample(mAVStream->codec->sample_fmt) *
+                        mAVStream->codec->channels;
+                sample_skip = ((int)(diff * mAVStream->codec->sample_rate) * n);
+            }
+        }
+
+        return sample_skip;
+    }
+
+    int audio_decode_frame(AVFrame *frame)
+    {
+        AVPacket *pkt = &mPacket;
+
+        for(;;)
+        {
+            while(pkt->size > 0)
+            {
+                int len1, got_frame;
+
+                len1 = avcodec_decode_audio4(mAVStream->codec, frame, &got_frame, pkt);
+                if(len1 < 0) break;
+
+                if(len1 <= pkt->size)
+                {
+                    /* Move the unread data to the front and clear the end bits */
+                    int remaining = pkt->size - len1;
+                    memmove(pkt->data, &pkt->data[len1], remaining);
+                    av_shrink_packet(pkt, remaining);
+                }
+
+                /* No data yet? Look for more frames */
+                if(!got_frame || frame->nb_samples <= 0)
+                    continue;
+
+                mAudioClock += (double)frame->nb_samples /
+                               (double)mAVStream->codec->sample_rate;
+
+                /* We have data, return it and come back for more later */
+                return frame->nb_samples * mAVStream->codec->channels *
+                       av_get_bytes_per_sample(mAVStream->codec->sample_fmt);
+            }
+            av_free_packet(pkt);
+
+            /* next packet */
+            if(mVideoState->audioq.get(pkt, mVideoState) < 0)
+                return -1;
+
+            /* if update, update the audio clock w/pts */
+            if((uint64_t)pkt->pts != AV_NOPTS_VALUE)
+                mAudioClock = av_q2d(mAVStream->time_base)*pkt->pts;
+        }
+    }
+
+    void open(const std::string&)
+    { fail(std::string("Invalid call to ")+__PRETTY_FUNCTION__); }
+
+    void close() { }
+
+    std::string getName()
+    { return mVideoState->stream->getName(); }
+
+    void rewind() { }
+
+public:
+    MovieAudioDecoder(VideoState *is)
+      : mVideoState(is)
+      , mAVStream(*is->audio_st)
+      , mFrame(avcodec_alloc_frame())
+      , mFramePos(0)
+      , mFrameSize(0)
+      , mAudioClock(0.0)
+      , mAudioDiffAccum(0.0)
+      , mAudioDiffAvgCoef(exp(log(0.01 / AUDIO_DIFF_AVG_NB)))
+      /* Correct audio only if larger error than this */
+      , mAudioDiffThreshold(2.0 * 0.050/* 50 ms */)
+      , mAudioDiffAvgCount(0)
+    { }
+    virtual ~MovieAudioDecoder()
+    {
+        av_freep(&mFrame);
+    }
+
+    void getInfo(int *samplerate, MWSound::ChannelConfig *chans, MWSound::SampleType * type)
+    {
+        if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_U8)
+            *type = MWSound::SampleType_UInt8;
+        else if(mAVStream->codec->sample_fmt == AV_SAMPLE_FMT_S16)
+            *type = MWSound::SampleType_Int16;
+        else
+            fail(std::string("Unsupported sample format: ")+
+                 av_get_sample_fmt_name(mAVStream->codec->sample_fmt));
+
+        if(mAVStream->codec->channel_layout == AV_CH_LAYOUT_MONO)
+            *chans = MWSound::ChannelConfig_Mono;
+        else if(mAVStream->codec->channel_layout == AV_CH_LAYOUT_STEREO)
+            *chans = MWSound::ChannelConfig_Stereo;
+        else if(mAVStream->codec->channel_layout == AV_CH_LAYOUT_QUAD)
+            *chans = MWSound::ChannelConfig_Quad;
+        else if(mAVStream->codec->channel_layout == AV_CH_LAYOUT_5POINT1)
+            *chans = MWSound::ChannelConfig_5point1;
+        else if(mAVStream->codec->channel_layout == AV_CH_LAYOUT_7POINT1)
+            *chans = MWSound::ChannelConfig_7point1;
+        else if(mAVStream->codec->channel_layout == 0)
+        {
+            /* Unknown channel layout. Try to guess. */
+            if(mAVStream->codec->channels == 1)
+                *chans = MWSound::ChannelConfig_Mono;
+            else if(mAVStream->codec->channels == 2)
+                *chans = MWSound::ChannelConfig_Stereo;
+            else
+            {
+                std::stringstream sstr("Unsupported raw channel count: ");
+                sstr << mAVStream->codec->channels;
+                fail(sstr.str());
+            }
+        }
+        else
+        {
+            char str[1024];
+            av_get_channel_layout_string(str, sizeof(str), mAVStream->codec->channels,
+                                         mAVStream->codec->channel_layout);
+            fail(std::string("Unsupported channel layout: ")+str);
+        }
+
+        *samplerate = mAVStream->codec->sample_rate;
+    }
+
+    size_t read(char *stream, size_t len)
+    {
+        int sample_skip = synchronize_audio();
+        size_t total = 0;
+
+        while(total < len)
+        {
+            if(mFramePos >= mFrameSize)
+            {
+                /* We have already sent all our data; get more */
+                mFrameSize = audio_decode_frame(mFrame);
+                if(mFrameSize < 0)
+                {
+                    /* If error, we're done */
+                    break;
+                }
+
+                mFramePos = std::min<ssize_t>(mFrameSize, sample_skip);
+                sample_skip -= mFramePos;
+                continue;
+            }
+
+            size_t len1 = len - total;
+            if(mFramePos >= 0)
+            {
+                len1 = std::min<size_t>(len1, mFrameSize-mFramePos);
+                memcpy(stream, mFrame->data[0]+mFramePos, len1);
+            }
+            else
+            {
+                len1 = std::min<size_t>(len1, -mFramePos);
+
+                int n = av_get_bytes_per_sample(mAVStream->codec->sample_fmt) *
+                        mAVStream->codec->channels;
+
+                /* add samples by copying the first sample*/
+                if(n == 1)
+                    memset(stream, *mFrame->data[0], len1);
+                else if(n == 2)
+                {
+                    const int16_t val = *((int16_t*)mFrame->data[0]);
+                    for(size_t nb = 0;nb < len1;nb += n)
+                        *((int16_t*)(stream+nb)) = val;
+                }
+                else if(n == 4)
+                {
+                    const int32_t val = *((int32_t*)mFrame->data[0]);
+                    for(size_t nb = 0;nb < len1;nb += n)
+                        *((int32_t*)(stream+nb)) = val;
+                }
+                else if(n == 8)
+                {
+                    const int64_t val = *((int64_t*)mFrame->data[0]);
+                    for(size_t nb = 0;nb < len1;nb += n)
+                        *((int64_t*)(stream+nb)) = val;
+                }
+                else
+                {
+                    for(size_t nb = 0;nb < len1;nb += n)
+                        memcpy(stream+nb, mFrame->data[0], n);
+                }
+            }
+
+            total += len1;
+            stream += len1;
+            mFramePos += len1;
+        }
+
+        return total;
+    }
+
+    size_t getSampleOffset()
+    {
+        ssize_t clock_delay = (mFrameSize-mFramePos) / mAVStream->codec->channels /
+                              av_get_bytes_per_sample(mAVStream->codec->sample_fmt);
+        return (size_t)(mAudioClock*mAVStream->codec->sample_rate) - clock_delay;
+    }
+};
+
+
+int VideoState::OgreResource_Read(void *user_data, uint8_t *buf, int buf_size)
+{
+    Ogre::DataStreamPtr stream = static_cast<VideoState*>(user_data)->stream;
+    return stream->read(buf, buf_size);
+}
+
+int VideoState::OgreResource_Write(void *user_data, uint8_t *buf, int buf_size)
+{
+    Ogre::DataStreamPtr stream = static_cast<VideoState*>(user_data)->stream;
+    return stream->write(buf, buf_size);
+}
+
+int64_t VideoState::OgreResource_Seek(void *user_data, int64_t offset, int whence)
+{
+    Ogre::DataStreamPtr stream = static_cast<VideoState*>(user_data)->stream;
+
+    whence &= ~AVSEEK_FORCE;
+    if(whence == AVSEEK_SIZE)
+        return stream->size();
+    if(whence == SEEK_SET)
+        stream->seek(offset);
+    else if(whence == SEEK_CUR)
+        stream->seek(stream->tell()+offset);
+    else if(whence == SEEK_END)
+        stream->seek(stream->size()+offset);
+    else
+        return -1;
+
+    return stream->tell();
+}
+
+
+void VideoState::video_refresh(VideoState* is)
+{
+    boost::system_time t = boost::get_system_time();
+    while(!is->quit)
+    {
+        t += boost::posix_time::milliseconds(is->refresh_rate_ms);
+        boost::this_thread::sleep(t);
+        is->refresh = true;
+    }
+}
+
+
+void VideoState::video_display()
+{
+    VideoPicture *vp = &this->pictq[this->pictq_rindex];
+
+    if((*this->video_st)->codec->width != 0 && (*this->video_st)->codec->height != 0)
+    {
+        Ogre::TexturePtr texture = Ogre::TextureManager::getSingleton().getByName("VideoTexture");
+        if(texture.isNull() || static_cast<int>(texture->getWidth()) != (*this->video_st)->codec->width
+                            || static_cast<int>(texture->getHeight()) != (*this->video_st)->codec->height)
+        {
+            Ogre::TextureManager::getSingleton ().remove ("VideoTexture");
+            texture = Ogre::TextureManager::getSingleton().createManual(
+                                    "VideoTexture",
+                                    Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
+                                    Ogre::TEX_TYPE_2D,
+                                    (*this->video_st)->codec->width, (*this->video_st)->codec->height,
+                                    0,
+                                    Ogre::PF_BYTE_RGBA,
+                                    Ogre::TU_DYNAMIC_WRITE_ONLY_DISCARDABLE);
+        }
+        Ogre::PixelBox pb((*this->video_st)->codec->width, (*this->video_st)->codec->height, 1, Ogre::PF_BYTE_RGBA, &vp->data[0]);
+        Ogre::HardwarePixelBufferSharedPtr buffer = texture->getBuffer();
+        buffer->blitFromMemory(pb);
+        this->display_ready = true;
+    }
+}
+
+void VideoState::video_refresh_timer()
+{
+    VideoPicture *vp;
+    double delay;
+
+    if(this->pictq_size == 0)
+        return;
+
+    vp = &this->pictq[this->pictq_rindex];
+
+    delay = vp->pts - this->frame_last_pts; /* the pts from last time */
+    if(delay <= 0 || delay >= 1.0) {
+        /* if incorrect delay, use previous one */
+        delay = this->frame_last_delay;
+    }
+    /* save for next time */
+    this->frame_last_delay = delay;
+    this->frame_last_pts = vp->pts;
+
+    /* FIXME: Syncing should be done in the decoding stage, where frames can be
+     * skipped or duplicated as needed. */
+    /* update delay to sync to audio if not master source */
+    if(this->av_sync_type != AV_SYNC_VIDEO_MASTER)
+    {
+        double diff = this->get_video_clock() - this->get_master_clock();
+
+        /* Skip or repeat the frame. Take delay into account
+         * FFPlay still doesn't "know if this is the best guess." */
+        double sync_threshold = std::max(delay, AV_SYNC_THRESHOLD);
+        if(diff <= -sync_threshold)
+            delay = 0;
+        else if(diff >= sync_threshold)
+            delay = 2 * delay;
+    }
+
+    this->refresh_rate_ms = std::max<int>(1, (int)(delay*1000.0));
+    /* show the picture! */
+    this->video_display();
+
+    /* update queue for next picture! */
+    this->pictq_rindex = (this->pictq_rindex+1) % VIDEO_PICTURE_QUEUE_SIZE;
+    this->pictq_mutex.lock();
+    this->pictq_size--;
+    this->pictq_cond.notify_one();
+    this->pictq_mutex.unlock();
+}
+
+
+int VideoState::queue_picture(AVFrame *pFrame, double pts)
+{
+    VideoPicture *vp;
+
+    /* wait until we have a new pic */
+    {
+        boost::unique_lock<boost::mutex> lock(this->pictq_mutex);
+        while(this->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && !this->quit)
+            this->pictq_cond.timed_wait(lock, boost::posix_time::milliseconds(1));
+    }
+    if(this->quit)
+        return -1;
+
+    // windex is set to 0 initially
+    vp = &this->pictq[this->pictq_windex];
+
+    // Convert the image into RGBA format for Ogre
+    if(this->sws_context == NULL)
+    {
+        int w = (*this->video_st)->codec->width;
+        int h = (*this->video_st)->codec->height;
+        this->sws_context = sws_getContext(w, h, (*this->video_st)->codec->pix_fmt,
+                                           w, h, PIX_FMT_RGBA, SWS_BICUBIC,
+                                           NULL, NULL, NULL);
+        if(this->sws_context == NULL)
+            throw std::runtime_error("Cannot initialize the conversion context!\n");
+    }
+
+    vp->pts = pts;
+    vp->data.resize((*this->video_st)->codec->width * (*this->video_st)->codec->height * 4);
+
+    uint8_t *dst = &vp->data[0];
+    sws_scale(this->sws_context, pFrame->data, pFrame->linesize,
+              0, (*this->video_st)->codec->height, &dst, this->rgbaFrame->linesize);
+
+    // now we inform our display thread that we have a pic ready
+    this->pictq_windex = (this->pictq_windex+1) % VIDEO_PICTURE_QUEUE_SIZE;
+    this->pictq_mutex.lock();
+    this->pictq_size++;
+    this->pictq_mutex.unlock();
+
+    return 0;
+}
+
+double VideoState::synchronize_video(AVFrame *src_frame, double pts)
+{
+    double frame_delay;
+
+    /* if we have pts, set video clock to it */
+    if(pts != 0)
+        this->video_clock = pts;
+    else
+        pts = this->video_clock;
+
+    /* update the video clock */
+    frame_delay = av_q2d((*this->video_st)->codec->time_base);
+
+    /* if we are repeating a frame, adjust clock accordingly */
+    frame_delay += src_frame->repeat_pict * (frame_delay * 0.5);
+    this->video_clock += frame_delay;
+
+    return pts;
+}
+
+
+/* These are called whenever we allocate a frame
+ * buffer. We use this to store the global_pts in
+ * a frame at the time it is allocated.
+ */
+static uint64_t global_video_pkt_pts = AV_NOPTS_VALUE;
+static int our_get_buffer(struct AVCodecContext *c, AVFrame *pic)
+{
+    int ret = avcodec_default_get_buffer(c, pic);
+    uint64_t *pts = (uint64_t*)av_malloc(sizeof(uint64_t));
+    *pts = global_video_pkt_pts;
+    pic->opaque = pts;
+    return ret;
+}
+static void our_release_buffer(struct AVCodecContext *c, AVFrame *pic)
+{
+    if(pic) av_freep(&pic->opaque);
+    avcodec_default_release_buffer(c, pic);
+}
+
+
+void VideoState::video_thread_loop(VideoState *self)
+{
+    AVPacket pkt1, *packet = &pkt1;
+    int frameFinished;
+    AVFrame *pFrame;
+    double pts;
+
+    pFrame = avcodec_alloc_frame();
+
+    self->rgbaFrame = avcodec_alloc_frame();
+    avpicture_alloc((AVPicture*)self->rgbaFrame, PIX_FMT_RGBA, (*self->video_st)->codec->width, (*self->video_st)->codec->height);
+
+    while(self->videoq.get(packet, self) >= 0)
+    {
+        // Save global pts to be stored in pFrame
+        global_video_pkt_pts = packet->pts;
+        // Decode video frame
+        if(avcodec_decode_video2((*self->video_st)->codec, pFrame, &frameFinished, packet) < 0)
+            throw std::runtime_error("Error decoding video frame");
+
+        pts = 0;
+        if((uint64_t)packet->dts != AV_NOPTS_VALUE)
+            pts = packet->dts;
+        else if(pFrame->opaque && *(uint64_t*)pFrame->opaque != AV_NOPTS_VALUE)
+            pts = *(uint64_t*)pFrame->opaque;
+        pts *= av_q2d((*self->video_st)->time_base);
+
+        av_free_packet(packet);
+
+        // Did we get a video frame?
+        if(frameFinished)
+        {
+            pts = self->synchronize_video(pFrame, pts);
+            if(self->queue_picture(pFrame, pts) < 0)
+                break;
+        }
+    }
+
+    av_free(pFrame);
+
+    avpicture_free((AVPicture*)self->rgbaFrame);
+    av_free(self->rgbaFrame);
+}
+
+void VideoState::decode_thread_loop(VideoState *self)
+{
+    AVFormatContext *pFormatCtx = self->format_ctx;
+    AVPacket pkt1, *packet = &pkt1;
+
+    try
+    {
+        if(!self->video_st && !self->audio_st)
+            throw std::runtime_error("No streams to decode");
+
+        // main decode loop
+        while(!self->quit)
+        {
+            if((self->audio_st >= 0 && self->audioq.size > MAX_AUDIOQ_SIZE) ||
+               (self->video_st >= 0 && self->videoq.size > MAX_VIDEOQ_SIZE))
+            {
+                boost::this_thread::sleep(boost::posix_time::milliseconds(10));
+                continue;
+            }
+
+            if(av_read_frame(pFormatCtx, packet) < 0)
+                break;
+
+            // Is this a packet from the video stream?
+            if(self->video_st && packet->stream_index == self->video_st-pFormatCtx->streams)
+                self->videoq.put(packet);
+            else if(self->audio_st && packet->stream_index == self->audio_st-pFormatCtx->streams)
+                self->audioq.put(packet);
+            else
+                av_free_packet(packet);
+        }
+
+        /* all done - wait for it */
+        self->videoq.flush();
+        self->audioq.flush();
+        while(!self->quit)
+        {
+            // EOF reached, all packets processed, we can exit now
+            if(self->audioq.nb_packets == 0 && self->videoq.nb_packets == 0)
+                break;
+            boost::this_thread::sleep(boost::posix_time::milliseconds(100));
+        }
+    }
+    catch(std::runtime_error& e) {
+        std::cerr << "An error occured playing the video: " << e.what () << std::endl;
+    }
+    catch(Ogre::Exception& e) {
+        std::cerr << "An error occured playing the video: " << e.getFullDescription () << std::endl;
+    }
+
+    self->quit = true;
+}
+
+
+bool VideoState::update(Ogre::MaterialPtr &mat, Ogre::Rectangle2D *rect, int screen_width, int screen_height)
+{
+    if(this->quit)
+        return false;
+
+    if(this->refresh)
+    {
+        this->refresh = false;
+        this->video_refresh_timer();
+        // Would be nice not to do this all the time...
+        if(this->display_ready)
+            mat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("VideoTexture");
+
+        // Correct aspect ratio by adding black bars
+        double videoaspect = av_q2d((*this->video_st)->codec->sample_aspect_ratio);
+        if(videoaspect == 0.0)
+            videoaspect = 1.0;
+        videoaspect *= static_cast<double>((*this->video_st)->codec->width) / (*this->video_st)->codec->height;
+
+        double screenaspect = static_cast<double>(screen_width) / screen_height;
+        double aspect_correction = videoaspect / screenaspect;
+
+        rect->setCorners(std::max(-1.0, -1.0 * aspect_correction), std::min( 1.0,  1.0 / aspect_correction),
+                         std::min( 1.0,  1.0 * aspect_correction), std::max(-1.0, -1.0 / aspect_correction));
+    }
+    return true;
+}
+
+
+int VideoState::stream_open(int stream_index, AVFormatContext *pFormatCtx)
+{
+    MWSound::DecoderPtr decoder;
+    AVCodecContext *codecCtx;
+    AVCodec *codec;
+
+    if(stream_index < 0 || stream_index >= static_cast<int>(pFormatCtx->nb_streams))
+        return -1;
+
+    // Get a pointer to the codec context for the video stream
+    codecCtx = pFormatCtx->streams[stream_index]->codec;
+    codec = avcodec_find_decoder(codecCtx->codec_id);
+    if(!codec || (avcodec_open2(codecCtx, codec, NULL) < 0))
+    {
+        fprintf(stderr, "Unsupported codec!\n");
+        return -1;
+    }
+
+    switch(codecCtx->codec_type)
+    {
+    case AVMEDIA_TYPE_AUDIO:
+        this->audio_st = pFormatCtx->streams + stream_index;
+
+        decoder.reset(new MovieAudioDecoder(this));
+        this->AudioTrack = MWBase::Environment::get().getSoundManager()->playTrack(decoder, MWBase::SoundManager::Play_TypeMovie);
+        if(!this->AudioTrack)
+        {
+            avcodec_close((*this->audio_st)->codec);
+            this->audio_st = NULL;
+            return -1;
+        }
+        break;
+
+    case AVMEDIA_TYPE_VIDEO:
+        this->video_st = pFormatCtx->streams + stream_index;
+
+        this->frame_last_delay = 40e-3;
+
+        codecCtx->get_buffer = our_get_buffer;
+        codecCtx->release_buffer = our_release_buffer;
+        this->video_thread = boost::thread(video_thread_loop, this);
+        this->refresh_thread = boost::thread(video_refresh, this);
+        break;
+
+    default:
+        break;
+    }
+
+    return 0;
+}
+
+void VideoState::init(const std::string& resourceName)
+{
+    int video_index = -1;
+    int audio_index = -1;
+    unsigned int i;
+
+    this->av_sync_type = AV_SYNC_DEFAULT;
+    this->refresh_rate_ms = 10;
+    this->refresh = false;
+    this->quit = false;
+
+    this->stream = Ogre::ResourceGroupManager::getSingleton().openResource(resourceName);
+    if(this->stream.isNull())
+        throw std::runtime_error("Failed to open video resource");
+
+    AVIOContext *ioCtx = avio_alloc_context(NULL, 0, 0, this, OgreResource_Read, OgreResource_Write, OgreResource_Seek);
+    if(!ioCtx) throw std::runtime_error("Failed to allocate AVIOContext");
+
+    this->format_ctx = avformat_alloc_context();
+    if(this->format_ctx)
+        this->format_ctx->pb = ioCtx;
+
+    // Open video file
+    /// \todo leak here, ffmpeg or valgrind bug ?
+    if(!this->format_ctx || avformat_open_input(&this->format_ctx, resourceName.c_str(), NULL, NULL))
+    {
+        // "Note that a user-supplied AVFormatContext will be freed on failure."
+        this->format_ctx = NULL;
+        av_free(ioCtx);
+        throw std::runtime_error("Failed to open video input");
+    }
+
+    // Retrieve stream information
+    if(avformat_find_stream_info(this->format_ctx, NULL) < 0)
+        throw std::runtime_error("Failed to retrieve stream information");
+
+    // Dump information about file onto standard error
+    av_dump_format(this->format_ctx, 0, resourceName.c_str(), 0);
+
+    for(i = 0;i < this->format_ctx->nb_streams;i++)
+    {
+        if(this->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO && video_index < 0)
+            video_index = i;
+        if(this->format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO && audio_index < 0)
+            audio_index = i;
+    }
+
+    this->external_clock_base = av_gettime();
+    if(audio_index >= 0)
+        this->stream_open(audio_index, this->format_ctx);
+    if(video_index >= 0)
+        this->stream_open(video_index, this->format_ctx);
+
+    this->parse_thread = boost::thread(decode_thread_loop, this);
+}
+
+void VideoState::deinit()
+{
+    this->quit = true;
+
+    this->audioq.cond.notify_one();
+    this->videoq.cond.notify_one();
+
+    this->parse_thread.join();
+    this->video_thread.join();
+    this->refresh_thread.join();
+
+    if(this->audio_st)
+        avcodec_close((*this->audio_st)->codec);
+    this->audio_st = NULL;
+    if(this->video_st)
+        avcodec_close((*this->video_st)->codec);
+    this->video_st = NULL;
+
+    if(this->sws_context)
+        sws_freeContext(this->sws_context);
+    this->sws_context = NULL;
+
+    if(this->format_ctx)
+    {
+        AVIOContext *ioContext = this->format_ctx->pb;
+        avformat_close_input(&this->format_ctx);
+        av_free(ioContext);
+    }
+}
+
+#else // defined OPENMW_USE_FFMPEG
+
+class VideoState
+{
+public:
+    VideoState() { }
+
+    void init(const std::string& resourceName)
+    {
+        throw std::runtime_error("FFmpeg not supported, cannot play \""+resourceName+"\"");
+    }
+    void deinit() { }
+
+    void close() { }
+
+    bool update(Ogre::MaterialPtr &mat, Ogre::Rectangle2D *rect, int screen_width, int screen_height)
+    { return false; }
+};
+
+#endif // defined OPENMW_USE_FFMPEG
+
+
+VideoPlayer::VideoPlayer(Ogre::SceneManager* sceneMgr)
+    : mState(NULL)
+    , mSceneMgr(sceneMgr)
+    , mVideoMaterial(NULL)
+    , mRectangle(NULL)
+    , mNode(NULL)
+    , mAllowSkipping(false)
+{
+    mVideoMaterial = Ogre::MaterialManager::getSingleton().getByName("VideoMaterial", "General");
+    if (mVideoMaterial.isNull ())
+    {
+        mVideoMaterial = Ogre::MaterialManager::getSingleton().create("VideoMaterial", "General");
+        mVideoMaterial->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
+        mVideoMaterial->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false);
+        mVideoMaterial->getTechnique(0)->getPass(0)->setLightingEnabled(false);
+        mVideoMaterial->getTechnique(0)->getPass(0)->createTextureUnitState();
+        mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureAddressingMode(Ogre::TextureUnitState::TAM_CLAMP);
+            }
+    mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("black.png");
+
+    Ogre::MaterialPtr blackMaterial = Ogre::MaterialManager::getSingleton().getByName("BlackBarsMaterial", "General");
+    if (blackMaterial.isNull ())
+    {
+        blackMaterial = Ogre::MaterialManager::getSingleton().create("BlackBarsMaterial", "General");
+        blackMaterial->getTechnique(0)->getPass(0)->setDepthWriteEnabled(false);
+        blackMaterial->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false);
+        blackMaterial->getTechnique(0)->getPass(0)->setLightingEnabled(false);
+        blackMaterial->getTechnique(0)->getPass(0)->createTextureUnitState()->setTextureName("black.png");
+    }
+
+    mRectangle = new Ogre::Rectangle2D(true);
+    mRectangle->setCorners(-1.0, 1.0, 1.0, -1.0);
+    mRectangle->setMaterial("VideoMaterial");
+    mRectangle->setRenderQueueGroup(Ogre::RENDER_QUEUE_OVERLAY+2);
+    mBackgroundRectangle = new Ogre::Rectangle2D(true);
+    mBackgroundRectangle->setCorners(-1.0, 1.0, 1.0, -1.0);
+    mBackgroundRectangle->setMaterial("BlackBarsMaterial");
+    mBackgroundRectangle->setRenderQueueGroup(Ogre::RENDER_QUEUE_OVERLAY+1);
+
+    // Use infinite AAB to always stay visible
+    Ogre::AxisAlignedBox aabInf;
+    aabInf.setInfinite();
+    mRectangle->setBoundingBox(aabInf);
+    mBackgroundRectangle->setBoundingBox(aabInf);
+
+    // Attach background to the scene
+    mNode = sceneMgr->getRootSceneNode()->createChildSceneNode();
+    mNode->attachObject(mRectangle);
+    mBackgroundNode = sceneMgr->getRootSceneNode()->createChildSceneNode();
+    mBackgroundNode->attachObject(mBackgroundRectangle);
+
+    mRectangle->setVisible(false);
+    mRectangle->setVisibilityFlags(0x1);
+    mBackgroundRectangle->setVisible(false);
+    mBackgroundRectangle->setVisibilityFlags(0x1);
+}
+
+VideoPlayer::~VideoPlayer()
+{
+    if(mState)
+        close();
+
+    mSceneMgr->destroySceneNode(mNode);
+    mSceneMgr->destroySceneNode(mBackgroundNode);
+
+    delete mRectangle;
+    delete mBackgroundRectangle;
+}
+
+void VideoPlayer::playVideo(const std::string &resourceName, bool allowSkipping)
+{
+    mAllowSkipping = allowSkipping;
+
+    if(mState)
+        close();
+
+    mRectangle->setVisible(true);
+    mBackgroundRectangle->setVisible(true);
+    mVideoMaterial->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("black.png");
+
+    MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Video);
+
+    // Turn off rendering except the GUI
+    mSceneMgr->clearSpecialCaseRenderQueues();
+    // SCRQM_INCLUDE with RENDER_QUEUE_OVERLAY does not work.
+    for(int i = 0;i < Ogre::RENDER_QUEUE_MAX;++i)
+    {
+        if(i > 0 && i < 96)
+            mSceneMgr->addSpecialCaseRenderQueue(i);
+    }
+    mSceneMgr->setSpecialCaseRenderQueueMode(Ogre::SceneManager::SCRQM_EXCLUDE);
+
+    MWBase::Environment::get().getSoundManager()->pauseSounds();
+
+    try {
+        mState = new VideoState;
+        mState->init(resourceName);
+    }
+    catch(std::exception& e) {
+        std::cerr<< "Failed to play video: "<<e.what() <<std::endl;
+        close();
+    }
+}
+
+void VideoPlayer::update ()
+{
+    if(mState)
+    {
+        if(!mState->update(mVideoMaterial, mRectangle, mWidth, mHeight))
+            close();
+    }
+}
+
+void VideoPlayer::stopVideo ()
+{
+    if (mAllowSkipping)
+        close();
+}
+
+void VideoPlayer::close()
+{
+    if(mState)
+    {
+        mState->deinit();
+
+        delete mState;
+        mState = NULL;
+    }
+
+    MWBase::Environment::get().getSoundManager()->resumeSounds();
+
+    mRectangle->setVisible(false);
+    mBackgroundRectangle->setVisible(false);
+    MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Video);
+
+    mSceneMgr->clearSpecialCaseRenderQueues();
+    mSceneMgr->setSpecialCaseRenderQueueMode(Ogre::SceneManager::SCRQM_EXCLUDE);
+}
+
+bool VideoPlayer::isPlaying ()
+{
+    return mState != NULL;
+}
+
+}
diff --git a/apps/openmw/mwrender/videoplayer.hpp b/apps/openmw/mwrender/videoplayer.hpp
new file mode 100644
index 000000000..5e9d18ba4
--- /dev/null
+++ b/apps/openmw/mwrender/videoplayer.hpp
@@ -0,0 +1,52 @@
+#ifndef VIDEOPLAYER_H
+#define VIDEOPLAYER_H
+
+#include <OgreMaterial.h>
+
+namespace Ogre
+{
+    class SceneManager;
+    class SceneNode;
+    class Rectangle2D;
+}
+
+namespace MWRender
+{
+    struct VideoState;
+
+    class VideoPlayer
+    {
+    public:
+        VideoPlayer(Ogre::SceneManager* sceneMgr);
+        ~VideoPlayer();
+
+        void playVideo (const std::string& resourceName, bool allowSkipping);
+
+        void update();
+
+        void close();
+        void stopVideo();
+
+        bool isPlaying();
+
+        void setResolution (int w, int h) { mWidth = w; mHeight = h; }
+
+
+    private:
+        VideoState* mState;
+
+        bool mAllowSkipping;
+
+        Ogre::SceneManager* mSceneMgr;
+        Ogre::MaterialPtr mVideoMaterial;
+        Ogre::Rectangle2D* mRectangle;
+        Ogre::Rectangle2D* mBackgroundRectangle;
+        Ogre::SceneNode* mNode;
+        Ogre::SceneNode* mBackgroundNode;
+
+        int mWidth;
+        int mHeight;
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index 787962ad1..8402a5b4c 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -10,6 +10,11 @@
 #include "../mwworld/class.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
+#include "../mwmechanics/aiactivate.hpp"
+#include "../mwmechanics/aiescort.hpp"
+#include "../mwmechanics/aifollow.hpp"
+#include "../mwmechanics/aitravel.hpp"
+#include "../mwmechanics/aiwander.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
@@ -20,6 +25,27 @@ namespace MWScript
 {
     namespace Ai
     {
+        template<class R>
+        class OpAiActivate : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string objectID = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    // discard additional arguments (reset), because we have no idea what they mean.
+                    for (unsigned int i=0; i<arg0; ++i) runtime.pop();
+
+                    MWMechanics::AiActivate activatePackage(objectID);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(activatePackage);
+                    std::cout << "AiActivate" << std::endl;
+                }
+        };
+
         template<class R>
         class OpAiTravel : public Interpreter::Opcode1
         {
@@ -41,6 +67,9 @@ 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::AiTravel travelPackage(x, y, z);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(travelPackage);
+
                     std::cout << "AiTravel: " << x << ", " << y << ", " << z << std::endl;
                 }
         };
@@ -54,7 +83,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    std::string actor = runtime.getStringLiteral (runtime[0].mInteger);
+                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
                     Interpreter::Type_Float duration = runtime[0].mFloat;
@@ -72,6 +101,47 @@ 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(actorID, duration, x, y, z);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(escortPackage);
+
+                    std::cout << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration
+                        << std::endl;
+                }
+        };
+
+        template<class R>
+        class OpAiEscortCell : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    Interpreter::Type_Float duration = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float x = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float y = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float z = runtime[0].mFloat;
+                    runtime.pop();
+
+                    // 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(actorID, cellID, duration, x, y, z);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(escortPackage);
+
                     std::cout << "AiEscort: " << x << ", " << y << ", " << z << ", " << duration
                         << std::endl;
                 }
@@ -86,7 +156,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = 0;
+                    Interpreter::Type_Integer value = MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().isPackageDone();
 
                     runtime.push (value);
                 }
@@ -101,25 +171,159 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-//                    Interpreter::Type_Float range = runtime[0].mFloat;
+                    Interpreter::Type_Integer range = runtime[0].mFloat;
                     runtime.pop();
 
-//                    Interpreter::Type_Float duration = runtime[0].mFloat;
+                    Interpreter::Type_Integer duration = runtime[0].mFloat;
                     runtime.pop();
 
-//                    Interpreter::Type_Float time = runtime[0].mFloat;
+                    Interpreter::Type_Integer time = runtime[0].mFloat;
                     runtime.pop();
 
-                    // discard additional idle arguments for now
+                    std::vector<int> idleList;
+                    idleList.push_back (0); // why MW, why?
+
+                    for (int i=2; i<10 && arg0; ++i)
+                    {
+                        Interpreter::Type_Integer idleValue = runtime[0].mFloat;
+                        idleList.push_back(idleValue);
+                        runtime.pop();
+                        --arg0;
+                    }
+
                     // discard additional arguments (reset), because we have no idea what they mean.
                     for (unsigned int i=0; i<arg0; ++i) runtime.pop();
 
-                    std::cout << "AiWanter" << std::endl;
+                    MWMechanics::AiWander wanderPackage(range, duration, time, idleList);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(wanderPackage);
+
+                    std::cout << "AiWander" << std::endl;
                 }
         };
 
         template<class R>
-        class OpSetHello : public Interpreter::Opcode0
+        class OpGetAiSetting : public Interpreter::Opcode0
+        {
+            int mIndex;
+            public:
+                OpGetAiSetting(int index) : mIndex(index) {}
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    runtime.push(MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSetting (mIndex));
+                }
+        };
+        template<class R>
+        class OpModAiSetting : public Interpreter::Opcode0
+        {
+            int mIndex;
+            public:
+                OpModAiSetting(int index) : mIndex(index) {}
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+                    Interpreter::Type_Integer value = runtime[0].mInteger;
+                    runtime.pop();
+
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (mIndex,
+                        MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSetting (mIndex) + value);
+                }
+        };
+        template<class R>
+        class OpSetAiSetting : public Interpreter::Opcode0
+        {
+            int mIndex;
+            public:
+                OpSetAiSetting(int index) : mIndex(index) {}
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+                    Interpreter::Type_Integer value = runtime[0].mInteger;
+                    runtime.pop();
+
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (mIndex,
+                        value);
+                }
+        };
+
+        template<class R>
+        class OpAiFollow : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    Interpreter::Type_Float duration = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float x = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float y = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float z = runtime[0].mFloat;
+                    runtime.pop();
+
+                    // 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(actorID, duration, x, y ,z);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(followPackage);
+
+                    std::cout << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration
+                        << std::endl;
+                }
+        };
+
+        template<class R>
+        class OpAiFollowCell : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    std::string cellID = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    Interpreter::Type_Float duration = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float x = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float y = runtime[0].mFloat;
+                    runtime.pop();
+
+                    Interpreter::Type_Float z = runtime[0].mFloat;
+                    runtime.pop();
+
+                    // 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(actorID, cellID, duration, x, y ,z);
+                    MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().stack(followPackage);
+                    std::cout << "AiFollow: " << actorID << ", " << x << ", " << y << ", " << z << ", " << duration
+                        << std::endl;
+                }
+        };
+
+        template<class R>
+        class OpGetCurrentAIPackage : public Interpreter::Opcode0
         {
             public:
 
@@ -127,58 +331,29 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
+                    Interpreter::Type_Integer value = MWWorld::Class::get (ptr).getCreatureStats (ptr).getAiSequence().getTypeId ();
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (0, value);
+                    runtime.push (value);
                 }
         };
 
         template<class R>
-        class OpSetFight : public Interpreter::Opcode0
+        class OpGetDetected : public Interpreter::Opcode1
         {
             public:
 
-                virtual void execute (Interpreter::Runtime& runtime)
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
+                    std::string actorID = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (1, value);
-                }
-        };
+                    Interpreter::Type_Integer value = false; // TODO replace with implementation
 
-        template<class R>
-        class OpSetFlee : public Interpreter::Opcode0
-        {
-            public:
+                    std::cout << "AiGetDetected: " << actorID << ", " << value << std::endl;
 
-                virtual void execute (Interpreter::Runtime& runtime)
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
-
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (2, value);
-                }
-        };
-
-        template<class R>
-        class OpSetAlarm : public Interpreter::Opcode0
-        {
-            public:
-
-                virtual void execute (Interpreter::Runtime& runtime)
-                {
-                    MWWorld::Ptr ptr = R()(runtime);
-
-                    Interpreter::Type_Integer value = runtime[0].mInteger;
-                    runtime.pop();
-
-                    MWWorld::Class::get (ptr).getCreatureStats (ptr).setAiSetting (3, value);
+                    runtime.push (value);
                 }
         };
 
@@ -189,8 +364,20 @@ namespace MWScript
         const int opcodeAiEscortExplicit = 0x20003;
         const int opcodeGetAiPackageDone = 0x200007c;
         const int opcodeGetAiPackageDoneExplicit = 0x200007d;
+        const int opcodeGetCurrentAiPackage = 0x20001ef;
+        const int opcodeGetCurrentAiPackageExplicit = 0x20001f0;
+        const int opcodeGetDetected = 0x20001f1;
+        const int opcodeGetDetectedExplicit = 0x20001f2;
         const int opcodeAiWander = 0x20010;
         const int opcodeAiWanderExplicit = 0x20011;
+        const int opcodeAIActivate = 0x2001e;
+        const int opcodeAIActivateExplicit = 0x2001f;
+        const int opcodeAiEscortCell = 0x20020;
+        const int opcodeAiEscortCellExplicit = 0x20021;
+        const int opcodeAiFollow = 0x20022;
+        const int opcodeAiFollowExplicit = 0x20023;
+        const int opcodeAiFollowCell = 0x20024;
+        const int opcodeAiFollowCellExplicit = 0x20025;
         const int opcodeSetHello = 0x200015e;
         const int opcodeSetHelloExplicit = 0x200015d;
         const int opcodeSetFight = 0x200015e;
@@ -199,44 +386,109 @@ namespace MWScript
         const int opcodeSetFleeExplicit = 0x2000161;
         const int opcodeSetAlarm = 0x2000162;
         const int opcodeSetAlarmExplicit = 0x2000163;
+        const int opcodeModHello = 0x20001b7;
+        const int opcodeModHelloExplicit = 0x20001b8;
+        const int opcodeModFight = 0x20001b9;
+        const int opcodeModFightExplicit = 0x20001ba;
+        const int opcodeModFlee = 0x20001bb;
+        const int opcodeModFleeExplicit = 0x20001bc;
+        const int opcodeModAlarm = 0x20001bd;
+        const int opcodeModAlarmExplicit = 0x20001be;
+        const int opcodeGetHello = 0x20001bf;
+        const int opcodeGetHelloExplicit = 0x20001c0;
+        const int opcodeGetFight = 0x20001c1;
+        const int opcodeGetFightExplicit = 0x20001c2;
+        const int opcodeGetFlee = 0x20001c3;
+        const int opcodeGetFleeExplicit = 0x20001c4;
+        const int opcodeGetAlarm = 0x20001c5;
+        const int opcodeGetAlarmExplicit = 0x20001c6;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
+            extensions.registerInstruction ("aiactivate", "c/l", opcodeAIActivate,
+                opcodeAIActivateExplicit);
             extensions.registerInstruction ("aitravel", "fff/l", opcodeAiTravel,
                 opcodeAiTravelExplicit);
             extensions.registerInstruction ("aiescort", "cffff/l", opcodeAiEscort,
                 opcodeAiEscortExplicit);
+            extensions.registerInstruction ("aiescortcell", "ccffff/l", opcodeAiEscortCell,
+                opcodeAiEscortCellExplicit);
             extensions.registerInstruction ("aiwander", "fff/llllllllll", opcodeAiWander,
                 opcodeAiWanderExplicit);
-
+            extensions.registerInstruction ("aifollow", "cffff/l", opcodeAiFollow,
+                opcodeAiFollowExplicit);
+            extensions.registerInstruction ("aifollowcell", "ccffff/l", opcodeAiFollowCell,
+                opcodeAiFollowCellExplicit);
             extensions.registerFunction ("getaipackagedone", 'l', "", opcodeGetAiPackageDone,
                 opcodeGetAiPackageDoneExplicit);
-
+            extensions.registerFunction ("getcurrentaipackage", 'l', "", opcodeGetCurrentAiPackage,
+                opcodeGetAiPackageDoneExplicit);
+            extensions.registerFunction ("getdetected", 'l', "c", opcodeGetDetected,
+                opcodeGetDetectedExplicit);
             extensions.registerInstruction ("sethello", "l", opcodeSetHello, opcodeSetHelloExplicit);
             extensions.registerInstruction ("setfight", "l", opcodeSetFight, opcodeSetFightExplicit);
             extensions.registerInstruction ("setflee", "l", opcodeSetFlee, opcodeSetFleeExplicit);
             extensions.registerInstruction ("setalarm", "l", opcodeSetAlarm, opcodeSetAlarmExplicit);
+            extensions.registerInstruction ("modhello", "l", opcodeModHello, opcodeModHelloExplicit);
+            extensions.registerInstruction ("modfight", "l", opcodeModFight, opcodeModFightExplicit);
+            extensions.registerInstruction ("modflee", "l", opcodeModFlee, opcodeModFleeExplicit);
+            extensions.registerInstruction ("modalarm", "l", opcodeModAlarm, opcodeModAlarmExplicit);
+            extensions.registerFunction ("gethello", 'l', "", opcodeGetHello, opcodeGetHelloExplicit);
+            extensions.registerFunction ("getfight", 'l', "", opcodeGetFight, opcodeGetFightExplicit);
+            extensions.registerFunction ("getflee", 'l', "", opcodeGetFlee, opcodeGetFleeExplicit);
+            extensions.registerFunction ("getalarm", 'l', "", opcodeGetAlarm, opcodeGetAlarmExplicit);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
         {
+            interpreter.installSegment3 (opcodeAIActivate, new OpAiActivate<ImplicitRef>);
+            interpreter.installSegment3 (opcodeAIActivateExplicit, new OpAiActivate<ExplicitRef>);
             interpreter.installSegment3 (opcodeAiTravel, new OpAiTravel<ImplicitRef>);
             interpreter.installSegment3 (opcodeAiTravelExplicit, new OpAiTravel<ExplicitRef>);
             interpreter.installSegment3 (opcodeAiEscort, new OpAiEscort<ImplicitRef>);
             interpreter.installSegment3 (opcodeAiEscortExplicit, new OpAiEscort<ExplicitRef>);
+            interpreter.installSegment3 (opcodeAiEscortCell, new OpAiEscortCell<ImplicitRef>);
+            interpreter.installSegment3 (opcodeAiEscortCellExplicit, new OpAiEscortCell<ExplicitRef>);
             interpreter.installSegment3 (opcodeAiWander, new OpAiWander<ImplicitRef>);
             interpreter.installSegment3 (opcodeAiWanderExplicit, new OpAiWander<ExplicitRef>);
+            interpreter.installSegment3 (opcodeAiFollow, new OpAiFollow<ImplicitRef>);
+            interpreter.installSegment3 (opcodeAiFollowExplicit, new OpAiFollow<ExplicitRef>);
+            interpreter.installSegment3 (opcodeAiFollowCell, new OpAiFollowCell<ImplicitRef>);
+            interpreter.installSegment3 (opcodeAiFollowCellExplicit, new OpAiFollowCell<ExplicitRef>);
             interpreter.installSegment5 (opcodeGetAiPackageDone, new OpGetAiPackageDone<ImplicitRef>);
+
             interpreter.installSegment5 (opcodeGetAiPackageDoneExplicit,
                 new OpGetAiPackageDone<ExplicitRef>);
-            interpreter.installSegment5 (opcodeSetHello, new OpSetHello<ImplicitRef>);
-            interpreter.installSegment5 (opcodeSetHelloExplicit, new OpSetHello<ExplicitRef>);
-            interpreter.installSegment5 (opcodeSetFight, new OpSetFight<ImplicitRef>);
-            interpreter.installSegment5 (opcodeSetFightExplicit, new OpSetFight<ExplicitRef>);
-            interpreter.installSegment5 (opcodeSetFlee, new OpSetFlee<ImplicitRef>);
-            interpreter.installSegment5 (opcodeSetFleeExplicit, new OpSetFlee<ExplicitRef>);
-            interpreter.installSegment5 (opcodeSetAlarm, new OpSetAlarm<ImplicitRef>);
-            interpreter.installSegment5 (opcodeSetAlarmExplicit, new OpSetAlarm<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetCurrentAiPackage, new OpGetCurrentAIPackage<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetCurrentAiPackageExplicit, new OpGetCurrentAIPackage<ExplicitRef>);
+            interpreter.installSegment3 (opcodeGetDetected, new OpGetDetected<ImplicitRef>);
+            interpreter.installSegment3 (opcodeGetDetectedExplicit, new OpGetDetected<ExplicitRef>);
+            interpreter.installSegment5 (opcodeSetHello, new OpSetAiSetting<ImplicitRef>(0));
+            interpreter.installSegment5 (opcodeSetHelloExplicit, new OpSetAiSetting<ExplicitRef>(0));
+            interpreter.installSegment5 (opcodeSetFight, new OpSetAiSetting<ImplicitRef>(1));
+            interpreter.installSegment5 (opcodeSetFightExplicit, new OpSetAiSetting<ExplicitRef>(1));
+            interpreter.installSegment5 (opcodeSetFlee, new OpSetAiSetting<ImplicitRef>(2));
+            interpreter.installSegment5 (opcodeSetFleeExplicit, new OpSetAiSetting<ExplicitRef>(2));
+            interpreter.installSegment5 (opcodeSetAlarm, new OpSetAiSetting<ImplicitRef>(3));
+            interpreter.installSegment5 (opcodeSetAlarmExplicit, new OpSetAiSetting<ExplicitRef>(3));
+
+            interpreter.installSegment5 (opcodeModHello, new OpModAiSetting<ImplicitRef>(0));
+            interpreter.installSegment5 (opcodeModHelloExplicit, new OpModAiSetting<ExplicitRef>(0));
+            interpreter.installSegment5 (opcodeModFight, new OpModAiSetting<ImplicitRef>(1));
+            interpreter.installSegment5 (opcodeModFightExplicit, new OpModAiSetting<ExplicitRef>(1));
+            interpreter.installSegment5 (opcodeModFlee, new OpModAiSetting<ImplicitRef>(2));
+            interpreter.installSegment5 (opcodeModFleeExplicit, new OpModAiSetting<ExplicitRef>(2));
+            interpreter.installSegment5 (opcodeModAlarm, new OpModAiSetting<ImplicitRef>(3));
+            interpreter.installSegment5 (opcodeModAlarmExplicit, new OpModAiSetting<ExplicitRef>(3));
+
+            interpreter.installSegment5 (opcodeGetHello, new OpGetAiSetting<ImplicitRef>(0));
+            interpreter.installSegment5 (opcodeGetHelloExplicit, new OpGetAiSetting<ExplicitRef>(0));
+            interpreter.installSegment5 (opcodeGetFight, new OpGetAiSetting<ImplicitRef>(1));
+            interpreter.installSegment5 (opcodeGetFightExplicit, new OpGetAiSetting<ExplicitRef>(1));
+            interpreter.installSegment5 (opcodeGetFlee, new OpGetAiSetting<ImplicitRef>(2));
+            interpreter.installSegment5 (opcodeGetFleeExplicit, new OpGetAiSetting<ExplicitRef>(2));
+            interpreter.installSegment5 (opcodeGetAlarm, new OpGetAiSetting<ImplicitRef>(3));
+            interpreter.installSegment5 (opcodeGetAlarmExplicit, new OpGetAiSetting<ExplicitRef>(3));
         }
     }
 }
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 5e9746b2f..1fa69d1fd 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -3,6 +3,10 @@
 
 #include <stdexcept>
 
+#include <boost/format.hpp>
+
+#include <MyGUI_LanguageManager.h>
+
 #include <components/compiler/extensions.hpp>
 
 #include <components/interpreter/interpreter.hpp>
@@ -10,27 +14,17 @@
 #include <components/interpreter/opcodes.hpp>
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/manualref.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/actionequip.hpp"
+#include "../mwworld/inventorystore.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
 
-namespace
-{
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-}
-
 namespace MWScript
 {
     namespace Container
@@ -78,7 +72,7 @@ namespace MWScript
                     Interpreter::Type_Integer sum = 0;
 
                     for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
-                        if (toLower(iter->getCellRef().mRefID) == toLower(item))
+                        if (Misc::StringUtils::ciEqual(iter->getCellRef().mRefID, item))
                             sum += iter->getRefData().getCount();
 
                     runtime.push (sum);
@@ -99,17 +93,22 @@ namespace MWScript
 
                     Interpreter::Type_Integer count = runtime[0].mInteger;
                     runtime.pop();
-
+                    
                     if (count<0)
                         throw std::runtime_error ("second argument for RemoveItem must be non-negative");
 
                     MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+                    
+                    std::string itemName = "";
+                    Interpreter::Type_Integer originalCount = count;
 
                     for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end() && count;
                         ++iter)
                     {
-                        if (toLower(iter->getCellRef().mRefID) == toLower(item))
+                        if (Misc::StringUtils::ciEqual(iter->getCellRef().mRefID, item))
                         {
+                            itemName = MWWorld::Class::get(*iter).getName(*iter);
+                            
                             if (iter->getRefData().getCount()<=count)
                             {
                                 count -= iter->getRefData().getCount();
@@ -122,18 +121,222 @@ namespace MWScript
                             }
                         }
                     }
+                  
+                    /* The two GMST entries below expand to strings informing the player of what, and how many of it has been removed from their inventory */
+                    std::string msgBox;
+                    if(originalCount - count > 1)
+                    {
+                        msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage63}");
+                        std::stringstream temp;
+                        temp << boost::format(msgBox) % (originalCount - count) % itemName;
+                        msgBox = temp.str();
+                    }
+                    else
+                    {
+                        msgBox = MyGUI::LanguageManager::getInstance().replaceTags("#{sNotifyMessage62}");
+                        std::stringstream temp;
+                        temp << boost::format(msgBox) % itemName;
+                        msgBox = temp.str();
+                    }
+                    
+                    if(originalCount - count > 0)
+                        MWBase::Environment::get().getWindowManager()->messageBox(msgBox, std::vector<std::string>());
 
                     // To be fully compatible with original Morrowind, we would need to check if
                     // count is >= 0 here and throw an exception. But let's be tollerant instead.
                 }
         };
 
+        template <class R>
+        class OpEquip : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute(Interpreter::Runtime &runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    MWWorld::ContainerStoreIterator it = invStore.begin();
+                    for (; it != invStore.end(); ++it)
+                    {
+                        if (Misc::StringUtils::ciEqual(it->getCellRef().mRefID, item))
+                            break;
+                    }
+                    if (it == invStore.end())
+                        throw std::runtime_error("Item to equip not found");
+
+                    MWWorld::ActionEquip action (*it);
+                    action.execute(ptr);
+                }
+        };
+
+        template <class R>
+        class OpGetArmorType : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute(Interpreter::Runtime &runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    Interpreter::Type_Integer location = runtime[0].mInteger;
+                    runtime.pop();
+
+                    int slot;
+                    switch (location)
+                    {
+                        case 0:
+                            slot = MWWorld::InventoryStore::Slot_Helmet;
+                            break;
+                        case 1:
+                            slot = MWWorld::InventoryStore::Slot_Cuirass;
+                            break;
+                        case 2:
+                            slot = MWWorld::InventoryStore::Slot_LeftPauldron;
+                            break;
+                        case 3:
+                            slot = MWWorld::InventoryStore::Slot_RightPauldron;
+                            break;
+                        case 4:
+                            slot = MWWorld::InventoryStore::Slot_Greaves;
+                            break;
+                        case 5:
+                            slot = MWWorld::InventoryStore::Slot_Boots;
+                            break;
+                        case 6:
+                            slot = MWWorld::InventoryStore::Slot_LeftGauntlet;
+                            break;
+                        case 7:
+                            slot = MWWorld::InventoryStore::Slot_RightGauntlet;
+                            break;
+                        case 8:
+                            slot = MWWorld::InventoryStore::Slot_CarriedLeft; // shield
+                            break;
+                        case 9:
+                            slot = MWWorld::InventoryStore::Slot_LeftGauntlet;
+                            break;
+                        case 10:
+                            slot = MWWorld::InventoryStore::Slot_RightGauntlet;
+                            break;
+                        default:
+                            throw std::runtime_error ("armor index out of range");
+                    }
+
+                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+
+                    MWWorld::ContainerStoreIterator it = invStore.getSlot (slot);
+                    if (it == invStore.end() || it->getTypeName () != typeid(ESM::Armor).name())
+                    {
+                        runtime.push(-1);
+                        return;
+                    }
+
+                    int skill = MWWorld::Class::get(*it).getEquipmentSkill (*it) ;
+                    if (skill == ESM::Skill::HeavyArmor)
+                        runtime.push(2);
+                    else if (skill == ESM::Skill::MediumArmor)
+                        runtime.push(1);
+                    else if (skill == ESM::Skill::LightArmor)
+                        runtime.push(0);
+                    else
+                        runtime.push(-1);
+            }
+        };
+
+        template <class R>
+        class OpHasItemEquipped : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute(Interpreter::Runtime &runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    for (int slot = 0; slot < MWWorld::InventoryStore::Slots; ++slot)
+                    {
+                        MWWorld::ContainerStoreIterator it = invStore.getSlot (slot);
+                        if (it != invStore.end() && Misc::StringUtils::ciEqual(it->getCellRef().mRefID, item))
+                        {
+                            runtime.push(1);
+                            return;
+                        }
+                    }
+                    runtime.push(0);
+                }
+        };
+
+        template <class R>
+        class OpHasSoulGem : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute(Interpreter::Runtime &runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+      
+		    const std::string &name = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    for (MWWorld::ContainerStoreIterator it = invStore.begin(MWWorld::ContainerStore::Type_Miscellaneous);
+                         it != invStore.end(); ++it)
+                    {
+
+                        if (Misc::StringUtils::ciEqual(it->getCellRef().mSoul, name))
+                        {
+                            runtime.push(1);
+                            return;
+                        }
+                    }
+                    runtime.push(0);
+                }
+        };
+
+        template <class R>
+        class OpGetWeaponType : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute(Interpreter::Runtime &runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    MWWorld::InventoryStore& invStore = MWWorld::Class::get(ptr).getInventoryStore (ptr);
+                    MWWorld::ContainerStoreIterator it = invStore.getSlot (MWWorld::InventoryStore::Slot_CarriedRight);
+                    if (it == invStore.end() || it->getTypeName () != typeid(ESM::Weapon).name())
+                    {
+                        runtime.push(-1);
+                        return;
+                    }
+
+                    runtime.push(it->get<ESM::Weapon>()->mBase->mData.mType);
+                }
+        };
+
         const int opcodeAddItem = 0x2000076;
         const int opcodeAddItemExplicit = 0x2000077;
         const int opcodeGetItemCount = 0x2000078;
         const int opcodeGetItemCountExplicit = 0x2000079;
         const int opcodeRemoveItem = 0x200007a;
         const int opcodeRemoveItemExplicit = 0x200007b;
+        const int opcodeEquip = 0x20001b3;
+        const int opcodeEquipExplicit = 0x20001b4;
+        const int opcodeGetArmorType = 0x20001d1;
+        const int opcodeGetArmorTypeExplicit = 0x20001d2;
+        const int opcodeHasItemEquipped = 0x20001d5;
+        const int opcodeHasItemEquippedExplicit = 0x20001d6;
+        const int opcodeHasSoulGem = 0x20001de;
+        const int opcodeHasSoulGemExplicit = 0x20001df;
+        const int opcodeGetWeaponType = 0x20001e0;
+        const int opcodeGetWeaponTypeExplicit = 0x20001e1;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
@@ -142,6 +345,11 @@ namespace MWScript
                 opcodeGetItemCountExplicit);
             extensions.registerInstruction ("removeitem", "cl", opcodeRemoveItem,
                 opcodeRemoveItemExplicit);
+            extensions.registerInstruction ("equip", "c", opcodeEquip, opcodeEquipExplicit);
+            extensions.registerFunction ("getarmortype", 'l', "l", opcodeGetArmorType, opcodeGetArmorTypeExplicit);
+            extensions.registerFunction ("hasitemequipped", 'l', "c", opcodeHasItemEquipped, opcodeHasItemEquippedExplicit);
+            extensions.registerFunction ("hassoulgem", 'l', "c", opcodeHasSoulGem, opcodeHasSoulGemExplicit);
+            extensions.registerFunction ("getweapontype", 'l', "", opcodeGetWeaponType, opcodeGetWeaponTypeExplicit);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -152,6 +360,16 @@ namespace MWScript
              interpreter.installSegment5 (opcodeGetItemCountExplicit, new OpGetItemCount<ExplicitRef>);
              interpreter.installSegment5 (opcodeRemoveItem, new OpRemoveItem<ImplicitRef>);
              interpreter.installSegment5 (opcodeRemoveItemExplicit, new OpRemoveItem<ExplicitRef>);
+             interpreter.installSegment5 (opcodeEquip, new OpEquip<ImplicitRef>);
+             interpreter.installSegment5 (opcodeEquipExplicit, new OpEquip<ExplicitRef>);
+             interpreter.installSegment5 (opcodeGetArmorType, new OpGetArmorType<ImplicitRef>);
+             interpreter.installSegment5 (opcodeGetArmorTypeExplicit, new OpGetArmorType<ExplicitRef>);
+             interpreter.installSegment5 (opcodeHasItemEquipped, new OpHasItemEquipped<ImplicitRef>);
+             interpreter.installSegment5 (opcodeHasItemEquippedExplicit, new OpHasItemEquipped<ExplicitRef>);
+             interpreter.installSegment5 (opcodeHasSoulGem, new OpHasSoulGem<ImplicitRef>);
+             interpreter.installSegment5 (opcodeHasSoulGemExplicit, new OpHasSoulGem<ExplicitRef>);
+             interpreter.installSegment5 (opcodeGetWeaponType, new OpGetWeaponType<ImplicitRef>);
+             interpreter.installSegment5 (opcodeGetWeaponTypeExplicit, new OpGetWeaponType<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index 0096c69ab..8d65dfdd5 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -106,6 +106,58 @@ namespace MWScript
                 }
         };
 
+        template <class R>
+        class OpGetForceRun : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    MWMechanics::NpcStats& npcStats = MWWorld::Class::get(ptr).getNpcStats (ptr);
+
+                    runtime.push (npcStats.getMovementFlag (MWMechanics::NpcStats::Flag_ForceRun));
+                }
+        };
+
+        template <class R>
+        class OpGetForceSneak : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    MWMechanics::NpcStats& npcStats = MWWorld::Class::get(ptr).getNpcStats (ptr);
+
+                    runtime.push (npcStats.getMovementFlag (MWMechanics::NpcStats::Flag_ForceSneak));
+                }
+        };
+
+        class OpGetPcRunning : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer();
+                    runtime.push (MWWorld::Class::get(ptr).getStance (ptr, MWWorld::Class::Run));
+                }
+        };
+
+        class OpGetPcSneaking : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer();
+                    runtime.push (MWWorld::Class::get(ptr).getStance (ptr, MWWorld::Class::Sneak));
+                }
+        };
+
         const int numberOfControls = 7;
 
         const int opcodeEnable = 0x200007e;
@@ -120,6 +172,12 @@ namespace MWScript
         const int opcodeForceSneak = 0x200015a;
         const int opcodeForceSneakExplicit = 0x200015b;
         const int opcodeGetDisabled = 0x2000175;
+        const int opcodeGetPcRunning = 0x20001c9;
+        const int opcodeGetPcSneaking = 0x20001ca;
+        const int opcodeGetForceRun = 0x20001cb;
+        const int opcodeGetForceSneak = 0x20001cc;
+        const int opcodeGetForceRunExplicit = 0x20001cd;
+        const int opcodeGetForceSneakExplicit = 0x20001ce;
 
         const char *controls[numberOfControls] =
         {
@@ -151,6 +209,10 @@ namespace MWScript
                 opcodeClearForceSneakExplicit);
             extensions.registerInstruction ("forcesneak", "", opcodeForceSneak,
                 opcodeForceSneakExplicit);
+            extensions.registerFunction ("getpcrunning", 'l', "", opcodeGetPcRunning);
+            extensions.registerFunction ("getpcsneaking", 'l', "", opcodeGetPcSneaking);
+            extensions.registerFunction ("getforcerun", 'l', "", opcodeGetForceRun, opcodeGetForceRunExplicit);
+            extensions.registerFunction ("getforcesneak", 'l', "", opcodeGetForceSneak, opcodeGetForceSneakExplicit);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -181,6 +243,12 @@ namespace MWScript
                 new OpClearMovementFlag<ExplicitRef> (MWMechanics::NpcStats::Flag_ForceSneak));
             interpreter.installSegment5 (opcodeForceSneakExplicit,
                 new OpSetMovementFlag<ExplicitRef> (MWMechanics::NpcStats::Flag_ForceSneak));
+            interpreter.installSegment5 (opcodeGetPcRunning, new OpGetPcRunning);
+            interpreter.installSegment5 (opcodeGetPcSneaking, new OpGetPcSneaking);
+            interpreter.installSegment5 (opcodeGetForceRun, new OpGetForceRun<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetForceRunExplicit, new OpGetForceRun<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetForceSneak, new OpGetForceSneak<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetForceSneakExplicit, new OpGetForceSneak<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index 72ae25724..f63623275 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -12,6 +12,7 @@
 #include "../mwbase/journal.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/player.hpp"
 #include "../mwmechanics/npcstats.hpp"
 
 #include "interpretercontext.hpp"
@@ -159,6 +160,33 @@ namespace MWScript
                 }
         };
 
+        template<class R>
+        class OpGetReputation : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).getReputation ());
+                }
+        };
+
+        template<class R>
+        class OpSameFaction : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer();
+
+                    runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).isSameFaction (MWWorld::Class::get(player).getNpcStats (player)));
+                }
+        };
 
         const int opcodeJournal = 0x2000133;
         const int opcodeSetJournalIndex = 0x2000134;
@@ -172,6 +200,10 @@ namespace MWScript
         const int opcodeModReputation = 0x20001ae;
         const int opcodeSetReputationExplicit = 0x20001af;
         const int opcodeModReputationExplicit = 0x20001b0;
+        const int opcodeGetReputation = 0x20001b1;
+        const int opcodeGetReputationExplicit = 0x20001b2;
+        const int opcodeSameFaction = 0x20001b5;
+        const int opcodeSameFactionExplicit = 0x20001b6;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
@@ -188,6 +220,10 @@ namespace MWScript
                 opcodeSetReputationExplicit);
             extensions.registerInstruction("modreputation", "l", opcodeModReputation,
                 opcodeModReputationExplicit);
+            extensions.registerFunction("getreputation", 'l', "", opcodeGetReputation,
+                opcodeGetReputationExplicit);
+            extensions.registerFunction("samefaction", 'l', "", opcodeSameFaction,
+                opcodeSameFactionExplicit);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -200,10 +236,14 @@ namespace MWScript
             interpreter.installSegment5 (opcodeForceGreeting, new OpForceGreeting<ImplicitRef>);
             interpreter.installSegment5 (opcodeForceGreetingExplicit, new OpForceGreeting<ExplicitRef>);
             interpreter.installSegment5 (opcodeGoodbye, new OpGoodbye);
+            interpreter.installSegment5 (opcodeGetReputation, new OpGetReputation<ImplicitRef>);
             interpreter.installSegment5 (opcodeSetReputation, new OpSetReputation<ImplicitRef>);
             interpreter.installSegment5 (opcodeModReputation, new OpModReputation<ImplicitRef>);
             interpreter.installSegment5 (opcodeSetReputationExplicit, new OpSetReputation<ExplicitRef>);
             interpreter.installSegment5 (opcodeModReputationExplicit, new OpModReputation<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetReputationExplicit, new OpGetReputation<ExplicitRef>);
+            interpreter.installSegment5 (opcodeSameFaction, new OpSameFaction<ImplicitRef>);
+            interpreter.installSegment5 (opcodeSameFactionExplicit, new OpSameFaction<ExplicitRef>);
         }
     }
 
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index b130aa954..283f149de 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -37,7 +37,21 @@ op 0x20014: SetPCFacRep
 op 0x20015: SetPCFacRep, explicit reference
 op 0x20016: ModPCFacRep
 op 0x20017: ModPCFacRep, explicit reference
-op s 0x20018-0x3ffff unused
+op 0x20018: PcExpelled
+op 0x20019: PcExpelled, explicit
+op 0x2001a: PcExpell
+op 0x2001b: PcExpell, explicit
+op 0x2001c: PcClearExpelled
+op 0x2001d: PcClearExpelled, explicit
+op 0x2001e: AIActivate
+op 0x2001f: AIActivate, explicit reference
+op 0x20020: AiEscortCell
+op 0x20021: AiEscortCell, explicit reference
+op 0x20022: AiFollow
+op 0x20023: AiFollow, explicit reference
+op 0x20024: AiFollowCell
+op 0x20025: AiFollowCell, explicit reference
+op s 0x20026-0x3ffff unused
 
 Segment 4:
 (not implemented yet)
@@ -226,5 +240,80 @@ op 0x20001ad: SetReputation
 op 0x20001ae: ModReputation
 op 0x20001af: SetReputation, explicit
 op 0x20001b0: ModReputation, explicit
-opcodes 0x20001b1-0x3ffffff unused
+op 0x20001b1: GetReputation
+op 0x20001b2: GetReputation, explicit
+op 0x20001b3: Equip
+op 0x20001b4: Equip, explicit
+op 0x20001b5: SameFaction
+op 0x20001b6: SameFaction, explicit
+op 0x20001b7: ModHello
+op 0x20001b8: ModHello, explicit reference
+op 0x20001b9: ModFight
+op 0x20001ba: ModFight, explicit reference
+op 0x20001bb: ModFlee
+op 0x20001bc: ModFlee, explicit reference
+op 0x20001bd: ModAlarm
+op 0x20001be: ModAlarm, explicit reference
+op 0x20001bf: GetHello
+op 0x20001c0: GetHello, explicit reference
+op 0x20001c1: GetFight
+op 0x20001c2: GetFight, explicit reference
+op 0x20001c3: GetFlee
+op 0x20001c4: GetFlee, explicit reference
+op 0x20001c5: GetAlarm
+op 0x20001c6: GetAlarm, explicit reference
+op 0x20001c7: GetLocked
+op 0x20001c8: GetLocked, explicit reference
+op 0x20001c9: GetPcRunning
+op 0x20001ca: GetPcSneaking
+op 0x20001cb: GetForceRun
+op 0x20001cc: GetForceSneak
+op 0x20001cd: GetForceRun, explicit
+op 0x20001ce: GetForceSneak, explicit
+op 0x20001cf: GetEffect
+op 0x20001d0: GetEffect, explicit
+op 0x20001d1: GetArmorType
+op 0x20001d2: GetArmorType, explicit
+op 0x20001d3: GetAttacked
+op 0x20001d4: GetAttacked, explicit
+op 0x20001d5: HasItemEquipped
+op 0x20001d6: HasItemEquipped, explicit
+op 0x20001d7: GetWeaponDrawn
+op 0x20001d8: GetWeaponDrawn, explicit
+op 0x20001d9: GetRace
+op 0x20001da: GetRace, explicit
+op 0x20001db: GetSpellEffects
+op 0x20001dc: GetSpellEffects, explicit
+op 0x20001dd: GetCurrentTime
+op 0x20001de: HasSoulGem
+op 0x20001df: HasSoulGem, explicit
+op 0x20001e0: GetWeaponType
+op 0x20001e1: GetWeaponType, explicit
+op 0x20001e2: GetWerewolfKills
+op 0x20001e3: ModScale
+op 0x20001e4: ModScale, explicit
+op 0x20001e5: SetDelete
+op 0x20001e6: SetDelete, explicit
+op 0x20001e7: GetSquareRoot
+op 0x20001e8: RaiseRank
+op 0x20001e9: RaiseRank, explicit
+op 0x20001ea: LowerRank
+op 0x20001eb: LowerRank, explicit
+op 0x20001ec: GetPCCrimeLevel
+op 0x20001ed: SetPCCrimeLevel
+op 0x20001ee: ModPCCrimeLevel
+op 0x20001ef: GetCurrentAIPackage
+op 0x20001f0: GetCurrentAIPackage, explicit reference
+op 0x20001f1: GetDetected
+op 0x20001f2: GetDetected, explicit reference
+op 0x20001f3: AddSoulGem
+op 0x20001f4: AddSoulGem, explicit reference
+op 0x20001f5: RemoveSoulGem
+op 0x20001f6: RemoveSoulGem, explicit reference
+op 0x20001f7: PlayBink
+op 0x20001f8: Drop
+op 0x20001f9: Drop, explicit reference
+op 0x20001fa: DropSoulGem
+op 0x20001fb: DropSoulGem, explicit reference
 
+opcodes 0x20001fa-0x3ffffff unused
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index 72c2db164..bfe69c79e 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -102,7 +102,7 @@ namespace MWScript
             virtual void execute (Interpreter::Runtime& runtime)
             {
                 std::string cell = (runtime.getStringLiteral (runtime[0].mInteger));
-                boost::algorithm::to_lower(cell);
+                Misc::StringUtils::toLower(cell);
                 runtime.pop();
 
                 // "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's House as well."
@@ -115,7 +115,7 @@ namespace MWScript
                 for (; it != cells.extEnd(); ++it)
                 {
                     std::string name = it->mName;
-                    boost::algorithm::to_lower(name);
+                    Misc::StringUtils::toLower(name);
                     if (name.find(cell) != std::string::npos)
                         MWBase::Environment::get().getWindowManager()->addVisitedLocation (
                             it->mName,
@@ -181,7 +181,7 @@ opcodeEnableStatsReviewMenu);
             extensions.registerInstruction ("enablemapmenu", "", opcodeEnableMapMenu);
             extensions.registerInstruction ("enablestatsmenu", "", opcodeEnableStatsMenu);
 
-            extensions.registerInstruction ("enablerestmenu", "", opcodeEnableRest);
+            extensions.registerInstruction ("enablerest", "", opcodeEnableRest);
             extensions.registerInstruction ("enablelevelupmenu", "", opcodeEnableRest);
 
             extensions.registerInstruction ("showrestmenu", "", opcodeShowRestMenu);
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 577ad008f..c74e3f163 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -11,10 +11,13 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/inputmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
+#include "../mwmechanics/npcstats.hpp"
+
 #include "locals.hpp"
 #include "globalscripts.hpp"
 
@@ -174,6 +177,146 @@ namespace MWScript
             MWBase::Environment::get().getWorld()->getGlobalVariable (name).mFloat = value;
     }
 
+    std::vector<std::string> InterpreterContext::getGlobals () const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        return world->getGlobals();
+
+    }
+
+    char InterpreterContext::getGlobalType (const std::string& name) const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        return world->getGlobalVariableType(name);
+    }
+
+    std::string InterpreterContext::getActionBinding(const std::string& action) const
+    {
+        std::vector<int> actions = MWBase::Environment::get().getInputManager()->getActionSorting ();
+        for (std::vector<int>::const_iterator it = actions.begin(); it != actions.end(); ++it)
+        {
+            std::string desc = MWBase::Environment::get().getInputManager()->getActionDescription (*it);
+            if(desc == "")
+                continue;
+
+            if(desc == action)
+                return MWBase::Environment::get().getInputManager()->getActionBindingName (*it);
+        }
+
+        return "None";
+    }
+
+    std::string InterpreterContext::getNPCName() const
+    {
+        ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
+        return npc.mName;
+    }
+
+    std::string InterpreterContext::getNPCRace() const
+    {
+        ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
+        return npc.mRace;
+    }
+
+    std::string InterpreterContext::getNPCClass() const
+    {
+        ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
+        return npc.mClass;
+    }
+
+    std::string InterpreterContext::getNPCFaction() const
+    {
+        ESM::NPC npc = *mReference.get<ESM::NPC>()->mBase;
+        return npc.mFaction;
+    }
+
+    std::string InterpreterContext::getNPCRank() const
+    {
+        std::map<std::string, int> ranks = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks();
+        std::map<std::string, int>::const_iterator it = ranks.begin();
+
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        const MWWorld::ESMStore &store = world->getStore();
+        const ESM::Faction *faction = store.get<ESM::Faction>().find(it->first);
+
+        return faction->mRanks[it->second];
+    }
+
+    std::string InterpreterContext::getPCName() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        ESM::NPC player = *world->getPlayer().getPlayer().get<ESM::NPC>()->mBase;
+        return player.mName;
+    }
+
+    std::string InterpreterContext::getPCRace() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        std::string race = world->getPlayer().getPlayer().get<ESM::NPC>()->mBase->mRace;
+        return world->getStore().get<ESM::Race>().find(race)->mName;
+    }
+
+    std::string InterpreterContext::getPCClass() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        std::string class_ = world->getPlayer().getPlayer().get<ESM::NPC>()->mBase->mClass;
+        return world->getStore().get<ESM::Class>().find(class_)->mName;
+    }
+
+    std::string InterpreterContext::getPCRank() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWWorld::Ptr player = world->getPlayer().getPlayer();
+
+        std::string factionId = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks().begin()->first;
+
+        std::map<std::string, int> ranks = MWWorld::Class::get (player).getNpcStats (player).getFactionRanks();
+        std::map<std::string, int>::const_iterator it = ranks.begin();
+
+        const MWWorld::ESMStore &store = world->getStore();
+        const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
+
+        if(it->second < 0 || it->second > 9) // there are only 10 ranks
+            return "";
+
+        return faction->mRanks[it->second];
+    }
+
+    std::string InterpreterContext::getPCNextRank() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWWorld::Ptr player = world->getPlayer().getPlayer();
+
+        std::string factionId = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks().begin()->first;
+
+        std::map<std::string, int> ranks = MWWorld::Class::get (player).getNpcStats (player).getFactionRanks();
+        std::map<std::string, int>::const_iterator it = ranks.begin();
+
+        const MWWorld::ESMStore &store = world->getStore();
+        const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
+
+        if(it->second < 0 || it->second > 9)
+            return "";
+
+        if(it->second <= 8) // If player is at max rank, there is no next rank
+            return faction->mRanks[it->second + 1];
+        else
+            return faction->mRanks[it->second];
+    }
+
+    int InterpreterContext::getPCBounty() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        MWWorld::Ptr player = world->getPlayer().getPlayer();
+        return MWWorld::Class::get (player).getNpcStats (player).getBounty();
+    }
+
+    std::string InterpreterContext::getCurrentCellName() const
+    {
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+        return world->getCurrentCellName();
+    }
+
     bool InterpreterContext::isScriptRunning (const std::string& name) const
     {
         return MWBase::Environment::get().getScriptManager()->getGlobalScripts().isRunning (name);
diff --git a/apps/openmw/mwscript/interpretercontext.hpp b/apps/openmw/mwscript/interpretercontext.hpp
index 6d97f7949..f0b2758d9 100644
--- a/apps/openmw/mwscript/interpretercontext.hpp
+++ b/apps/openmw/mwscript/interpretercontext.hpp
@@ -75,6 +75,36 @@ namespace MWScript
             virtual void setGlobalLong (const std::string& name, int value);
 
             virtual void setGlobalFloat (const std::string& name, float value);
+            
+            virtual std::vector<std::string> getGlobals () const;
+
+            virtual char getGlobalType (const std::string& name) const;
+            
+            virtual std::string getActionBinding(const std::string& action) const;
+            
+            virtual std::string getNPCName() const;
+            
+            virtual std::string getNPCRace() const;
+            
+            virtual std::string getNPCClass() const;
+            
+            virtual std::string getNPCFaction() const;
+            
+            virtual std::string getNPCRank() const;
+            
+            virtual std::string getPCName() const;
+            
+            virtual std::string getPCRace() const;
+            
+            virtual std::string getPCClass() const;
+            
+            virtual std::string getPCRank() const;
+            
+            virtual std::string getPCNextRank() const;
+            
+            virtual int getPCBounty() const;
+            
+            virtual std::string getCurrentCellName() const;
 
             virtual bool isScriptRunning (const std::string& name) const;
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index c09f0c860..f329e30d9 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -13,6 +13,12 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/manualref.hpp"
+#include "../mwworld/containerstore.hpp"
+
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "interpretercontext.hpp"
 #include "ref.hpp"
@@ -21,6 +27,22 @@ namespace MWScript
 {
     namespace Misc
     {
+        class OpPlayBink : public Interpreter::Opcode0
+        {
+        public:
+
+            virtual void execute (Interpreter::Runtime& runtime)
+            {
+                std::string name = runtime.getStringLiteral (runtime[0].mInteger);
+                runtime.pop();
+
+                bool allowSkipping = runtime[0].mInteger;
+                runtime.pop();
+
+                MWBase::Environment::get().getWorld ()->playVideo (name, allowSkipping);
+            }
+        };
+
         class OpGetPcSleep : public Interpreter::Opcode0
         {
         public:
@@ -251,7 +273,7 @@ namespace MWScript
             static bool sActivate;
 
         public:
-        
+
             virtual void execute(Interpreter::Runtime &runtime)
             {
                 InterpreterContext& context =
@@ -272,6 +294,262 @@ namespace MWScript
         };
         bool OpToggleVanityMode::sActivate = true;
 
+        template <class R>
+        class OpGetLocked : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    runtime.push (ptr.getCellRef ().mLockLevel > 0);
+                }
+        };
+
+        template <class R>
+        class OpGetEffect : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    int key = runtime[0].mInteger;
+                    runtime.pop();
+
+                    runtime.push (MWWorld::Class::get(ptr).getCreatureStats (ptr).getMagicEffects ().get (
+                                      MWMechanics::EffectKey(key)).mMagnitude > 0);
+                }
+        };
+
+        template<class R>
+        class OpAddSoulGem : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string creature = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    std::string gem = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
+                    store.get<ESM::Creature>().find(creature); // This line throws an exception if it can't find the creature
+
+                    MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), gem);
+
+                    ref.getPtr().getRefData().setCount (1);
+
+                    ref.getPtr().getCellRef().mSoul = creature;
+
+                    MWWorld::Class::get (ptr).getContainerStore (ptr).add (ref.getPtr());
+
+                }
+        };
+
+        template<class R>
+        class OpRemoveSoulGem : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string soul = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+
+
+                    for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
+                    {
+                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().mSoul, soul))
+                        {
+                            if (iter->getRefData().getCount() <= 1)
+                                iter->getRefData().setCount (0);
+                            else
+                                iter->getRefData().setCount (iter->getRefData().getCount() - 1);
+                            break;
+                        }
+                    }
+                }
+        };
+
+        template<class R>
+        class OpDrop : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string item = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    Interpreter::Type_Integer amount = runtime[0].mInteger;
+                    runtime.pop();
+
+                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+
+
+                    for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
+                    {
+                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().mRefID, item))
+                        {
+                            if(iter->getRefData().getCount() <= amount)
+                            {
+                                MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter);
+                                iter->getRefData().setCount(0);
+                            }
+                            else
+                            {
+                                int original = iter->getRefData().getCount();
+                                iter->getRefData().setCount(amount);
+                                MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter);
+                                iter->getRefData().setCount(original - amount);
+                            }
+
+                            break;
+                        }
+                    }
+                }
+        };
+
+        template<class R>
+        class OpDropSoulGem : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string soul = runtime.getStringLiteral (runtime[0].mInteger);
+                    runtime.pop();
+
+                    MWWorld::ContainerStore& store = MWWorld::Class::get (ptr).getContainerStore (ptr);
+
+
+                    for (MWWorld::ContainerStoreIterator iter (store.begin()); iter!=store.end(); ++iter)
+                    {
+                        if (::Misc::StringUtils::ciEqual(iter->getCellRef().mSoul, soul))
+                        {
+
+                            if(iter->getRefData().getCount() <= 1)
+                            {
+                                MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter);
+                                iter->getRefData().setCount(0);
+                            }
+                            else
+                            {
+                                int original = iter->getRefData().getCount();
+                                iter->getRefData().setCount(1);
+                                MWBase::Environment::get().getWorld()->dropObjectOnGround(ptr, *iter);
+                                iter->getRefData().setCount(original - 1);
+                            }
+
+                            break;
+                        }
+                    }
+                }
+        };
+
+        template <class R>
+        class OpGetAttacked : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    runtime.push(MWWorld::Class::get(ptr).getCreatureStats (ptr).getAttacked ());
+                }
+        };
+
+        template <class R>
+        class OpGetWeaponDrawn : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    runtime.push(MWWorld::Class::get(ptr).getNpcStats (ptr).getDrawState () == MWMechanics::DrawState_Weapon);
+                }
+        };
+
+        template <class R>
+        class OpGetSpellEffects : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+                    std::string id = runtime.getStringLiteral(runtime[0].mInteger);
+                    runtime.pop();
+
+                    runtime.push(MWWorld::Class::get(ptr).getCreatureStats(ptr).getActiveSpells().isSpellActive(id));
+                }
+        };
+
+        class OpGetCurrentTime : public Interpreter::Opcode0
+        {
+        public:
+
+            virtual void execute (Interpreter::Runtime& runtime)
+            {
+                runtime.push(MWBase::Environment::get().getWorld()->getTimeStamp().getHour());
+            }
+        };
+
+        template <class R>
+        class OpSetDelete : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+                    int parameter = runtime[0].mInteger;
+                    runtime.pop();
+
+                    if (parameter == 1)
+                    {
+                        if (ptr.isInCell())
+                            MWBase::Environment::get().getWorld()->deleteObject (ptr);
+                        else
+                            ptr.getRefData().setCount(0);
+                    }
+                }
+        };
+
+        class OpGetSquareRoot : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    float param = runtime[0].mFloat;
+                    runtime.pop();
+
+                    runtime.push(std::sqrt (param));
+                }
+        };
+
         const int opcodeXBox = 0x200000c;
         const int opcodeOnActivate = 0x200000d;
         const int opcodeActivate = 0x2000075;
@@ -291,6 +569,30 @@ namespace MWScript
         const int opcodeToggleVanityMode = 0x2000174;
         const int opcodeGetPcSleep = 0x200019f;
         const int opcodeWakeUpPc = 0x20001a2;
+        const int opcodeGetLocked = 0x20001c7;
+        const int opcodeGetLockedExplicit = 0x20001c8;
+        const int opcodeGetEffect = 0x20001cf;
+        const int opcodeGetEffectExplicit = 0x20001d0;
+        const int opcodeAddSoulGem = 0x20001f3;
+        const int opcodeAddSoulGemExplicit = 0x20001f4;
+        const int opcodeRemoveSoulGem = 0x20001f5;
+        const int opcodeRemoveSoulGemExplicit = 0x20001f6;
+        const int opcodeDrop = 0x20001f8;
+        const int opcodeDropExplicit = 0x20001f9;
+        const int opcodeDropSoulGem = 0x20001fa;
+        const int opcodeDropSoulGemExplicit = 0x20001fb;
+        const int opcodeGetAttacked = 0x20001d3;
+        const int opcodeGetAttackedExplicit = 0x20001d4;
+        const int opcodeGetWeaponDrawn = 0x20001d7;
+        const int opcodeGetWeaponDrawnExplicit = 0x20001d8;
+        const int opcodeGetSpellEffects = 0x20001db;
+        const int opcodeGetSpellEffectsExplicit = 0x20001dc;
+        const int opcodeGetCurrentTime = 0x20001dd;
+        const int opcodeSetDelete = 0x20001e5;
+        const int opcodeSetDeleteExplicit = 0x20001e6;
+        const int opcodeGetSquareRoot = 0x20001e7;
+
+        const int opcodePlayBink = 0x20001f7;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
@@ -317,6 +619,19 @@ namespace MWScript
             extensions.registerInstruction ("tvm", "", opcodeToggleVanityMode);
             extensions.registerFunction ("getpcsleep", 'l', "", opcodeGetPcSleep);
             extensions.registerInstruction ("wakeuppc", "", opcodeWakeUpPc);
+            extensions.registerInstruction ("playbink", "Sl", opcodePlayBink);
+            extensions.registerFunction ("getlocked", 'l', "", opcodeGetLocked, opcodeGetLockedExplicit);
+            extensions.registerFunction ("geteffect", 'l', "l", opcodeGetEffect, opcodeGetEffectExplicit);
+            extensions.registerInstruction ("addsoulgem", "cc", opcodeAddSoulGem, opcodeAddSoulGemExplicit);
+            extensions.registerInstruction ("removesoulgem", "c", opcodeRemoveSoulGem, opcodeRemoveSoulGemExplicit);
+            extensions.registerInstruction ("drop", "cl", opcodeDrop, opcodeDropExplicit);
+            extensions.registerInstruction ("dropsoulgem", "c", opcodeDropSoulGem, opcodeDropSoulGemExplicit);
+            extensions.registerFunction ("getattacked", 'l', "", opcodeGetAttacked, opcodeGetAttackedExplicit);
+            extensions.registerFunction ("getweapondrawn", 'l', "", opcodeGetWeaponDrawn, opcodeGetWeaponDrawnExplicit);
+            extensions.registerFunction ("getspelleffects", 'l', "c", opcodeGetSpellEffects, opcodeGetSpellEffectsExplicit);
+            extensions.registerFunction ("getcurrenttime", 'f', "", opcodeGetCurrentTime);
+            extensions.registerInstruction ("setdelete", "l", opcodeSetDelete, opcodeSetDeleteExplicit);
+            extensions.registerFunction ("getsquareroot", 'f', "f", opcodeGetSquareRoot);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -340,6 +655,29 @@ namespace MWScript
             interpreter.installSegment5 (opcodeToggleVanityMode, new OpToggleVanityMode);
             interpreter.installSegment5 (opcodeGetPcSleep, new OpGetPcSleep);
             interpreter.installSegment5 (opcodeWakeUpPc, new OpWakeUpPc);
+            interpreter.installSegment5 (opcodePlayBink, new OpPlayBink);
+            interpreter.installSegment5 (opcodeGetLocked, new OpGetLocked<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetLockedExplicit, new OpGetLocked<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetEffect, new OpGetEffect<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetEffectExplicit, new OpGetEffect<ExplicitRef>);
+            interpreter.installSegment5 (opcodeAddSoulGem, new OpAddSoulGem<ImplicitRef>);
+            interpreter.installSegment5 (opcodeAddSoulGemExplicit, new OpAddSoulGem<ExplicitRef>);
+            interpreter.installSegment5 (opcodeRemoveSoulGem, new OpRemoveSoulGem<ImplicitRef>);
+            interpreter.installSegment5 (opcodeRemoveSoulGemExplicit, new OpRemoveSoulGem<ExplicitRef>);
+            interpreter.installSegment5 (opcodeDrop, new OpDrop<ImplicitRef>);
+            interpreter.installSegment5 (opcodeDropExplicit, new OpDrop<ExplicitRef>);
+            interpreter.installSegment5 (opcodeDropSoulGem, new OpDropSoulGem<ImplicitRef>);
+            interpreter.installSegment5 (opcodeDropSoulGemExplicit, new OpDropSoulGem<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetAttacked, new OpGetAttacked<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetAttackedExplicit, new OpGetAttacked<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetWeaponDrawn, new OpGetWeaponDrawn<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetWeaponDrawnExplicit, new OpGetWeaponDrawn<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetSpellEffects, new OpGetSpellEffects<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetSpellEffectsExplicit, new OpGetSpellEffects<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetCurrentTime, new OpGetCurrentTime);
+            interpreter.installSegment5 (opcodeSetDelete, new OpSetDelete<ImplicitRef>);
+            interpreter.installSegment5 (opcodeSetDeleteExplicit, new OpSetDelete<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetSquareRoot, new OpGetSquareRoot);
         }
     }
 }
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index 35e66241e..408a6f29d 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -118,7 +118,8 @@ namespace MWScript
                     std::string sound = runtime.getStringLiteral (runtime[0].mInteger);
                     runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->playSound3D (ptr, sound, 1.0, 1.0, mLoop ? MWBase::SoundManager::Play_Loop : 0);
+                    MWBase::Environment::get().getSoundManager()->playSound3D (ptr, sound, 1.0, 1.0, mLoop ? MWBase::SoundManager::Play_Loop :
+                                                                                                             MWBase::SoundManager::Play_Normal);
                 }
         };
 
@@ -144,7 +145,8 @@ namespace MWScript
                     Interpreter::Type_Float pitch = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWBase::Environment::get().getSoundManager()->playSound3D (ptr, sound, volume, pitch, mLoop ? MWBase::SoundManager::Play_Loop : 0);
+                    MWBase::Environment::get().getSoundManager()->playSound3D (ptr, sound, volume, pitch, mLoop ? MWBase::SoundManager::Play_Loop :
+                                                                                                                  MWBase::SoundManager::Play_Normal);
 
                 }
         };
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index f6a31dd7f..530d44c9d 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -392,6 +392,46 @@ namespace MWScript
                 }
         };
 
+        class OpGetPCCrimeLevel : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    MWWorld::Ptr player = world->getPlayer().getPlayer();
+                    runtime.push (static_cast <Interpreter::Type_Float> (MWWorld::Class::get (player).getNpcStats (player).getBounty()));
+                }
+        };
+
+        class OpSetPCCrimeLevel : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    MWWorld::Ptr player = world->getPlayer().getPlayer();
+
+                    MWWorld::Class::get (player).getNpcStats (player).setBounty(runtime[0].mFloat);
+                    runtime.pop();
+                }
+        };
+
+        class OpModPCCrimeLevel : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWBase::World *world = MWBase::Environment::get().getWorld();
+                    MWWorld::Ptr player = world->getPlayer().getPlayer();
+
+                    MWWorld::Class::get (player).getNpcStats (player).setBounty(runtime[0].mFloat + MWWorld::Class::get (player).getNpcStats (player).getBounty());
+                    runtime.pop();
+                }
+        };
+
         template<class R>
         class OpAddSpell : public Interpreter::Opcode0
         {
@@ -445,7 +485,7 @@ namespace MWScript
                     for (MWMechanics::Spells::TIterator iter (
                         MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().begin());
                         iter!=MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().end(); ++iter)
-                        if (*iter==id)
+                        if (iter->first==id)
                         {
                             value = 1;
                             break;
@@ -472,7 +512,7 @@ namespace MWScript
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
                         runtime.pop();
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -501,7 +541,7 @@ namespace MWScript
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
                         runtime.pop();
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -534,7 +574,7 @@ namespace MWScript
                         factionID = runtime.getStringLiteral (runtime[0].mInteger);
                         runtime.pop();
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     if(factionID != "")
                     {
                         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -572,7 +612,7 @@ namespace MWScript
                             factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
                         }
                     }
-                    boost::algorithm::to_lower(factionID);
+                    Misc::StringUtils::toLower(factionID);
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     if(factionID!="")
                     {
@@ -634,7 +674,7 @@ namespace MWScript
                 {
                     MWWorld::Ptr ptr = R()(runtime);
 
-                    runtime.push (MWWorld::Class::get (ptr).getNpcStats (ptr).getBaseDisposition());
+                    runtime.push (MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(ptr));
                 }
         };
 
@@ -674,7 +714,7 @@ namespace MWScript
                     if (factionId.empty())
                         throw std::runtime_error ("failed to determine faction");
 
-                    boost::algorithm::to_lower (factionId);
+                    Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     runtime.push (
@@ -710,7 +750,7 @@ namespace MWScript
                     if (factionId.empty())
                         throw std::runtime_error ("failed to determine faction");
 
-                    boost::algorithm::to_lower (factionId);
+                    Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     MWWorld::Class::get (player).getNpcStats (player).setFactionReputation (factionId, value);
@@ -745,7 +785,7 @@ namespace MWScript
                     if (factionId.empty())
                         throw std::runtime_error ("failed to determine faction");
 
-                    boost::algorithm::to_lower (factionId);
+                    Misc::StringUtils::toLower (factionId);
 
                     MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
                     MWWorld::Class::get (player).getNpcStats (player).setFactionReputation (factionId,
@@ -780,6 +820,210 @@ namespace MWScript
                 }
         };
 
+        template<class R>
+        class OpGetRace : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string race = runtime.getStringLiteral(runtime[0].mInteger);
+                    Misc::StringUtils::toLower(race);
+                    runtime.pop();
+
+                    std::string npcRace = ptr.get<ESM::NPC>()->mBase->mRace;
+                    Misc::StringUtils::toLower(npcRace);
+
+                    runtime.push (npcRace == race);
+            }
+        };
+
+        class OpGetWerewolfKills : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer ();
+
+                    runtime.push (MWWorld::Class::get(ptr).getNpcStats (ptr).getWerewolfKills ());
+                }
+        };
+
+        template <class R>
+        class OpPcExpelled : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string factionID = "";
+                    if(arg0 >0 )
+                    {
+                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
+                        runtime.pop();
+                    }
+                    else
+                    {
+                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        {
+                            factionID = "";
+                        }
+                        else
+                        {
+                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                        }
+                    }
+                    Misc::StringUtils::toLower(factionID);
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+                    if(factionID!="")
+                    {
+                        std::set<std::string>& expelled = MWWorld::Class::get(player).getNpcStats(player).getExpelled ();
+                        if (expelled.find (factionID) != expelled.end())
+                        {
+                            runtime.push(1);
+                        }
+                        else
+                        {
+                            runtime.push(0);
+                        }
+                    }
+                    else
+                    {
+                        runtime.push(0);
+                    }
+                }
+        };
+
+        template <class R>
+        class OpPcExpell : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string factionID = "";
+                    if(arg0 >0 )
+                    {
+                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
+                        runtime.pop();
+                    }
+                    else
+                    {
+                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        {
+                            factionID = "";
+                        }
+                        else
+                        {
+                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                        }
+                    }
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+                    if(factionID!="")
+                    {
+                        std::set<std::string>& expelled = MWWorld::Class::get(player).getNpcStats(player).getExpelled ();
+                        Misc::StringUtils::toLower(factionID);
+                        expelled.insert(factionID);
+                    }
+                }
+        };
+
+        template <class R>
+        class OpPcClearExpelled : public Interpreter::Opcode1
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime, unsigned int arg0)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string factionID = "";
+                    if(arg0 >0 )
+                    {
+                        factionID = runtime.getStringLiteral (runtime[0].mInteger);
+                        runtime.pop();
+                    }
+                    else
+                    {
+                        if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        {
+                            factionID = "";
+                        }
+                        else
+                        {
+                            factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                        }
+                    }
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+                    if(factionID!="")
+                    {
+                        std::set<std::string>& expelled = MWWorld::Class::get(player).getNpcStats(player).getExpelled ();
+                        Misc::StringUtils::toLower(factionID);
+                        expelled.erase (factionID);
+                    }
+                }
+        };
+
+        template <class R>
+        class OpRaiseRank : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string factionID = "";
+                    if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        return;
+                    else
+                    {
+                        factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                    }
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+
+                    // no-op when executed on the player
+                    if (ptr == player)
+                        return;
+
+                    std::map<std::string, int>& ranks = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks ();
+                    ranks[factionID] = ranks[factionID]+1;
+                }
+        };
+
+        template <class R>
+        class OpLowerRank : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    std::string factionID = "";
+                    if(MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().empty())
+                        return;
+                    else
+                    {
+                        factionID = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks().begin()->first;
+                    }
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+
+                    // no-op when executed on the player
+                    if (ptr == player)
+                        return;
+
+                    std::map<std::string, int>& ranks = MWWorld::Class::get(ptr).getNpcStats(ptr).getFactionRanks ();
+                    ranks[factionID] = ranks[factionID]-1;
+                }
+        };
 
         const int numberOfAttributes = 8;
 
@@ -812,6 +1056,10 @@ namespace MWScript
         const int opcodeModSkill = 0x20000fa;
         const int opcodeModSkillExplicit = 0x2000115;
 
+        const int opcodeGetPCCrimeLevel = 0x20001ec;
+        const int opcodeSetPCCrimeLevel = 0x20001ed;
+        const int opcodeModPCCrimeLevel = 0x20001ee;
+
         const int opcodeAddSpell = 0x2000147;
         const int opcodeAddSpellExplicit = 0x2000148;
         const int opcodeRemoveSpell = 0x2000149;
@@ -850,6 +1098,22 @@ namespace MWScript
         const int opcodeGetBlightDisease = 0x20001aa;
         const int opcodeGetBlightDiseaseExplicit = 0x20001ab;
 
+        const int opcodeGetRace = 0x20001d9;
+        const int opcodeGetRaceExplicit = 0x20001da;
+
+        const int opcodeGetWerewolfKills = 0x20001e2;
+
+        const int opcodePcExpelled = 0x20018;
+        const int opcodePcExpelledExplicit = 0x20019;
+        const int opcodePcExpell = 0x2001a;
+        const int opcodePcExpellExplicit = 0x2001b;
+        const int opcodePcClearExpelled = 0x2001c;
+        const int opcodePcClearExpelledExplicit = 0x2001d;
+        const int opcodeRaiseRank = 0x20001e8;
+        const int opcodeRaiseRankExplicit = 0x20001e9;
+        const int opcodeLowerRank = 0x20001ea;
+        const int opcodeLowerRankExplicit = 0x20001eb;
+
         void registerExtensions (Compiler::Extensions& extensions)
         {
             static const char *attributes[numberOfAttributes] =
@@ -870,7 +1134,7 @@ namespace MWScript
                 "alteration", "illusion", "conjuration", "mysticism",
                 "restoration", "alchemy", "unarmored", "security", "sneak",
                 "acrobatics", "lightarmor", "shortblade", "marksman",
-                "merchantile", "speechcraft", "handtohand"
+                "mercantile", "speechcraft", "handtohand"
             };
 
             std::string get ("get");
@@ -921,6 +1185,10 @@ namespace MWScript
                     opcodeModSkill+i, opcodeModSkillExplicit+i);
             }
 
+            extensions.registerFunction ("getpccrimelevel", 'f', "", opcodeGetPCCrimeLevel);
+            extensions.registerInstruction ("setpccrimelevel", "f", opcodeSetPCCrimeLevel);
+            extensions.registerInstruction ("modpccrimelevel", "f", opcodeModPCCrimeLevel);
+
             extensions.registerInstruction ("addspell", "c", opcodeAddSpell, opcodeAddSpellExplicit);
             extensions.registerInstruction ("removespell", "c", opcodeRemoveSpell,
                 opcodeRemoveSpellExplicit);
@@ -950,6 +1218,15 @@ namespace MWScript
                 opcodeGetCommonDiseaseExplicit);
             extensions.registerFunction ("getblightdisease", 'l', "", opcodeGetBlightDisease,
                 opcodeGetBlightDiseaseExplicit);
+
+            extensions.registerFunction ("getrace", 'l', "c", opcodeGetRace,
+                opcodeGetRaceExplicit);
+            extensions.registerFunction ("getwerewolfkills", 'f', "", opcodeGetWerewolfKills);
+            extensions.registerFunction ("pcexpelled", 'l', "/S", opcodePcExpelled, opcodePcExpelledExplicit);
+            extensions.registerInstruction ("pcexpell", "/S", opcodePcExpell, opcodePcExpellExplicit);
+            extensions.registerInstruction ("pcclearexpelled", "/S", opcodePcClearExpelled, opcodePcClearExpelledExplicit);
+            extensions.registerInstruction ("raiserank", "", opcodeRaiseRank, opcodeRaiseRankExplicit);
+            extensions.registerInstruction ("lowerrank", "", opcodeLowerRank, opcodeLowerRankExplicit);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -1006,6 +1283,10 @@ namespace MWScript
                 interpreter.installSegment5 (opcodeModSkillExplicit+i, new OpModSkill<ExplicitRef> (i));
             }
 
+            interpreter.installSegment5 (opcodeGetPCCrimeLevel, new OpGetPCCrimeLevel);
+            interpreter.installSegment5 (opcodeSetPCCrimeLevel, new OpSetPCCrimeLevel);
+            interpreter.installSegment5 (opcodeModPCCrimeLevel, new OpModPCCrimeLevel);
+
             interpreter.installSegment5 (opcodeAddSpell, new OpAddSpell<ImplicitRef>);
             interpreter.installSegment5 (opcodeAddSpellExplicit, new OpAddSpell<ExplicitRef>);
             interpreter.installSegment5 (opcodeRemoveSpell, new OpRemoveSpell<ImplicitRef>);
@@ -1045,6 +1326,21 @@ namespace MWScript
             interpreter.installSegment5 (opcodeGetCommonDiseaseExplicit, new OpGetCommonDisease<ExplicitRef>);
             interpreter.installSegment5 (opcodeGetBlightDisease, new OpGetBlightDisease<ImplicitRef>);
             interpreter.installSegment5 (opcodeGetBlightDiseaseExplicit, new OpGetBlightDisease<ExplicitRef>);
+
+            interpreter.installSegment5 (opcodeGetRace, new OpGetRace<ImplicitRef>);
+            interpreter.installSegment5 (opcodeGetRaceExplicit, new OpGetRace<ExplicitRef>);
+            interpreter.installSegment5 (opcodeGetWerewolfKills, new OpGetWerewolfKills);
+
+            interpreter.installSegment3 (opcodePcExpelled, new OpPcExpelled<ImplicitRef>);
+            interpreter.installSegment3 (opcodePcExpelledExplicit, new OpPcExpelled<ExplicitRef>);
+            interpreter.installSegment3 (opcodePcExpell, new OpPcExpell<ImplicitRef>);
+            interpreter.installSegment3 (opcodePcExpellExplicit, new OpPcExpell<ExplicitRef>);
+            interpreter.installSegment3 (opcodePcClearExpelled, new OpPcClearExpelled<ImplicitRef>);
+            interpreter.installSegment3 (opcodePcClearExpelledExplicit, new OpPcClearExpelled<ExplicitRef>);
+            interpreter.installSegment5 (opcodeRaiseRank, new OpRaiseRank<ImplicitRef>);
+            interpreter.installSegment5 (opcodeRaiseRankExplicit, new OpRaiseRank<ExplicitRef>);
+            interpreter.installSegment5 (opcodeLowerRank, new OpLowerRank<ImplicitRef>);
+            interpreter.installSegment5 (opcodeLowerRankExplicit, new OpLowerRank<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index a64651a97..2dd8f3e16 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -53,6 +53,23 @@ namespace MWScript
                 }
         };
 
+        template<class R>
+        class OpModScale : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    Interpreter::Type_Float scale = runtime[0].mFloat;
+                    runtime.pop();
+
+                    // add the parameter to the object's scale.
+                    MWBase::Environment::get().getWorld()->scaleObject(ptr,ptr.getCellRef().mScale + scale);
+                }
+        };
+
         template<class R>
         class OpSetAngle : public Interpreter::Opcode0
         {
@@ -532,6 +549,8 @@ namespace MWScript
         const int opcodePlaceAtPc = 0x200019c;  
         const int opcodePlaceAtMe = 0x200019d;
         const int opcodePlaceAtMeExplicit = 0x200019e;
+        const int opcodeModScale = 0x20001e3;
+        const int opcodeModScaleExplicit = 0x20001e4;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {
@@ -548,6 +567,7 @@ namespace MWScript
             extensions.registerInstruction("placeitem","cffff",opcodePlaceItem);
             extensions.registerInstruction("placeatpc","clfl",opcodePlaceAtPc);
             extensions.registerInstruction("placeatme","clfl",opcodePlaceAtMe,opcodePlaceAtMeExplicit);
+            extensions.registerInstruction("modscale","f",opcodeModScale,opcodeModScaleExplicit);
         }
 
         void installOpcodes (Interpreter::Interpreter& interpreter)
@@ -574,7 +594,9 @@ namespace MWScript
             interpreter.installSegment5(opcodePlaceItem,new OpPlaceItem<ImplicitRef>);            
             interpreter.installSegment5(opcodePlaceAtPc,new OpPlaceAtPc<ImplicitRef>);   
             interpreter.installSegment5(opcodePlaceAtMe,new OpPlaceAtMe<ImplicitRef>);   
-            interpreter.installSegment5(opcodePlaceAtMeExplicit,new OpPlaceAtMe<ExplicitRef>); 
+            interpreter.installSegment5(opcodePlaceAtMeExplicit,new OpPlaceAtMe<ExplicitRef>);
+            interpreter.installSegment5(opcodeModScale,new OpModScale<ImplicitRef>);
+            interpreter.installSegment5(opcodeModScaleExplicit,new OpModScale<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwscript/userextensions.hpp b/apps/openmw/mwscript/userextensions.hpp
index 3642eb5f4..4bc3b46ec 100644
--- a/apps/openmw/mwscript/userextensions.hpp
+++ b/apps/openmw/mwscript/userextensions.hpp
@@ -13,7 +13,7 @@ namespace Interpreter
 
 namespace MWScript
 {
-    /// \brief Temporaty script functionality limited to the console
+    /// \brief Temporary script functionality limited to the console
     namespace User
     {
         void registerExtensions (Compiler::Extensions& extensions);
diff --git a/apps/openmw/mwsound/audiere_decoder.cpp b/apps/openmw/mwsound/audiere_decoder.cpp
index 4e73573a7..3f3e3a62d 100644
--- a/apps/openmw/mwsound/audiere_decoder.cpp
+++ b/apps/openmw/mwsound/audiere_decoder.cpp
@@ -53,6 +53,9 @@ public:
       : mStream(stream), refs(1)
     { }
     virtual ~OgreFile() { }
+
+    Ogre::String getName()
+    { return mStream->getName(); }
 };
 
 
@@ -60,8 +63,9 @@ void Audiere_Decoder::open(const std::string &fname)
 {
     close();
 
-    audiere::FilePtr file(new OgreFile(mResourceMgr.openResource(fname)));
-    mSoundSource = audiere::OpenSampleSource(file);
+    mSoundFile = audiere::FilePtr(new OgreFile(mResourceMgr.openResource(fname)));
+    mSoundSource = audiere::OpenSampleSource(mSoundFile);
+    mSoundFileName = fname;
 
     int channels, srate;
     audiere::SampleFormat format;
@@ -86,9 +90,15 @@ void Audiere_Decoder::open(const std::string &fname)
 
 void Audiere_Decoder::close()
 {
+    mSoundFile = NULL;
     mSoundSource = NULL;
 }
 
+std::string Audiere_Decoder::getName()
+{
+    return mSoundFileName;
+}
+
 void Audiere_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
 {
     *samplerate = mSampleRate;
@@ -108,6 +118,11 @@ void Audiere_Decoder::rewind()
     mSoundSource->reset();
 }
 
+size_t Audiere_Decoder::getSampleOffset()
+{
+    return 0;
+}
+
 Audiere_Decoder::Audiere_Decoder()
 {
 }
diff --git a/apps/openmw/mwsound/audiere_decoder.hpp b/apps/openmw/mwsound/audiere_decoder.hpp
index 0ad026d51..f432c32ec 100644
--- a/apps/openmw/mwsound/audiere_decoder.hpp
+++ b/apps/openmw/mwsound/audiere_decoder.hpp
@@ -12,6 +12,8 @@ namespace MWSound
 {
     class Audiere_Decoder : public Sound_Decoder
     {
+        std::string mSoundFileName;
+        audiere::FilePtr mSoundFile;
         audiere::SampleSourcePtr mSoundSource;
         int mSampleRate;
         SampleType mSampleType;
@@ -20,10 +22,12 @@ namespace MWSound
         virtual void open(const std::string &fname);
         virtual void close();
 
+        virtual std::string getName();
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
 
         virtual size_t read(char *buffer, size_t bytes);
         virtual void rewind();
+        virtual size_t getSampleOffset();
 
         Audiere_Decoder& operator=(const Audiere_Decoder &rhs);
         Audiere_Decoder(const Audiere_Decoder &rhs);
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index a2cccfd13..261a86ca6 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -15,28 +15,6 @@ static void fail(const std::string &msg)
 { throw std::runtime_error("FFmpeg exception: "+msg); }
 
 
-struct PacketList {
-    AVPacket pkt;
-    PacketList *next;
-};
-
-struct FFmpeg_Decoder::MyStream {
-    AVCodecContext *mCodecCtx;
-    int mStreamIdx;
-
-    PacketList *mPackets;
-
-    char *mDecodedData;
-    size_t mDecodedDataSize;
-
-    FFmpeg_Decoder *mParent;
-
-    void clearPackets();
-    void *getAVAudioData(size_t *length);
-    size_t readAVAudioData(void *data, size_t length);
-};
-
-
 int FFmpeg_Decoder::readPacket(void *user_data, uint8_t *buf, int buf_size)
 {
     Ogre::DataStreamPtr stream = static_cast<FFmpeg_Decoder*>(user_data)->mDataStream;
@@ -72,166 +50,84 @@ int64_t FFmpeg_Decoder::seek(void *user_data, int64_t offset, int whence)
 /* Used by getAV*Data to search for more compressed data, and buffer it in the
  * correct stream. It won't buffer data for streams that the app doesn't have a
  * handle for. */
-bool FFmpeg_Decoder::getNextPacket(int streamidx)
+bool FFmpeg_Decoder::getNextPacket()
 {
-    PacketList *packet;
+    if(!mStream)
+        return false;
 
-    packet = (PacketList*)av_malloc(sizeof(*packet));
-    packet->next = NULL;
-
-next_packet:
-    while(av_read_frame(mFormatCtx, &packet->pkt) >= 0)
+    int stream_idx = mStream - mFormatCtx->streams;
+    while(av_read_frame(mFormatCtx, &mPacket) >= 0)
     {
-        std::vector<MyStream*>::iterator iter = mStreams.begin();
-
-        /* Check each stream the user has a handle for, looking for the one
-         * this packet belongs to */
-        while(iter != mStreams.end())
+        /* Check if the packet belongs to this stream */
+        if(stream_idx == mPacket.stream_index)
         {
-            if((*iter)->mStreamIdx == packet->pkt.stream_index)
-            {
-                PacketList **last;
-
-                last = &(*iter)->mPackets;
-                while(*last != NULL)
-                    last = &(*last)->next;
-
-                *last = packet;
-                if((*iter)->mStreamIdx == streamidx)
-                    return true;
-
-                packet = (PacketList*)av_malloc(sizeof(*packet));
-                packet->next = NULL;
-                goto next_packet;
-            }
-            iter++;
+            if((uint64_t)mPacket.pts != AV_NOPTS_VALUE)
+                mNextPts = av_q2d((*mStream)->time_base)*mPacket.pts;
+            return true;
         }
+
         /* Free the packet and look for another */
-        av_free_packet(&packet->pkt);
+        av_free_packet(&mPacket);
     }
-    av_free(packet);
 
     return false;
 }
 
-void FFmpeg_Decoder::MyStream::clearPackets()
+bool FFmpeg_Decoder::getAVAudioData()
 {
-    while(mPackets)
-    {
-        PacketList *self = mPackets;
-        mPackets = self->next;
+    int got_frame, len;
 
-        av_free_packet(&self->pkt);
-        av_free(self);
-    }
-}
+    if((*mStream)->codec->codec_type != AVMEDIA_TYPE_AUDIO)
+        return false;
 
-void *FFmpeg_Decoder::MyStream::getAVAudioData(size_t *length)
-{
-    int size;
-    int len;
+    do {
+        if(mPacket.size == 0 && !getNextPacket())
+            return false;
 
-    if(length) *length = 0;
-    if(mCodecCtx->codec_type != AVMEDIA_TYPE_AUDIO)
-        return NULL;
+        /* Decode some data, and check for errors */
+        if((len=avcodec_decode_audio4((*mStream)->codec, mFrame, &got_frame, &mPacket)) < 0)
+            return false;
 
-    mDecodedDataSize = 0;
-
-next_packet:
-    if(!mPackets && !mParent->getNextPacket(mStreamIdx))
-        return NULL;
-
-    /* Decode some data, and check for errors */
-    size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-    while((len=avcodec_decode_audio3(mCodecCtx, (int16_t*)mDecodedData, &size,
-                                     &mPackets->pkt)) == 0)
-    {
-        PacketList *self;
-
-        if(size > 0)
-            break;
-
-        /* Packet went unread and no data was given? Drop it and try the next,
-         * I guess... */
-        self = mPackets;
-        mPackets = self->next;
-
-        av_free_packet(&self->pkt);
-        av_free(self);
-
-        if(!mPackets)
-            goto next_packet;
-
-        size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-    }
-
-    if(len < 0)
-        return NULL;
-
-    if(len < mPackets->pkt.size)
-    {
         /* Move the unread data to the front and clear the end bits */
-        int remaining = mPackets->pkt.size - len;
-        memmove(mPackets->pkt.data, &mPackets->pkt.data[len], remaining);
-        memset(&mPackets->pkt.data[remaining], 0, mPackets->pkt.size - remaining);
-        mPackets->pkt.size -= len;
-    }
-    else
-    {
-        PacketList *self;
+        int remaining = mPacket.size - len;
+        if(remaining <= 0)
+            av_free_packet(&mPacket);
+        else
+        {
+            memmove(mPacket.data, &mPacket.data[len], remaining);
+            av_shrink_packet(&mPacket, remaining);
+        }
+    } while(got_frame == 0 || mFrame->nb_samples == 0);
+    mNextPts += (double)mFrame->nb_samples / (double)(*mStream)->codec->sample_rate;
 
-        self = mPackets;
-        mPackets = self->next;
-
-        av_free_packet(&self->pkt);
-        av_free(self);
-    }
-
-    if(size == 0)
-        goto next_packet;
-
-    /* Set the output buffer size */
-    mDecodedDataSize = size;
-    if(length) *length = mDecodedDataSize;
-
-    return mDecodedData;
+    return true;
 }
 
-size_t FFmpeg_Decoder::MyStream::readAVAudioData(void *data, size_t length)
+size_t FFmpeg_Decoder::readAVAudioData(void *data, size_t length)
 {
     size_t dec = 0;
 
     while(dec < length)
     {
         /* If there's no decoded data, find some */
-        if(mDecodedDataSize == 0)
+        if(mFramePos >= mFrameSize)
         {
-            if(getAVAudioData(NULL) == NULL)
+            if(!getAVAudioData())
                 break;
+            mFramePos = 0;
+            mFrameSize = mFrame->nb_samples * (*mStream)->codec->channels *
+                         av_get_bytes_per_sample((*mStream)->codec->sample_fmt);
         }
 
-        if(mDecodedDataSize > 0)
-        {
-            /* Get the amount of bytes remaining to be written, and clamp to
-             * the amount of decoded data we have */
-            size_t rem = length-dec;
-            if(rem > mDecodedDataSize)
-                rem = mDecodedDataSize;
+        /* Get the amount of bytes remaining to be written, and clamp to
+         * the amount of decoded data we have */
+        size_t rem = std::min<size_t>(length-dec, mFrameSize-mFramePos);
 
-            /* Copy the data to the app's buffer and increment */
-            if(data != NULL)
-            {
-                memcpy(data, mDecodedData, rem);
-                data = (char*)data + rem;
-            }
-            dec += rem;
-
-            /* If there's any decoded data left, move it to the front of the
-             * buffer for next time */
-            if(rem < mDecodedDataSize)
-                memmove(mDecodedData, &mDecodedData[rem], mDecodedDataSize - rem);
-            mDecodedDataSize -= rem;
-        }
+        /* Copy the data to the app's buffer and increment */
+        memcpy(data, mFrame->data[0]+mFramePos, rem);
+        data = (char*)data + rem;
+        dec += rem;
+        mFramePos += rem;
     }
 
     /* Return the number of bytes we were able to get */
@@ -239,7 +135,6 @@ size_t FFmpeg_Decoder::MyStream::readAVAudioData(void *data, size_t length)
 }
 
 
-
 void FFmpeg_Decoder::open(const std::string &fname)
 {
     close();
@@ -265,135 +160,155 @@ void FFmpeg_Decoder::open(const std::string &fname)
         {
             if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
             {
-                std::auto_ptr<MyStream> stream(new MyStream);
-                stream->mCodecCtx = mFormatCtx->streams[j]->codec;
-                stream->mStreamIdx = j;
-                stream->mPackets = NULL;
-
-                AVCodec *codec = avcodec_find_decoder(stream->mCodecCtx->codec_id);
-                if(!codec)
-                {
-                    std::stringstream ss("No codec found for id ");
-                    ss << stream->mCodecCtx->codec_id;
-                    fail(ss.str());
-                }
-                if(avcodec_open(stream->mCodecCtx, codec) < 0)
-                    fail("Failed to open audio codec " + std::string(codec->long_name));
-
-                stream->mDecodedData = (char*)av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
-                stream->mDecodedDataSize = 0;
-
-                stream->mParent = this;
-                mStreams.push_back(stream.release());
+                mStream = &mFormatCtx->streams[j];
                 break;
             }
         }
-        if(mStreams.empty())
+        if(!mStream)
             fail("No audio streams in "+fname);
+
+        AVCodec *codec = avcodec_find_decoder((*mStream)->codec->codec_id);
+        if(!codec)
+        {
+            std::stringstream ss("No codec found for id ");
+            ss << (*mStream)->codec->codec_id;
+            fail(ss.str());
+        }
+        if(avcodec_open2((*mStream)->codec, codec, NULL) < 0)
+            fail("Failed to open audio codec " + std::string(codec->long_name));
+
+        mFrame = avcodec_alloc_frame();
     }
     catch(std::exception &e)
     {
-        av_close_input_file(mFormatCtx);
-        mFormatCtx = NULL;
+        avformat_close_input(&mFormatCtx);
         throw;
     }
 }
 
 void FFmpeg_Decoder::close()
 {
-    while(!mStreams.empty())
-    {
-        MyStream *stream = mStreams.front();
+    if(mStream)
+        avcodec_close((*mStream)->codec);
+    mStream = NULL;
 
-        stream->clearPackets();
-        avcodec_close(stream->mCodecCtx);
-        av_free(stream->mDecodedData);
-        delete stream;
+    av_free_packet(&mPacket);
+    av_freep(&mFrame);
 
-        mStreams.erase(mStreams.begin());
-    }
     if(mFormatCtx)
-        av_close_input_file(mFormatCtx);
-    mFormatCtx = NULL;
+    {
+        AVIOContext* context = mFormatCtx->pb;
+        avformat_close_input(&mFormatCtx);
+        av_free(context);
+    }
 
     mDataStream.setNull();
 }
 
+std::string FFmpeg_Decoder::getName()
+{
+    return mFormatCtx->filename;
+}
+
 void FFmpeg_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
 {
-    if(mStreams.empty())
+    if(!mStream)
         fail("No audio stream info");
 
-    MyStream *stream = mStreams[0];
-    if(stream->mCodecCtx->sample_fmt == AV_SAMPLE_FMT_U8)
+    if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_U8)
         *type = SampleType_UInt8;
-    else if(stream->mCodecCtx->sample_fmt == AV_SAMPLE_FMT_S16)
+    else if((*mStream)->codec->sample_fmt == AV_SAMPLE_FMT_S16)
         *type = SampleType_Int16;
     else
         fail(std::string("Unsupported sample format: ")+
-             av_get_sample_fmt_name(stream->mCodecCtx->sample_fmt));
+             av_get_sample_fmt_name((*mStream)->codec->sample_fmt));
 
-    if(stream->mCodecCtx->channel_layout == AV_CH_LAYOUT_MONO)
+    if((*mStream)->codec->channel_layout == AV_CH_LAYOUT_MONO)
         *chans = ChannelConfig_Mono;
-    else if(stream->mCodecCtx->channel_layout == AV_CH_LAYOUT_STEREO)
+    else if((*mStream)->codec->channel_layout == AV_CH_LAYOUT_STEREO)
         *chans = ChannelConfig_Stereo;
-    else if(stream->mCodecCtx->channel_layout == 0)
+    else if((*mStream)->codec->channel_layout == AV_CH_LAYOUT_QUAD)
+        *chans = ChannelConfig_Quad;
+    else if((*mStream)->codec->channel_layout == AV_CH_LAYOUT_5POINT1)
+        *chans = ChannelConfig_5point1;
+    else if((*mStream)->codec->channel_layout == AV_CH_LAYOUT_7POINT1)
+        *chans = ChannelConfig_7point1;
+    else if((*mStream)->codec->channel_layout == 0)
     {
         /* Unknown channel layout. Try to guess. */
-        if(stream->mCodecCtx->channels == 1)
+        if((*mStream)->codec->channels == 1)
             *chans = ChannelConfig_Mono;
-        else if(stream->mCodecCtx->channels == 2)
+        else if((*mStream)->codec->channels == 2)
             *chans = ChannelConfig_Stereo;
         else
         {
             std::stringstream sstr("Unsupported raw channel count: ");
-            sstr << stream->mCodecCtx->channels;
+            sstr << (*mStream)->codec->channels;
             fail(sstr.str());
         }
     }
     else
     {
         char str[1024];
-        av_get_channel_layout_string(str, sizeof(str), stream->mCodecCtx->channels,
-                                     stream->mCodecCtx->channel_layout);
+        av_get_channel_layout_string(str, sizeof(str), (*mStream)->codec->channels,
+                                     (*mStream)->codec->channel_layout);
         fail(std::string("Unsupported channel layout: ")+str);
     }
 
-    *samplerate = stream->mCodecCtx->sample_rate;
+    *samplerate = (*mStream)->codec->sample_rate;
 }
 
 size_t FFmpeg_Decoder::read(char *buffer, size_t bytes)
 {
-    if(mStreams.empty())
-        fail("No audio streams");
-
-    return mStreams.front()->readAVAudioData(buffer, bytes);
+    if(!mStream)
+        fail("No audio stream");
+    return readAVAudioData(buffer, bytes);
 }
 
 void FFmpeg_Decoder::readAll(std::vector<char> &output)
 {
-    if(mStreams.empty())
-        fail("No audio streams");
-    MyStream *stream = mStreams.front();
-    char *inbuf;
-    size_t got;
+    if(!mStream)
+        fail("No audio stream");
 
-    while((inbuf=(char*)stream->getAVAudioData(&got)) != NULL && got > 0)
+    while(getAVAudioData())
+    {
+        size_t got = mFrame->nb_samples * (*mStream)->codec->channels *
+                     av_get_bytes_per_sample((*mStream)->codec->sample_fmt);
+        const char *inbuf = reinterpret_cast<char*>(mFrame->data[0]);
         output.insert(output.end(), inbuf, inbuf+got);
+    }
 }
 
 void FFmpeg_Decoder::rewind()
 {
-    av_seek_frame(mFormatCtx, -1, 0, 0);
-    std::for_each(mStreams.begin(), mStreams.end(), std::mem_fun(&MyStream::clearPackets));
+    int stream_idx = mStream - mFormatCtx->streams;
+    if(av_seek_frame(mFormatCtx, stream_idx, 0, 0) < 0)
+        fail("Failed to seek in audio stream");
+    av_free_packet(&mPacket);
+    mFrameSize = mFramePos = 0;
+    mNextPts = 0.0;
 }
 
-FFmpeg_Decoder::FFmpeg_Decoder() : mFormatCtx(NULL)
+size_t FFmpeg_Decoder::getSampleOffset()
 {
-    static bool done_init = false;
+    int delay = (mFrameSize-mFramePos) / (*mStream)->codec->channels /
+                av_get_bytes_per_sample((*mStream)->codec->sample_fmt);
+    return (int)(mNextPts*(*mStream)->codec->sample_rate) - delay;
+}
+
+FFmpeg_Decoder::FFmpeg_Decoder()
+  : mFormatCtx(NULL)
+  , mStream(NULL)
+  , mFrame(NULL)
+  , mFrameSize(0)
+  , mFramePos(0)
+  , mNextPts(0.0)
+{
+    memset(&mPacket, 0, sizeof(mPacket));
 
     /* We need to make sure ffmpeg is initialized. Optionally silence warning
      * output from the lib */
+    static bool done_init = false;
     if(!done_init)
     {
         av_register_all();
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 7b028e1d0..32b2797ed 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -10,8 +10,8 @@
 #include <stdint.h>
 extern "C"
 {
-#include <avcodec.h>
-#include <avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 }
 
 #include "sound_decoder.hpp"
@@ -22,25 +22,36 @@ namespace MWSound
     class FFmpeg_Decoder : public Sound_Decoder
     {
         AVFormatContext *mFormatCtx;
+        AVStream **mStream;
 
-        struct MyStream;
-        std::vector<MyStream*> mStreams;
+        AVPacket mPacket;
+        AVFrame *mFrame;
 
-        bool getNextPacket(int streamidx);
+        int mFrameSize;
+        int mFramePos;
+
+        double mNextPts;
+
+        bool getNextPacket();
 
         Ogre::DataStreamPtr mDataStream;
         static int readPacket(void *user_data, uint8_t *buf, int buf_size);
         static int writePacket(void *user_data, uint8_t *buf, int buf_size);
         static int64_t seek(void *user_data, int64_t offset, int whence);
 
+        bool getAVAudioData();
+        size_t readAVAudioData(void *data, size_t length);
+
         virtual void open(const std::string &fname);
         virtual void close();
 
+        virtual std::string getName();
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
 
         virtual size_t read(char *buffer, size_t bytes);
         virtual void readAll(std::vector<char> &output);
         virtual void rewind();
+        virtual size_t getSampleOffset();
 
         FFmpeg_Decoder& operator=(const FFmpeg_Decoder &rhs);
         FFmpeg_Decoder(const FFmpeg_Decoder &rhs);
diff --git a/apps/openmw/mwsound/mpgsnd_decoder.cpp b/apps/openmw/mwsound/mpgsnd_decoder.cpp
index 7f7a84889..fb187f844 100644
--- a/apps/openmw/mwsound/mpgsnd_decoder.cpp
+++ b/apps/openmw/mwsound/mpgsnd_decoder.cpp
@@ -155,6 +155,11 @@ void MpgSnd_Decoder::close()
     mDataStream.setNull();
 }
 
+std::string MpgSnd_Decoder::getName()
+{
+    return mDataStream->getName();
+}
+
 void MpgSnd_Decoder::getInfo(int *samplerate, ChannelConfig *chans, SampleType *type)
 {
     if(!mSndFile && !mMpgFile)
@@ -213,6 +218,11 @@ void MpgSnd_Decoder::rewind()
     }
 }
 
+size_t MpgSnd_Decoder::getSampleOffset()
+{
+    return 0;
+}
+
 MpgSnd_Decoder::MpgSnd_Decoder()
     : mSndInfo()
     , mSndFile(NULL)
diff --git a/apps/openmw/mwsound/mpgsnd_decoder.hpp b/apps/openmw/mwsound/mpgsnd_decoder.hpp
index 09082c2f4..be52f6f49 100644
--- a/apps/openmw/mwsound/mpgsnd_decoder.hpp
+++ b/apps/openmw/mwsound/mpgsnd_decoder.hpp
@@ -34,11 +34,13 @@ namespace MWSound
         virtual void open(const std::string &fname);
         virtual void close();
 
+        virtual std::string getName();
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type);
 
         virtual size_t read(char *buffer, size_t bytes);
         virtual void readAll(std::vector<char> &output);
         virtual void rewind();
+        virtual size_t getSampleOffset();
 
         MpgSnd_Decoder& operator=(const MpgSnd_Decoder &rhs);
         MpgSnd_Decoder(const MpgSnd_Decoder &rhs);
diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index e5169d878..67008e2bc 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -61,10 +61,50 @@ static ALenum getALFormat(ChannelConfig chans, SampleType type)
         if(fmtlist[i].chans == chans && fmtlist[i].type == type)
             return fmtlist[i].format;
     }
+
+    if(alIsExtensionPresent("AL_EXT_MCFORMATS"))
+    {
+        static const struct {
+            char name[32];
+            ChannelConfig chans;
+            SampleType type;
+        } mcfmtlist[] = {
+            { "AL_FORMAT_QUAD16",   ChannelConfig_Quad,    SampleType_Int16 },
+            { "AL_FORMAT_QUAD8",    ChannelConfig_Quad,    SampleType_UInt8 },
+            { "AL_FORMAT_51CHN16",  ChannelConfig_5point1, SampleType_Int16 },
+            { "AL_FORMAT_51CHN8",   ChannelConfig_5point1, SampleType_UInt8 },
+            { "AL_FORMAT_71CHN16",  ChannelConfig_7point1, SampleType_Int16 },
+            { "AL_FORMAT_71CHN8",   ChannelConfig_7point1, SampleType_UInt8 },
+        };
+        static const size_t mcfmtlistsize = sizeof(mcfmtlist)/sizeof(mcfmtlist[0]);
+
+        for(size_t i = 0;i < mcfmtlistsize;i++)
+        {
+            if(mcfmtlist[i].chans == chans && mcfmtlist[i].type == type)
+            {
+                ALenum format = alGetEnumValue(mcfmtlist[i].name);
+                if(format != 0 && format != -1)
+                    return format;
+            }
+        }
+    }
+
     fail(std::string("Unsupported sound format (")+getChannelConfigName(chans)+", "+getSampleTypeName(type)+")");
     return AL_NONE;
 }
 
+static ALint getBufferSampleCount(ALuint buf)
+{
+    ALint size, bits, channels;
+
+    alGetBufferi(buf, AL_SIZE, &size);
+    alGetBufferi(buf, AL_BITS, &bits);
+    alGetBufferi(buf, AL_CHANNELS, &channels);
+    throwALerror();
+
+    return size / channels * 8 / bits;
+}
+
 //
 // A streaming OpenAL sound.
 //
@@ -82,19 +122,26 @@ class OpenAL_SoundStream : public Sound
     ALsizei mSampleRate;
     ALuint mBufferSize;
 
+    ALuint mSamplesQueued;
+
     DecoderPtr mDecoder;
 
     volatile bool mIsFinished;
 
+    void updateAll(bool local);
+
     OpenAL_SoundStream(const OpenAL_SoundStream &rhs);
     OpenAL_SoundStream& operator=(const OpenAL_SoundStream &rhs);
 
+    friend class OpenAL_Output;
+
 public:
-    OpenAL_SoundStream(OpenAL_Output &output, ALuint src, DecoderPtr decoder);
+    OpenAL_SoundStream(OpenAL_Output &output, ALuint src, DecoderPtr decoder, float basevol, float pitch, int flags);
     virtual ~OpenAL_SoundStream();
 
     virtual void stop();
     virtual bool isPlaying();
+    virtual double getTimeOffset();
     virtual void update();
 
     void play();
@@ -109,7 +156,7 @@ const ALfloat OpenAL_SoundStream::sBufferLength = 0.125f;
 struct OpenAL_Output::StreamThread {
     typedef std::vector<OpenAL_SoundStream*> StreamVec;
     StreamVec mStreams;
-    boost::mutex mMutex;
+    boost::recursive_mutex mMutex;
     boost::thread mThread;
 
     StreamThread()
@@ -170,8 +217,9 @@ private:
 };
 
 
-OpenAL_SoundStream::OpenAL_SoundStream(OpenAL_Output &output, ALuint src, DecoderPtr decoder)
-  : mOutput(output), mSource(src), mDecoder(decoder), mIsFinished(true)
+OpenAL_SoundStream::OpenAL_SoundStream(OpenAL_Output &output, ALuint src, DecoderPtr decoder, float basevol, float pitch, int flags)
+  : Sound(Ogre::Vector3(0.0f), 1.0f, basevol, pitch, 1.0f, 1000.0f, flags)
+  , mOutput(output), mSource(src), mSamplesQueued(0), mDecoder(decoder), mIsFinished(true)
 {
     throwALerror();
 
@@ -189,6 +237,8 @@ OpenAL_SoundStream::OpenAL_SoundStream(OpenAL_Output &output, ALuint src, Decode
 
         mBufferSize = static_cast<ALuint>(sBufferLength*srate);
         mBufferSize = framesToBytes(mBufferSize, chans, type);
+
+        mOutput.mActiveSounds.push_back(this);
     }
     catch(std::exception &e)
     {
@@ -209,22 +259,20 @@ OpenAL_SoundStream::~OpenAL_SoundStream()
     alGetError();
 
     mDecoder->close();
+
+    mOutput.mActiveSounds.erase(std::find(mOutput.mActiveSounds.begin(),
+                                          mOutput.mActiveSounds.end(), this));
 }
 
 void OpenAL_SoundStream::play()
 {
-    std::vector<char> data(mBufferSize);
-
     alSourceStop(mSource);
     alSourcei(mSource, AL_BUFFER, 0);
     throwALerror();
+    mSamplesQueued = 0;
 
     for(ALuint i = 0;i < sNumBuffers;i++)
-    {
-        size_t got;
-        got = mDecoder->read(&data[0], data.size());
-        alBufferData(mBuffers[i], mFormat, &data[0], got, mSampleRate);
-    }
+        alBufferData(mBuffers[i], mFormat, this, 0, mSampleRate);
     throwALerror();
 
     alSourceQueueBuffers(mSource, sNumBuffers, mBuffers);
@@ -243,6 +291,7 @@ void OpenAL_SoundStream::stop()
     alSourceStop(mSource);
     alSourcei(mSource, AL_BUFFER, 0);
     throwALerror();
+    mSamplesQueued = 0;
 
     mDecoder->rewind();
 }
@@ -254,11 +303,49 @@ bool OpenAL_SoundStream::isPlaying()
     alGetSourcei(mSource, AL_SOURCE_STATE, &state);
     throwALerror();
 
-    if(state == AL_PLAYING)
+    if(state == AL_PLAYING || state == AL_PAUSED)
         return true;
     return !mIsFinished;
 }
 
+double OpenAL_SoundStream::getTimeOffset()
+{
+    ALint state = AL_STOPPED;
+    ALfloat offset = 0.0f;
+    double t;
+
+    mOutput.mStreamThread->mMutex.lock();
+    alGetSourcef(mSource, AL_SEC_OFFSET, &offset);
+    alGetSourcei(mSource, AL_SOURCE_STATE, &state);
+    if(state == AL_PLAYING || state == AL_PAUSED)
+        t = (double)(mDecoder->getSampleOffset() - mSamplesQueued)/(double)mSampleRate + offset;
+    else
+        t = (double)mDecoder->getSampleOffset() / (double)mSampleRate;
+    mOutput.mStreamThread->mMutex.unlock();
+
+    throwALerror();
+    return t;
+}
+
+void OpenAL_SoundStream::updateAll(bool local)
+{
+    alSourcef(mSource, AL_REFERENCE_DISTANCE, mMinDistance);
+    alSourcef(mSource, AL_MAX_DISTANCE, mMaxDistance);
+    if(local)
+    {
+        alSourcef(mSource, AL_ROLLOFF_FACTOR, 0.0f);
+        alSourcei(mSource, AL_SOURCE_RELATIVE, AL_TRUE);
+    }
+    else
+    {
+        alSourcef(mSource, AL_ROLLOFF_FACTOR, 1.0f);
+        alSourcei(mSource, AL_SOURCE_RELATIVE, AL_FALSE);
+    }
+    alSourcei(mSource, AL_LOOPING, AL_FALSE);
+
+    update();
+}
+
 void OpenAL_SoundStream::update()
 {
     ALfloat gain = mVolume*mBaseVolume;
@@ -279,52 +366,58 @@ void OpenAL_SoundStream::update()
 
 bool OpenAL_SoundStream::process()
 {
-    bool finished = mIsFinished;
-    ALint processed, state;
+    try {
+        bool finished = mIsFinished;
+        ALint processed, state;
 
-    alGetSourcei(mSource, AL_SOURCE_STATE, &state);
-    alGetSourcei(mSource, AL_BUFFERS_PROCESSED, &processed);
-    throwALerror();
-
-    if(processed > 0)
-    {
-        std::vector<char> data(mBufferSize);
-        do {
-            ALuint bufid;
-            size_t got;
-
-            alSourceUnqueueBuffers(mSource, 1, &bufid);
-            processed--;
-
-            if(finished)
-                continue;
-
-            got = mDecoder->read(&data[0], data.size());
-            finished = (got < data.size());
-            if(got > 0)
-            {
-                alBufferData(bufid, mFormat, &data[0], got, mSampleRate);
-                alSourceQueueBuffers(mSource, 1, &bufid);
-            }
-        } while(processed > 0);
+        alGetSourcei(mSource, AL_SOURCE_STATE, &state);
+        alGetSourcei(mSource, AL_BUFFERS_PROCESSED, &processed);
         throwALerror();
-    }
 
-    if(state != AL_PLAYING && state != AL_PAUSED)
-    {
-        ALint queued;
-
-        alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
-        throwALerror();
-        if(queued > 0)
+        if(processed > 0)
         {
-            alSourcePlay(mSource);
+            std::vector<char> data(mBufferSize);
+            do {
+                ALuint bufid = 0;
+                size_t got;
+
+                alSourceUnqueueBuffers(mSource, 1, &bufid);
+                mSamplesQueued -= getBufferSampleCount(bufid);
+                processed--;
+
+                if(finished)
+                    continue;
+
+                got = mDecoder->read(&data[0], data.size());
+                finished = (got < data.size());
+                if(got > 0)
+                {
+                    alBufferData(bufid, mFormat, &data[0], got, mSampleRate);
+                    alSourceQueueBuffers(mSource, 1, &bufid);
+                    mSamplesQueued += getBufferSampleCount(bufid);
+                }
+            } while(processed > 0);
             throwALerror();
         }
-    }
 
-    mIsFinished = finished;
-    return !finished;
+        if(state != AL_PLAYING && state != AL_PAUSED)
+        {
+            ALint queued = 0;
+
+            alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
+            if(queued > 0)
+                alSourcePlay(mSource);
+            throwALerror();
+        }
+
+        mIsFinished = finished;
+    }
+    catch(std::exception &e) {
+        std::cout<< "Error updating stream \""<<mDecoder->getName()<<"\"" <<std::endl;
+        mSamplesQueued = 0;
+        mIsFinished = true;
+    }
+    return !mIsFinished;
 }
 
 //
@@ -338,16 +431,21 @@ protected:
     ALuint mSource;
     ALuint mBuffer;
 
+    friend class OpenAL_Output;
+
+    void updateAll(bool local);
+
 private:
     OpenAL_Sound(const OpenAL_Sound &rhs);
     OpenAL_Sound& operator=(const OpenAL_Sound &rhs);
 
 public:
-    OpenAL_Sound(OpenAL_Output &output, ALuint src, ALuint buf);
+    OpenAL_Sound(OpenAL_Output &output, ALuint src, ALuint buf, const Ogre::Vector3& pos, float vol, float basevol, float pitch, float mindist, float maxdist, int flags);
     virtual ~OpenAL_Sound();
 
     virtual void stop();
     virtual bool isPlaying();
+    virtual double getTimeOffset();
     virtual void update();
 };
 
@@ -360,16 +458,18 @@ class OpenAL_Sound3D : public OpenAL_Sound
     OpenAL_Sound3D& operator=(const OpenAL_Sound &rhs);
 
 public:
-    OpenAL_Sound3D(OpenAL_Output &output, ALuint src, ALuint buf)
-      : OpenAL_Sound(output, src, buf)
+    OpenAL_Sound3D(OpenAL_Output &output, ALuint src, ALuint buf, const Ogre::Vector3& pos, float vol, float basevol, float pitch, float mindist, float maxdist, int flags)
+      : OpenAL_Sound(output, src, buf, pos, vol, basevol, pitch, mindist, maxdist, flags)
     { }
 
     virtual void update();
 };
 
-OpenAL_Sound::OpenAL_Sound(OpenAL_Output &output, ALuint src, ALuint buf)
-  : mOutput(output), mSource(src), mBuffer(buf)
+OpenAL_Sound::OpenAL_Sound(OpenAL_Output &output, ALuint src, ALuint buf, const Ogre::Vector3& pos, float vol, float basevol, float pitch, float mindist, float maxdist, int flags)
+  : Sound(pos, vol, basevol, pitch, mindist, maxdist, flags)
+  , mOutput(output), mSource(src), mBuffer(buf)
 {
+    mOutput.mActiveSounds.push_back(this);
 }
 OpenAL_Sound::~OpenAL_Sound()
 {
@@ -378,6 +478,9 @@ OpenAL_Sound::~OpenAL_Sound()
 
     mOutput.mFreeSources.push_back(mSource);
     mOutput.bufferFinished(mBuffer);
+
+    mOutput.mActiveSounds.erase(std::find(mOutput.mActiveSounds.begin(),
+                                          mOutput.mActiveSounds.end(), this));
 }
 
 void OpenAL_Sound::stop()
@@ -393,13 +496,43 @@ bool OpenAL_Sound::isPlaying()
     alGetSourcei(mSource, AL_SOURCE_STATE, &state);
     throwALerror();
 
-    return state==AL_PLAYING;
+    return state==AL_PLAYING || state==AL_PAUSED;
+}
+
+double OpenAL_Sound::getTimeOffset()
+{
+    ALfloat t;
+
+    alGetSourcef(mSource, AL_SEC_OFFSET, &t);
+    throwALerror();
+
+    return t;
+}
+
+void OpenAL_Sound::updateAll(bool local)
+{
+    alSourcef(mSource, AL_REFERENCE_DISTANCE, mMinDistance);
+    alSourcef(mSource, AL_MAX_DISTANCE, mMaxDistance);
+    if(local)
+    {
+        alSourcef(mSource, AL_ROLLOFF_FACTOR, 0.0f);
+        alSourcei(mSource, AL_SOURCE_RELATIVE, AL_TRUE);
+    }
+    else
+    {
+        alSourcef(mSource, AL_ROLLOFF_FACTOR, 1.0f);
+        alSourcei(mSource, AL_SOURCE_RELATIVE, AL_FALSE);
+    }
+    alSourcei(mSource, AL_LOOPING, (mFlags&MWBase::SoundManager::Play_Loop) ? AL_TRUE : AL_FALSE);
+
+    update();
 }
 
 void OpenAL_Sound::update()
 {
     ALfloat gain = mVolume*mBaseVolume;
     ALfloat pitch = mPitch;
+
     if(!(mFlags&MWBase::SoundManager::Play_NoEnv) && mOutput.mLastEnvironment == Env_Underwater)
     {
         gain *= 0.9f;
@@ -521,11 +654,9 @@ void OpenAL_Output::deinit()
 {
     mStreamThread->removeAll();
 
-    while(!mFreeSources.empty())
-    {
-        alDeleteSources(1, &mFreeSources.front());
-        mFreeSources.pop_front();
-    }
+    for(size_t i = 0;i < mFreeSources.size();i++)
+        alDeleteSources(1, &mFreeSources[i]);
+    mFreeSources.clear();
 
     mBufferRefs.clear();
     mUnusedBuffers.clear();
@@ -642,7 +773,7 @@ void OpenAL_Output::bufferFinished(ALuint buf)
 }
 
 
-MWBase::SoundPtr OpenAL_Output::playSound(const std::string &fname, float volume, float pitch, int flags)
+MWBase::SoundPtr OpenAL_Output::playSound(const std::string &fname, float vol, float basevol, float pitch, int flags)
 {
     boost::shared_ptr<OpenAL_Sound> sound;
     ALuint src=0, buf=0;
@@ -655,7 +786,7 @@ MWBase::SoundPtr OpenAL_Output::playSound(const std::string &fname, float volume
     try
     {
         buf = getBuffer(fname);
-        sound.reset(new OpenAL_Sound(*this, src, buf));
+        sound.reset(new OpenAL_Sound(*this, src, buf, Ogre::Vector3(0.0f), vol, basevol, pitch, 1.0f, 1000.0f, flags));
     }
     catch(std::exception &e)
     {
@@ -666,25 +797,7 @@ MWBase::SoundPtr OpenAL_Output::playSound(const std::string &fname, float volume
         throw;
     }
 
-    alSource3f(src, AL_POSITION, 0.0f, 0.0f, 0.0f);
-    alSource3f(src, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
-    alSource3f(src, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-
-    alSourcef(src, AL_REFERENCE_DISTANCE, 1.0f);
-    alSourcef(src, AL_MAX_DISTANCE, 1000.0f);
-    alSourcef(src, AL_ROLLOFF_FACTOR, 0.0f);
-
-    if(!(flags&MWBase::SoundManager::Play_NoEnv) && mLastEnvironment == Env_Underwater)
-    {
-        volume *= 0.9f;
-        pitch *= 0.7f;
-    }
-    alSourcef(src, AL_GAIN, volume);
-    alSourcef(src, AL_PITCH, pitch);
-
-    alSourcei(src, AL_SOURCE_RELATIVE, AL_TRUE);
-    alSourcei(src, AL_LOOPING, (flags&MWBase::SoundManager::Play_Loop) ? AL_TRUE : AL_FALSE);
-    throwALerror();
+    sound->updateAll(true);
 
     alSourcei(src, AL_BUFFER, buf);
     alSourcePlay(src);
@@ -693,8 +806,8 @@ MWBase::SoundPtr OpenAL_Output::playSound(const std::string &fname, float volume
     return sound;
 }
 
-MWBase::SoundPtr OpenAL_Output::playSound3D(const std::string &fname, const Ogre::Vector3 &pos, float volume, float pitch,
-                                    float min, float max, int flags)
+MWBase::SoundPtr OpenAL_Output::playSound3D(const std::string &fname, const Ogre::Vector3 &pos, float vol, float basevol, float pitch,
+                                            float min, float max, int flags)
 {
     boost::shared_ptr<OpenAL_Sound> sound;
     ALuint src=0, buf=0;
@@ -707,7 +820,7 @@ MWBase::SoundPtr OpenAL_Output::playSound3D(const std::string &fname, const Ogre
     try
     {
         buf = getBuffer(fname);
-        sound.reset(new OpenAL_Sound3D(*this, src, buf));
+        sound.reset(new OpenAL_Sound3D(*this, src, buf, pos, vol, basevol, pitch, min, max, flags));
     }
     catch(std::exception &e)
     {
@@ -718,26 +831,7 @@ MWBase::SoundPtr OpenAL_Output::playSound3D(const std::string &fname, const Ogre
         throw;
     }
 
-    alSource3f(src, AL_POSITION, pos.x, pos.z, -pos.y);
-    alSource3f(src, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
-    alSource3f(src, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-
-    alSourcef(src, AL_REFERENCE_DISTANCE, min);
-    alSourcef(src, AL_MAX_DISTANCE, max);
-    alSourcef(src, AL_ROLLOFF_FACTOR, 1.0f);
-
-    if(!(flags&MWBase::SoundManager::Play_NoEnv) && mLastEnvironment == Env_Underwater)
-    {
-        volume *= 0.9f;
-        pitch *= 0.7f;
-    }
-    alSourcef(src, AL_GAIN, (pos.squaredDistance(mPos) > max*max) ?
-                             0.0f : volume);
-    alSourcef(src, AL_PITCH, pitch);
-
-    alSourcei(src, AL_SOURCE_RELATIVE, AL_FALSE);
-    alSourcei(src, AL_LOOPING, (flags&MWBase::SoundManager::Play_Loop) ? AL_TRUE : AL_FALSE);
-    throwALerror();
+    sound->updateAll(false);
 
     alSourcei(src, AL_BUFFER, buf);
     alSourcePlay(src);
@@ -747,7 +841,7 @@ MWBase::SoundPtr OpenAL_Output::playSound3D(const std::string &fname, const Ogre
 }
 
 
-MWBase::SoundPtr OpenAL_Output::streamSound(const std::string &fname, float volume, float pitch, int flags)
+MWBase::SoundPtr OpenAL_Output::streamSound(DecoderPtr decoder, float volume, float pitch, int flags)
 {
     boost::shared_ptr<OpenAL_SoundStream> sound;
     ALuint src;
@@ -757,13 +851,11 @@ MWBase::SoundPtr OpenAL_Output::streamSound(const std::string &fname, float volu
     src = mFreeSources.front();
     mFreeSources.pop_front();
 
+    if((flags&MWBase::SoundManager::Play_Loop))
+        std::cout <<"Warning: cannot loop stream \""<<decoder->getName()<<"\""<< std::endl;
     try
     {
-        if((flags&MWBase::SoundManager::Play_Loop))
-            std::cout <<"Warning: cannot loop stream "<<fname<< std::endl;
-        DecoderPtr decoder = mManager.getDecoder();
-        decoder->open(fname);
-        sound.reset(new OpenAL_SoundStream(*this, src, decoder));
+        sound.reset(new OpenAL_SoundStream(*this, src, decoder, volume, pitch, flags));
     }
     catch(std::exception &e)
     {
@@ -771,25 +863,7 @@ MWBase::SoundPtr OpenAL_Output::streamSound(const std::string &fname, float volu
         throw;
     }
 
-    alSource3f(src, AL_POSITION, 0.0f, 0.0f, 0.0f);
-    alSource3f(src, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
-    alSource3f(src, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
-
-    alSourcef(src, AL_REFERENCE_DISTANCE, 1.0f);
-    alSourcef(src, AL_MAX_DISTANCE, 1000.0f);
-    alSourcef(src, AL_ROLLOFF_FACTOR, 0.0f);
-
-    if(!(flags&MWBase::SoundManager::Play_NoEnv) && mLastEnvironment == Env_Underwater)
-    {
-        volume *= 0.9f;
-        pitch *= 0.7f;
-    }
-    alSourcef(src, AL_GAIN, volume);
-    alSourcef(src, AL_PITCH, pitch);
-
-    alSourcei(src, AL_SOURCE_RELATIVE, AL_TRUE);
-    alSourcei(src, AL_LOOPING, AL_FALSE);
-    throwALerror();
+    sound->updateAll(true);
 
     sound->play();
     return sound;
@@ -814,6 +888,61 @@ void OpenAL_Output::updateListener(const Ogre::Vector3 &pos, const Ogre::Vector3
 }
 
 
+void OpenAL_Output::pauseSounds(int types)
+{
+    std::vector<ALuint> sources;
+    SoundVec::const_iterator iter = mActiveSounds.begin();
+    while(iter != mActiveSounds.end())
+    {
+        const OpenAL_SoundStream *stream = dynamic_cast<OpenAL_SoundStream*>(*iter);
+        if(stream)
+        {
+            if(stream->mSource && (stream->getPlayType()&types))
+                sources.push_back(stream->mSource);
+        }
+        else
+        {
+            const OpenAL_Sound *sound = dynamic_cast<OpenAL_Sound*>(*iter);
+            if(sound && sound->mSource && (sound->getPlayType()&types))
+                sources.push_back(sound->mSource);
+        }
+        iter++;
+    }
+    if(sources.size() > 0)
+    {
+        alSourcePausev(sources.size(), &sources[0]);
+        throwALerror();
+    }
+}
+
+void OpenAL_Output::resumeSounds(int types)
+{
+    std::vector<ALuint> sources;
+    SoundVec::const_iterator iter = mActiveSounds.begin();
+    while(iter != mActiveSounds.end())
+    {
+        const OpenAL_SoundStream *stream = dynamic_cast<OpenAL_SoundStream*>(*iter);
+        if(stream)
+        {
+            if(stream->mSource && (stream->getPlayType()&types))
+                sources.push_back(stream->mSource);
+        }
+        else
+        {
+            const OpenAL_Sound *sound = dynamic_cast<OpenAL_Sound*>(*iter);
+            if(sound && sound->mSource && (sound->getPlayType()&types))
+                sources.push_back(sound->mSource);
+        }
+        iter++;
+    }
+    if(sources.size() > 0)
+    {
+        alSourcePlayv(sources.size(), &sources[0]);
+        throwALerror();
+    }
+}
+
+
 OpenAL_Output::OpenAL_Output(SoundManager &mgr)
   : Sound_Output(mgr), mDevice(0), mContext(0), mBufferCacheMemSize(0),
     mLastEnvironment(Env_Normal), mStreamThread(new StreamThread)
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index fecffa575..02706b50c 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -33,6 +33,9 @@ namespace MWSound
 
         uint64_t mBufferCacheMemSize;
 
+        typedef std::vector<Sound*> SoundVec;
+        SoundVec mActiveSounds;
+
         ALuint getBuffer(const std::string &fname);
         void bufferFinished(ALuint buffer);
 
@@ -42,13 +45,16 @@ namespace MWSound
         virtual void init(const std::string &devname="");
         virtual void deinit();
 
-        virtual MWBase::SoundPtr playSound(const std::string &fname, float volume, float pitch, int flags);
+        virtual MWBase::SoundPtr playSound(const std::string &fname, float vol, float basevol, float pitch, int flags);
         virtual MWBase::SoundPtr playSound3D(const std::string &fname, const Ogre::Vector3 &pos,
-                                     float volume, float pitch, float min, float max, int flags);
-        virtual MWBase::SoundPtr streamSound(const std::string &fname, float volume, float pitch, int flags);
+                                             float vol, float basevol, float pitch, float min, float max, int flags);
+        virtual MWBase::SoundPtr streamSound(DecoderPtr decoder, float volume, float pitch, int flags);
 
         virtual void updateListener(const Ogre::Vector3 &pos, const Ogre::Vector3 &atdir, const Ogre::Vector3 &updir, Environment env);
 
+        virtual void pauseSounds(int types);
+        virtual void resumeSounds(int types);
+
         OpenAL_Output& operator=(const OpenAL_Output &rhs);
         OpenAL_Output(const OpenAL_Output &rhs);
 
@@ -64,7 +70,7 @@ namespace MWSound
         friend class SoundManager;
     };
 #ifndef DEFAULT_OUTPUT
-#define DEFAULT_OUTPUT (::MWSound::OpenAL_Output)
+#define DEFAULT_OUTPUT(x) ::MWSound::OpenAL_Output((x))
 #endif
 }
 
diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index 729147f75..8deaf26a6 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -26,16 +26,22 @@ namespace MWSound
     public:
         virtual void stop() = 0;
         virtual bool isPlaying() = 0;
+        virtual double getTimeOffset() = 0;
         void setPosition(const Ogre::Vector3 &pos) { mPos = pos; }
         void setVolume(float volume) { mVolume = volume; }
 
-        Sound() : mPos(0.0f, 0.0f, 0.0f)
-                , mVolume(1.0f)
-                , mBaseVolume(1.0f)
-                , mPitch(1.0f)
-                , mMinDistance(20.0f) /* 1 * min_range_scale */
-                , mMaxDistance(12750.0f) /* 255 * max_range_scale */
-                , mFlags(MWBase::SoundManager::Play_Normal)
+        MWBase::SoundManager::PlayType getPlayType() const
+        { return (MWBase::SoundManager::PlayType)(mFlags&MWBase::SoundManager::Play_TypeMask); }
+
+
+        Sound(const Ogre::Vector3& pos, float vol, float basevol, float pitch, float mindist, float maxdist, int flags)
+          : mPos(pos)
+          , mVolume(vol)
+          , mBaseVolume(basevol)
+          , mPitch(pitch)
+          , mMinDistance(mindist)
+          , mMaxDistance(maxdist)
+          , mFlags(flags)
         { }
         virtual ~Sound() { }
 
diff --git a/apps/openmw/mwsound/sound_decoder.hpp b/apps/openmw/mwsound/sound_decoder.hpp
index 9c28d5ff5..29d99e8fa 100644
--- a/apps/openmw/mwsound/sound_decoder.hpp
+++ b/apps/openmw/mwsound/sound_decoder.hpp
@@ -15,7 +15,10 @@ namespace MWSound
 
     enum ChannelConfig {
         ChannelConfig_Mono,
-        ChannelConfig_Stereo
+        ChannelConfig_Stereo,
+        ChannelConfig_Quad,
+        ChannelConfig_5point1,
+        ChannelConfig_7point1
     };
     const char *getChannelConfigName(ChannelConfig config);
 
@@ -29,11 +32,13 @@ namespace MWSound
         virtual void open(const std::string &fname) = 0;
         virtual void close() = 0;
 
+        virtual std::string getName() = 0;
         virtual void getInfo(int *samplerate, ChannelConfig *chans, SampleType *type) = 0;
 
         virtual size_t read(char *buffer, size_t bytes) = 0;
         virtual void readAll(std::vector<char> &output);
         virtual void rewind() = 0;
+        virtual size_t getSampleOffset() = 0;
 
         Sound_Decoder() : mResourceMgr(Ogre::ResourceGroupManager::getSingleton())
         { }
diff --git a/apps/openmw/mwsound/sound_output.hpp b/apps/openmw/mwsound/sound_output.hpp
index 2680ec1db..b5ccc946a 100644
--- a/apps/openmw/mwsound/sound_output.hpp
+++ b/apps/openmw/mwsound/sound_output.hpp
@@ -24,13 +24,16 @@ namespace MWSound
         virtual void init(const std::string &devname="") = 0;
         virtual void deinit() = 0;
 
-        virtual MWBase::SoundPtr playSound(const std::string &fname, float volume, float pitch, int flags) = 0;
+        virtual MWBase::SoundPtr playSound(const std::string &fname, float vol, float basevol, float pitch, int flags) = 0;
         virtual MWBase::SoundPtr playSound3D(const std::string &fname, const Ogre::Vector3 &pos,
-                                     float volume, float pitch, float min, float max, int flags) = 0;
-        virtual MWBase::SoundPtr streamSound(const std::string &fname, float volume, float pitch, int flags) = 0;
+                                             float vol, float basevol, float pitch, float min, float max, int flags) = 0;
+        virtual MWBase::SoundPtr streamSound(DecoderPtr decoder, float volume, float pitch, int flags) = 0;
 
         virtual void updateListener(const Ogre::Vector3 &pos, const Ogre::Vector3 &atdir, const Ogre::Vector3 &updir, Environment env) = 0;
 
+        virtual void pauseSounds(int types) = 0;
+        virtual void resumeSounds(int types) = 0;
+
         Sound_Output& operator=(const Sound_Output &rhs);
         Sound_Output(const Sound_Output &rhs);
 
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 8c4798c9d..c50290680 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -52,6 +52,7 @@ namespace MWSound
         , mMusicVolume(1.0f)
         , mFootstepsVolume(1.0f)
         , mVoiceVolume(1.0f)
+        , mPausedSoundTypes(0)
     {
         if(!useSound)
             return;
@@ -86,7 +87,7 @@ namespace MWSound
             {
                 if(devname.empty())
                     throw;
-                std::cout <<"Failed to open device \""<<devname<<"\", trying default."<< std::endl << "The error given was: " << e.what() << std::endl;
+                std::cerr <<"Failed to open device \""<<devname<<"\": " << e.what() << std::endl;
                 mOutput->init();
                 Settings::Manager::setString("device", "Sound", "");
             }
@@ -137,8 +138,29 @@ namespace MWSound
         return "Sound/"+snd->mSound;
     }
 
+    // Gets the combined volume settings for the given sound type
+    float SoundManager::volumeFromType(PlayType type) const
+    {
+        float volume = mMasterVolume;
+        switch(type)
+        {
+            case Play_TypeSfx:
+                volume *= mSFXVolume;
+                break;
+            case Play_TypeVoice:
+                volume *= mVoiceVolume;
+                break;
+            case Play_TypeMusic:
+            case Play_TypeMovie:
+                volume *= mMusicVolume;
+                break;
+            case Play_TypeMask:
+                break;
+        }
+        return volume;
+    }
 
-    bool SoundManager::isPlaying(MWWorld::Ptr ptr, const std::string &id) const
+    bool SoundManager::isPlaying(const MWWorld::Ptr &ptr, const std::string &id) const
     {
         SoundMap::const_iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
@@ -165,11 +187,13 @@ namespace MWSound
         std::cout <<"Playing "<<filename<< std::endl;
         try
         {
-            float basevol = mMasterVolume * mMusicVolume;
             stopMusic();
-            mMusic = mOutput->streamSound(filename, basevol, 1.0f, Play_NoEnv);
-            mMusic->mBaseVolume = basevol;
-            mMusic->mFlags = Play_NoEnv;
+
+            DecoderPtr decoder = getDecoder();
+            decoder->open(filename);
+
+            mMusic = mOutput->streamSound(decoder, volumeFromType(Play_TypeMusic),
+                                          1.0f, Play_NoEnv|Play_TypeMusic);
         }
         catch(std::exception &e)
         {
@@ -205,23 +229,20 @@ namespace MWSound
         startRandomTitle();
     }
 
-    void SoundManager::say(MWWorld::Ptr ptr, const std::string& filename)
+    void SoundManager::say(const MWWorld::Ptr &ptr, const std::string& filename)
     {
         if(!mOutput->isInitialized())
             return;
         try
         {
             // The range values are not tested
-            float basevol = mMasterVolume * mVoiceVolume;
+            float basevol = volumeFromType(Play_TypeVoice);
             std::string filePath = "Sound/"+filename;
             const ESM::Position &pos = ptr.getRefData().getPosition();
             const Ogre::Vector3 objpos(pos.pos[0], pos.pos[1], pos.pos[2]);
 
-            MWBase::SoundPtr sound = mOutput->playSound3D(filePath, objpos, basevol, 1.0f,
-                                                  20.0f, 12750.0f, Play_Normal);
-            sound->mPos = objpos;
-            sound->mBaseVolume = basevol;
-
+            MWBase::SoundPtr sound = mOutput->playSound3D(filePath, objpos, 1.0f, basevol, 1.0f,
+                                                          20.0f, 12750.0f, Play_Normal|Play_TypeVoice);
             mActiveSounds[sound] = std::make_pair(ptr, std::string("_say_sound"));
         }
         catch(std::exception &e)
@@ -236,12 +257,10 @@ namespace MWSound
             return;
         try
         {
-            float basevol = mMasterVolume * mVoiceVolume;
+            float basevol = volumeFromType(Play_TypeVoice);
             std::string filePath = "Sound/"+filename;
 
-            MWBase::SoundPtr sound = mOutput->playSound(filePath, basevol, 1.0f, Play_Normal);
-            sound->mBaseVolume = basevol;
-
+            MWBase::SoundPtr sound = mOutput->playSound(filePath, 1.0f, basevol, 1.0f, Play_Normal|Play_TypeVoice);
             mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), std::string("_say_sound"));
         }
         catch(std::exception &e)
@@ -250,12 +269,12 @@ namespace MWSound
         }
     }
 
-    bool SoundManager::sayDone(MWWorld::Ptr ptr) const
+    bool SoundManager::sayDone(const MWWorld::Ptr &ptr) const
     {
         return !isPlaying(ptr, "_say_sound");
     }
 
-    void SoundManager::stopSay(MWWorld::Ptr ptr)
+    void SoundManager::stopSay(const MWWorld::Ptr &ptr)
     {
         SoundMap::iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
@@ -271,26 +290,35 @@ namespace MWSound
     }
 
 
+    MWBase::SoundPtr SoundManager::playTrack(const DecoderPtr& decoder, PlayType type)
+    {
+        MWBase::SoundPtr track;
+        if(!mOutput->isInitialized())
+            return track;
+        try
+        {
+            track = mOutput->streamSound(decoder, volumeFromType(type), 1.0f, Play_NoEnv|type);
+        }
+        catch(std::exception &e)
+        {
+            std::cout <<"Sound Error: "<<e.what()<< std::endl;
+        }
+        return track;
+    }
 
-    MWBase::SoundPtr SoundManager::playSound(const std::string& soundId, float volume, float pitch, int mode)
+
+    MWBase::SoundPtr SoundManager::playSound(const std::string& soundId, float volume, float pitch, PlayMode mode)
     {
         MWBase::SoundPtr sound;
         if(!mOutput->isInitialized())
             return sound;
         try
         {
-            float basevol = mMasterVolume * mSFXVolume;
+            float basevol = volumeFromType(Play_TypeSfx);
             float min, max;
-            std::string file = lookup(soundId, basevol, min, max);
-
-            sound = mOutput->playSound(file, volume*basevol, pitch, mode);
-            sound->mVolume = volume;
-            sound->mBaseVolume = basevol;
-            sound->mPitch = pitch;
-            sound->mMinDistance = min;
-            sound->mMaxDistance = max;
-            sound->mFlags = mode;
+            std::string file = lookup(soundId, volume, min, max);
 
+            sound = mOutput->playSound(file, volume, basevol, pitch, mode|Play_TypeSfx);
             mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), soundId);
         }
         catch(std::exception &e)
@@ -300,8 +328,8 @@ namespace MWSound
         return sound;
     }
 
-    MWBase::SoundPtr SoundManager::playSound3D(MWWorld::Ptr ptr, const std::string& soundId,
-                                       float volume, float pitch, int mode)
+    MWBase::SoundPtr SoundManager::playSound3D(const MWWorld::Ptr &ptr, const std::string& soundId,
+                                               float volume, float pitch, PlayMode mode)
     {
         MWBase::SoundPtr sound;
         if(!mOutput->isInitialized())
@@ -309,21 +337,13 @@ namespace MWSound
         try
         {
             // Look up the sound in the ESM data
-            float basevol = mMasterVolume * mSFXVolume;
+            float basevol = volumeFromType(Play_TypeSfx);
             float min, max;
-            std::string file = lookup(soundId, basevol, min, max);
+            std::string file = lookup(soundId, volume, min, max);
             const ESM::Position &pos = ptr.getRefData().getPosition();;
             const Ogre::Vector3 objpos(pos.pos[0], pos.pos[1], pos.pos[2]);
 
-            sound = mOutput->playSound3D(file, objpos, volume*basevol, pitch, min, max, mode);
-            sound->mPos = objpos;
-            sound->mVolume = volume;
-            sound->mBaseVolume = basevol;
-            sound->mPitch = pitch;
-            sound->mMinDistance = min;
-            sound->mMaxDistance = max;
-            sound->mFlags = mode;
-
+            sound = mOutput->playSound3D(file, objpos, volume, basevol, pitch, min, max, mode|Play_TypeSfx);
             if((mode&Play_NoTrack))
                 mActiveSounds[sound] = std::make_pair(MWWorld::Ptr(), soundId);
             else
@@ -336,7 +356,7 @@ namespace MWSound
         return sound;
     }
 
-    void SoundManager::stopSound3D(MWWorld::Ptr ptr, const std::string& soundId)
+    void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId)
     {
         SoundMap::iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
@@ -351,7 +371,7 @@ namespace MWSound
         }
     }
 
-    void SoundManager::stopSound3D(MWWorld::Ptr ptr)
+    void SoundManager::stopSound3D(const MWWorld::Ptr &ptr)
     {
         SoundMap::iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
@@ -398,12 +418,33 @@ namespace MWSound
         }
     }
 
-    bool SoundManager::getSoundPlaying(MWWorld::Ptr ptr, const std::string& soundId) const
+    bool SoundManager::getSoundPlaying(const MWWorld::Ptr &ptr, const std::string& soundId) const
     {
         return isPlaying(ptr, soundId);
     }
 
 
+    void SoundManager::pauseSounds(int types)
+    {
+        if(mOutput->isInitialized())
+        {
+            types &= Play_TypeMask;
+            mOutput->pauseSounds(types);
+            mPausedSoundTypes |= types;
+        }
+    }
+
+    void SoundManager::resumeSounds(int types)
+    {
+        if(mOutput->isInitialized())
+        {
+            types &= types&Play_TypeMask&mPausedSoundTypes;
+            mOutput->resumeSounds(types);
+            mPausedSoundTypes &= ~types;
+        }
+    }
+
+
     void SoundManager::updateRegionSound(float duration)
     {
         MWWorld::Ptr::CellStore *current = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell();
@@ -525,24 +566,13 @@ namespace MWSound
         SoundMap::iterator snditer = mActiveSounds.begin();
         while(snditer != mActiveSounds.end())
         {
-            if(snditer->second.second != "_say_sound")
-            {
-                float basevol = mMasterVolume * mSFXVolume;
-                float min, max;
-                lookup(snditer->second.second, basevol, min, max);
-                snditer->first->mBaseVolume = basevol;
-            }
-            else
-            {
-                float basevol = mMasterVolume * mVoiceVolume;
-                snditer->first->mBaseVolume = basevol;
-            }
+            snditer->first->mBaseVolume = volumeFromType(snditer->first->getPlayType());
             snditer->first->update();
             snditer++;
         }
         if(mMusic)
         {
-            mMusic->mBaseVolume = mMasterVolume * mMusicVolume;
+            mMusic->mBaseVolume = volumeFromType(mMusic->getPlayType());
             mMusic->update();
         }
     }
@@ -585,8 +615,11 @@ namespace MWSound
     {
         switch(config)
         {
-            case ChannelConfig_Mono:   return "Mono";
-            case ChannelConfig_Stereo: return "Stereo";
+            case ChannelConfig_Mono:    return "Mono";
+            case ChannelConfig_Stereo:  return "Stereo";
+            case ChannelConfig_Quad:    return "Quad";
+            case ChannelConfig_5point1: return "5.1 Surround";
+            case ChannelConfig_7point1: return "7.1 Surround";
         }
         return "(unknown channel config)";
     }
@@ -595,8 +628,11 @@ namespace MWSound
     {
         switch(config)
         {
-            case ChannelConfig_Mono:   frames *= 1; break;
-            case ChannelConfig_Stereo: frames *= 2; break;
+            case ChannelConfig_Mono:    frames *= 1; break;
+            case ChannelConfig_Stereo:  frames *= 2; break;
+            case ChannelConfig_Quad:    frames *= 4; break;
+            case ChannelConfig_5point1: frames *= 6; break;
+            case ChannelConfig_7point1: frames *= 8; break;
         }
         switch(type)
         {
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index a84aa3b9a..2af26d3db 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -14,16 +14,12 @@
 
 #include "../mwbase/soundmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
-
 namespace MWSound
 {
     class Sound_Output;
     struct Sound_Decoder;
     class Sound;
 
-    typedef boost::shared_ptr<Sound_Decoder> DecoderPtr;
-
     enum Environment {
         Env_Normal,
         Env_Underwater
@@ -54,13 +50,17 @@ namespace MWSound
         Ogre::Vector3 mListenerDir;
         Ogre::Vector3 mListenerUp;
 
+        int mPausedSoundTypes;
+
         std::string lookup(const std::string &soundId,
                   float &volume, float &min, float &max);
         void streamMusicFull(const std::string& filename);
-        bool isPlaying(MWWorld::Ptr ptr, const std::string &id) const;
+        bool isPlaying(const MWWorld::Ptr &ptr, const std::string &id) const;
         void updateSounds(float duration);
         void updateRegionSound(float duration);
 
+        float volumeFromType(PlayType type) const;
+
         SoundManager(const SoundManager &rhs);
         SoundManager& operator=(const SoundManager &rhs);
 
@@ -91,7 +91,7 @@ namespace MWSound
         ///< Start playing music from the selected folder
         /// \param name of the folder that contains the playlist
 
-        virtual void say(MWWorld::Ptr reference, const std::string& filename);
+        virtual void say(const MWWorld::Ptr &reference, const std::string& filename);
         ///< Make an actor say some text.
         /// \param filename name of a sound file in "Sound/" in the data directory.
 
@@ -99,23 +99,26 @@ namespace MWSound
         ///< Say some text, without an actor ref
         /// \param filename name of a sound file in "Sound/" in the data directory.
 
-        virtual bool sayDone(MWWorld::Ptr reference=MWWorld::Ptr()) const;
+        virtual bool sayDone(const MWWorld::Ptr &reference=MWWorld::Ptr()) const;
         ///< Is actor not speaking?
 
-        virtual void stopSay(MWWorld::Ptr reference=MWWorld::Ptr());
+        virtual void stopSay(const MWWorld::Ptr &reference=MWWorld::Ptr());
         ///< Stop an actor speaking
 
-        virtual MWBase::SoundPtr playSound(const std::string& soundId, float volume, float pitch, int mode=Play_Normal);
+        virtual MWBase::SoundPtr playTrack(const DecoderPtr& decoder, PlayType type);
+        ///< Play a 2D audio track, using a custom decoder
+
+        virtual MWBase::SoundPtr playSound(const std::string& soundId, float volume, float pitch, PlayMode mode=Play_Normal);
         ///< Play a sound, independently of 3D-position
 
-        virtual MWBase::SoundPtr playSound3D(MWWorld::Ptr reference, const std::string& soundId,
-                             float volume, float pitch, int mode=Play_Normal);
+        virtual MWBase::SoundPtr playSound3D(const MWWorld::Ptr &reference, const std::string& soundId,
+                                             float volume, float pitch, PlayMode mode=Play_Normal);
         ///< Play a sound from an object
 
-        virtual void stopSound3D(MWWorld::Ptr reference, const std::string& soundId);
+        virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId);
         ///< Stop the given object from playing the given sound,
 
-        virtual void stopSound3D(MWWorld::Ptr reference);
+        virtual void stopSound3D(const MWWorld::Ptr &reference);
         ///< Stop the given object from playing all sounds.
 
         virtual void stopSound(const MWWorld::CellStore *cell);
@@ -124,9 +127,15 @@ namespace MWSound
         virtual void stopSound(const std::string& soundId);
         ///< Stop a non-3d looping sound
 
-        virtual bool getSoundPlaying(MWWorld::Ptr reference, const std::string& soundId) const;
+        virtual bool getSoundPlaying(const MWWorld::Ptr &reference, const std::string& soundId) const;
         ///< Is the given sound currently playing on the given object?
 
+        virtual void pauseSounds(int types=Play_TypeMask);
+        ///< Pauses all currently playing sounds, including music.
+
+        virtual void resumeSounds(int types=Play_TypeMask);
+        ///< Resumes all previously paused sounds.
+
         virtual void update(float duration);
 
         virtual void setListenerPosDir(const Ogre::Vector3 &pos, const Ogre::Vector3 &dir, const Ogre::Vector3 &up);
diff --git a/apps/openmw/mwworld/actionequip.cpp b/apps/openmw/mwworld/actionequip.cpp
index d8c019644..60260a812 100644
--- a/apps/openmw/mwworld/actionequip.cpp
+++ b/apps/openmw/mwworld/actionequip.cpp
@@ -2,6 +2,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "inventorystore.hpp"
 #include "player.hpp"
@@ -15,8 +16,7 @@ namespace MWWorld
 
     void ActionEquip::executeImp (const Ptr& actor)
     {
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
-        MWWorld::InventoryStore& invStore = MWWorld::Class::get(player).getInventoryStore(player);
+        MWWorld::InventoryStore& invStore = MWWorld::Class::get(actor).getInventoryStore(actor);
 
         // slots that this item can be equipped in
         std::pair<std::vector<int>, bool> slots = MWWorld::Class::get(getTarget()).getEquipmentSlots(getTarget());
@@ -32,11 +32,61 @@ namespace MWWorld
         }
 
         assert(it != invStore.end());
+        
+        std::string npcRace = actor.get<ESM::NPC>()->mBase->mRace;
 
         // equip the item in the first free slot
         for (std::vector<int>::const_iterator slot=slots.first.begin();
             slot!=slots.first.end(); ++slot)
         {
+
+            // Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
+            if(npcRace == "argonian" || npcRace == "khajiit")
+            {
+                if(*slot == MWWorld::InventoryStore::Slot_Helmet){ 
+                    std::vector<ESM::PartReference> parts;
+
+                    if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
+                        parts = it->get<ESM::Clothing>()->mBase->mParts.mParts;
+                    else
+                        parts = it->get<ESM::Armor>()->mBase->mParts.mParts;
+
+                    bool allow = true;
+                    for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
+                    {
+                        if((*itr).mPart == ESM::PartReferenceType::PRT_Head)
+                        {
+                            if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                                MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}", std::vector<std::string>());
+                        
+                            allow = false;
+                            break;
+                        }
+                    }
+                    
+                    if(!allow)
+                        break;
+                }
+
+                if (*slot == MWWorld::InventoryStore::Slot_Boots)
+                {  
+                    // Only notify the player, not npcs
+                    if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
+                    {
+                        if(it.getType() == MWWorld::ContainerStore::Type_Clothing){ // It's shoes
+                            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}", std::vector<std::string>());
+                        }
+
+                        else // It's boots
+                        {
+                            MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}", std::vector<std::string>());
+                        }
+                    }
+                    break;
+                }
+
+            }
+
             // if all slots are occupied, replace the last slot
             if (slot == --slots.first.end())
             {
diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index c595b0587..7e421dc55 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -154,10 +154,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name, Ptr::CellStore& ce
 
     if (cell.mState==Ptr::CellStore::State_Preloaded)
     {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
+        std::string lowerCase = Misc::StringUtils::lowerCase(name);
 
         if (std::binary_search (cell.mIds.begin(), cell.mIds.end(), lowerCase))
         {
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index ecc1bc306..7f1cdc469 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -60,16 +60,13 @@ namespace MWWorld
             // Get each reference in turn
             while (mCell->getNextRef (esm[index], ref))
             {
-                std::string lowerCase;
+                std::string lowerCase = Misc::StringUtils::lowerCase (ref.mRefID);
                 if (ref.mDeleted) {
-                    // Right now, don't do anything. Wehere is "listRefs" actually used, anyway?
+                    // Right now, don't do anything. Where is "listRefs" actually used, anyway?
                     //  Skipping for now...
                     continue;
                 }
 
-                std::transform (ref.mRefID.begin(), ref.mRefID.end(), std::back_inserter (lowerCase),
-                    (int(*)(int)) std::tolower);
-
                 mIds.push_back (lowerCase);
             }
         }
@@ -97,15 +94,10 @@ namespace MWWorld
             while(mCell->getNextRef(esm[index], ref))
             {
                 // Don't load reference if it was moved to a different cell.
+                std::string lowerCase = Misc::StringUtils::lowerCase(ref.mRefID);
                 if (mCell->mMovedRefs.find(ref.mRefnum) != mCell->mMovedRefs.end()) {
                     continue;
-                }
-                    
-                std::string lowerCase;
-
-                std::transform (ref.mRefID.begin(), ref.mRefID.end(), std::back_inserter (lowerCase),
-                    (int(*)(int)) std::tolower);
-
+                }                    
                 int rec = store.find(ref.mRefID);
 
                 ref.mRefID = lowerCase;
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 76d474c29..36addee86 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -15,6 +15,8 @@
 #include "manualref.hpp"
 #include "refdata.hpp"
 #include "class.hpp"
+#include "localscripts.hpp"
+#include "player.hpp"
 
 namespace
 {
@@ -37,7 +39,7 @@ namespace
 
     bool compare_string_ci(std::string str1, std::string str2)
     {
-        boost::algorithm::to_lower(str1);
+        Misc::StringUtils::toLower(str1);
         return str1 == str2;
     }
 }
@@ -71,6 +73,31 @@ bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
 }
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
+{
+    MWWorld::ContainerStoreIterator it = addImp(ptr);
+    MWWorld::Ptr item = *it;
+
+    std::string script = MWWorld::Class::get(item).getScript(item);
+    if(script != "")
+    {
+        CellStore *cell;
+
+        Ptr player = MWBase::Environment::get().getWorld ()->getPlayer().getPlayer();
+        // Items in players inventory have cell set to 0, so their scripts will never be removed
+        if(&(MWWorld::Class::get (player).getContainerStore (player)) == this)
+            cell = 0;
+        else
+            cell = player.getCell();
+
+        item.mCell = cell;
+        item.mContainerStore = 0;
+        MWBase::Environment::get().getWorld()->getLocalScripts().add(script, item);
+    }
+
+    return it;
+}
+
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr)
 {
     int type = getType(ptr);
 
@@ -162,7 +189,7 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const MWWor
         }
 
         ref.getPtr().getRefData().setCount (std::abs(iter->mCount)); /// \todo implement item restocking (indicated by negative count)
-        add (ref.getPtr());
+        addImp (ref.getPtr());
     }
 
     flagAsModified();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 36e22bb40..63695c0df 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -52,6 +52,7 @@ namespace MWWorld
             int mStateId;
             mutable float mCachedWeight;
             mutable bool mWeightUpToDate;
+            ContainerStoreIterator addImp (const Ptr& ptr);
 
         public:
 
diff --git a/apps/openmw/mwworld/esmstore.hpp b/apps/openmw/mwworld/esmstore.hpp
index 2039a00db..b9b95e4f4 100644
--- a/apps/openmw/mwworld/esmstore.hpp
+++ b/apps/openmw/mwworld/esmstore.hpp
@@ -6,7 +6,7 @@
 #include <components/esm/records.hpp>
 #include "store.hpp"
 
-namespace MWWorld 
+namespace MWWorld
 {
     class ESMStore
     {
@@ -161,7 +161,7 @@ namespace MWWorld
             std::ostringstream id;
             id << "$dynamic" << mDynamicCount++;
             record.mId = id.str();
-            
+
             T *ptr = store.insert(record);
             for (iterator it = mStores.begin(); it != mStores.end(); ++it) {
                 if (it->second == &store) {
@@ -183,7 +183,7 @@ namespace MWWorld
 
     template <>
     inline const ESM::NPC *ESMStore::insert<ESM::NPC>(const ESM::NPC &npc) {
-        if (StringUtils::ciEqual(npc.mId, "player")) {
+        if (Misc::StringUtils::ciEqual(npc.mId, "player")) {
             return mNpcs.insert(npc);
         } else if (mNpcs.search(npc.mId) != 0) {
             std::ostringstream msg;
@@ -195,7 +195,7 @@ namespace MWWorld
         std::ostringstream id;
         id << "$dynamic" << mDynamicCount++;
         record.mId = id.str();
-            
+
         ESM::NPC *ptr = mNpcs.insert(record);
         mIds[ptr->mId] = ESM::REC_NPC_;
         return ptr;
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index 76dede5a3..f010661b9 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -7,6 +7,17 @@
 
 namespace MWWorld
 {
+    std::vector<std::string> Globals::getGlobals () const
+    {
+        std::vector<std::string> retval;
+        Collection::const_iterator it;
+        for(it = mVariables.begin(); it != mVariables.end(); ++it){
+            retval.push_back(it->first);
+        }
+
+        return retval;
+    }
+
     Globals::Collection::const_iterator Globals::find (const std::string& name) const
     {
         Collection::const_iterator iter = mVariables.find (name);
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index c7aee5f93..681bd560e 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -1,6 +1,7 @@
 #ifndef GAME_MWWORLD_GLOBALS_H
 #define GAME_MWWORLD_GLOBALS_H
 
+#include <vector>
 #include <string>
 #include <map>
 
@@ -53,6 +54,8 @@ namespace MWWorld
             
             char getType (const std::string& name) const;
             ///< If there is no global variable with this name, ' ' is returned.
+
+            std::vector<std::string> getGlobals () const;
     };
 }
 
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index be83a191a..91622c354 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -3,6 +3,10 @@
 #include "esmstore.hpp"
 #include "cellstore.hpp"
 
+#include "class.hpp"
+#include "containerstore.hpp"
+
+
 namespace
 {
     template<typename T>
@@ -19,6 +23,32 @@ namespace
             }
         }
     }
+
+    // Adds scripts for items in containers (containers/npcs/creatures)
+    template<typename T>
+    void listCellScriptsCont (MWWorld::LocalScripts& localScripts,
+        MWWorld::CellRefList<T>& cellRefList,  MWWorld::Ptr::CellStore *cell)
+    {
+        for (typename MWWorld::CellRefList<T>::List::iterator iter (
+            cellRefList.mList.begin());
+            iter!=cellRefList.mList.end(); ++iter)
+        {
+           
+            MWWorld::Ptr containerPtr (&iter->second, cell); 
+            
+            MWWorld::ContainerStore& container = MWWorld::Class::get(containerPtr).getContainerStore(containerPtr);
+            for(MWWorld::ContainerStoreIterator it3 = container.begin(); it3 != container.end(); ++it3)
+            {
+                std::string script = MWWorld::Class::get(*it3).getScript(*it3);
+                if(script != "")
+                {
+                    MWWorld::Ptr item = *it3;
+                    item.mCell = cell;
+                    localScripts.add (script, item);
+                }
+            }
+        }
+    }
 }
 
 MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (store) {}
@@ -78,13 +108,16 @@ void MWWorld::LocalScripts::addCell (Ptr::CellStore *cell)
     listCellScripts (*this, cell->mBooks, cell);
     listCellScripts (*this, cell->mClothes, cell);
     listCellScripts (*this, cell->mContainers, cell);
+    listCellScriptsCont (*this, cell->mContainers, cell);
     listCellScripts (*this, cell->mCreatures, cell);
+    listCellScriptsCont (*this, cell->mCreatures, cell);
     listCellScripts (*this, cell->mDoors, cell);
     listCellScripts (*this, cell->mIngreds, cell);
     listCellScripts (*this, cell->mLights, cell);
     listCellScripts (*this, cell->mLockpicks, cell);
     listCellScripts (*this, cell->mMiscItems, cell);
     listCellScripts (*this, cell->mNpcs, cell);
+    listCellScriptsCont (*this, cell->mNpcs, cell);
     listCellScripts (*this, cell->mProbes, cell);
     listCellScripts (*this, cell->mRepairs, cell);
     listCellScripts (*this, cell->mWeapons, cell);
@@ -101,7 +134,7 @@ void MWWorld::LocalScripts::clearCell (Ptr::CellStore *cell)
 
     while (iter!=mScripts.end())
     {
-        if (iter->second.getCell()==cell)
+        if (iter->second.mCell==cell)
         {
             if (iter==mIter)
                ++mIter;
@@ -113,6 +146,20 @@ void MWWorld::LocalScripts::clearCell (Ptr::CellStore *cell)
     }
 }
 
+void MWWorld::LocalScripts::remove (RefData *ref)
+{
+    for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
+        iter!=mScripts.end(); ++iter)
+        if (&(iter->second.getRefData()) == ref)
+        {
+            if (iter==mIter)
+                ++mIter;
+
+            mScripts.erase (iter);
+            break;
+        }
+}
+
 void MWWorld::LocalScripts::remove (const Ptr& ptr)
 {
     for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 028dcdeda..840243fff 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -10,6 +10,7 @@ namespace MWWorld
 {
     struct ESMStore;
     class CellStore;
+    class RefData;
 
     /// \brief List of active local scripts
     class LocalScripts
@@ -47,6 +48,8 @@ namespace MWWorld
 
             void clearCell (CellStore *cell);
             ///< Remove all scripts belonging to \a cell.
+            
+            void remove (RefData *ref);
 
             void remove (const Ptr& ptr);
             ///< Remove script for given reference (ignored if reference does not have a scirpt listed).
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 5359c4eb2..9e2e94143 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -43,7 +43,7 @@ namespace MWWorld
         return mEngine;
     }
 
-    std::pair<std::string, float> PhysicsSystem::getFacedHandle (MWWorld::World& world)
+    std::pair<float, std::string> PhysicsSystem::getFacedHandle (MWWorld::World& world, float queryDistance)
     {
         btVector3 dir(0, 1, 0);
         dir = dir.rotate(btVector3(1, 0, 0), mPlayerData.pitch);
@@ -56,11 +56,14 @@ namespace MWWorld
             mPlayerData.eyepos.z);
         origin += dir * 5;
 
-        btVector3 dest = origin + dir * 500;
-        return mEngine->rayTest(origin, dest);
+        btVector3 dest = origin + dir * queryDistance;
+        std::pair <std::string, float> result;
+        /*auto*/ result = mEngine->rayTest(origin, dest);
+        result.second *= queryDistance;
+        return std::make_pair (result.second, result.first);
     }
 
-    std::vector < std::pair <float, std::string> > PhysicsSystem::getFacedObjects ()
+    std::vector < std::pair <float, std::string> > PhysicsSystem::getFacedHandles (float queryDistance)
     {
         btVector3 dir(0, 1, 0);
         dir = dir.rotate(btVector3(1, 0, 0), mPlayerData.pitch);
@@ -73,22 +76,32 @@ namespace MWWorld
             mPlayerData.eyepos.z);
         origin += dir * 5;
 
-        btVector3 dest = origin + dir * 500;
-        return mEngine->rayTest2(origin, dest);
+        btVector3 dest = origin + dir * queryDistance;
+        std::vector < std::pair <float, std::string> > results;
+        /* auto */ results = mEngine->rayTest2(origin, dest);
+        std::vector < std::pair <float, std::string> >::iterator i;
+        for (/* auto */ i = results.begin (); i != results.end (); ++i)
+            i->first *= queryDistance;
+        return results;
     }
 
-    std::vector < std::pair <float, std::string> > PhysicsSystem::getFacedObjects (float mouseX, float mouseY)
+    std::vector < std::pair <float, std::string> > PhysicsSystem::getFacedHandles (float mouseX, float mouseY, float queryDistance)
     {
         Ray ray = mRender.getCamera()->getCameraToViewportRay(mouseX, mouseY);
         Ogre::Vector3 from = ray.getOrigin();
-        Ogre::Vector3 to = ray.getPoint(500); /// \todo make this distance (ray length) configurable
+        Ogre::Vector3 to = ray.getPoint(queryDistance);
 
         btVector3 _from, _to;
         // OGRE to MW coordinates
         _from = btVector3(from.x, -from.z, from.y);
         _to = btVector3(to.x, -to.z, to.y);
 
-        return mEngine->rayTest2(_from,_to);
+        std::vector < std::pair <float, std::string> > results;
+        /* auto */ results = mEngine->rayTest2(_from,_to);
+        std::vector < std::pair <float, std::string> >::iterator i;
+        for (/* auto */ i = results.begin (); i != results.end (); ++i)
+            i->first *= queryDistance;
+        return results;
     }
 
     void PhysicsSystem::setCurrentWater(bool hasWater, int waterHeight)
@@ -110,7 +123,7 @@ namespace MWWorld
         Ray centerRay = mRender.getCamera()->getCameraToViewportRay(
         mRender.getViewport()->getWidth()/2,
         mRender.getViewport()->getHeight()/2);
-        btVector3 result(centerRay.getPoint(500*extent).x,-centerRay.getPoint(500*extent).z,centerRay.getPoint(500*extent).y); /// \todo make this distance (ray length) configurable
+        btVector3 result(centerRay.getPoint(extent).x,-centerRay.getPoint(extent).z,centerRay.getPoint(extent).y);
         return result;
     }
 
@@ -118,7 +131,7 @@ namespace MWWorld
     {
         //get a ray pointing to the center of the viewport
         Ray centerRay = mRender.getCamera()->getCameraToViewportRay(mouseX, mouseY);
-        btVector3 result(centerRay.getPoint(500*extent).x,-centerRay.getPoint(500*extent).z,centerRay.getPoint(500*extent).y); /// \todo make this distance (ray length) configurable
+        btVector3 result(centerRay.getPoint(extent).x,-centerRay.getPoint(extent).z,centerRay.getPoint(extent).y);
         return result;
     }
 
diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp
index 8bd73fd6c..81715c31e 100644
--- a/apps/openmw/mwworld/physicssystem.hpp
+++ b/apps/openmw/mwworld/physicssystem.hpp
@@ -41,14 +41,13 @@ namespace MWWorld
 
             bool toggleCollisionMode();
             
-            std::pair<std::string, float> getFacedHandle (MWWorld::World& world);
+            std::pair<float, std::string> getFacedHandle (MWWorld::World& world, float queryDistance);
+            std::vector < std::pair <float, std::string> > getFacedHandles (float queryDistance);
+            std::vector < std::pair <float, std::string> > getFacedHandles (float mouseX, float mouseY, float queryDistance);
 
             btVector3 getRayPoint(float extent);
             btVector3 getRayPoint(float extent, float mouseX, float mouseY);
 
-            std::vector < std::pair <float, std::string> > getFacedObjects ();
-
-            std::vector < std::pair <float, std::string> > getFacedObjects (float mouseX, float mouseY);
 
             // cast ray, return true if it hit something
             bool castRay(const Ogre::Vector3& from, const Ogre::Vector3& to);
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 594ddef2d..d97ebcc6e 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -74,7 +74,7 @@ namespace MWWorld
 
             bool isInCell() const
             {
-                return (mCell != 0);
+                return (mContainerStore == 0);
             }
 
             void setContainerStore (ContainerStore *store);
diff --git a/apps/openmw/mwworld/recordcmp.hpp b/apps/openmw/mwworld/recordcmp.hpp
index 0b1655100..7de4f5565 100644
--- a/apps/openmw/mwworld/recordcmp.hpp
+++ b/apps/openmw/mwworld/recordcmp.hpp
@@ -1,62 +1,12 @@
 #ifndef OPENMW_MWWORLD_RECORDCMP_H
 #define OPENMW_MWWORLD_RECORDCMP_H
 
-#include <string>
 #include <cctype>
-#include <algorithm>
 
 #include <components/esm/records.hpp>
 
 namespace MWWorld
 {
-    /// \todo move this to another location
-    class StringUtils
-    {
-        struct ci
-        {
-            bool operator()(int x, int y) const {
-                return std::tolower(x) < std::tolower(y);
-            }
-        };
-
-    public:
-        static bool ciLess(const std::string &x, const std::string &y) {
-            return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
-        }
-
-        static bool ciEqual(const std::string &x, const std::string &y) {
-            if (x.size() != y.size()) {
-                return false;
-            }
-            std::string::const_iterator xit = x.begin();
-            std::string::const_iterator yit = y.begin();
-            for (; xit != x.end(); ++xit, ++yit) {
-                if (std::tolower(*xit) != std::tolower(*yit)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// Transforms input string to lower case w/o copy
-        static std::string &toLower(std::string &inout) {
-            std::transform(
-                inout.begin(),
-                inout.end(),
-                inout.begin(),
-                (int (*)(int)) std::tolower
-            );
-            return inout;
-        }
-
-        /// Returns lower case copy of input string
-        static std::string lowerCase(const std::string &in)
-        {
-            std::string out = in;
-            return toLower(out);
-        }
-    };
-
     struct RecordCmp
     {
         template <class T>
@@ -67,17 +17,17 @@ namespace MWWorld
 
     template <>
     inline bool RecordCmp::operator()<ESM::Dialogue>(const ESM::Dialogue &x, const ESM::Dialogue &y) const {
-        return StringUtils::ciLess(x.mId, y.mId);
+        return Misc::StringUtils::ciLess(x.mId, y.mId);
     }
 
     template <>
     inline bool RecordCmp::operator()<ESM::Cell>(const ESM::Cell &x, const ESM::Cell &y) const {
-        return StringUtils::ciLess(x.mName, y.mName);
+        return Misc::StringUtils::ciLess(x.mName, y.mName);
     }
 
     template <>
     inline bool RecordCmp::operator()<ESM::Pathgrid>(const ESM::Pathgrid &x, const ESM::Pathgrid &y) const {
-        return StringUtils::ciLess(x.mCell, y.mCell);
+        return Misc::StringUtils::ciLess(x.mCell, y.mCell);
     }
 
 } // end namespace
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 5630bfd5c..4be287810 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -6,6 +6,9 @@
 #include "customdata.hpp"
 #include "cellstore.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 namespace MWWorld
 {
     void RefData::copy (const RefData& refData)
@@ -107,6 +110,9 @@ namespace MWWorld
 
     void RefData::setCount (int count)
     {
+        if(count == 0)
+            MWBase::Environment::get().getWorld()->removeRefScript(this);
+        
         mCount = count;
     }
 
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index eacd4e6bd..768ca9e11 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -172,6 +172,8 @@ namespace MWWorld
 
     void Scene::changeCell (int X, int Y, const ESM::Position& position, bool adjustPlayerPos)
     {
+        Nif::NIFFile::CacheLock cachelock;
+
         mRendering.preCellChange(mCurrentCell);
 
         // remove active
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index c36e84813..dbad7432f 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -107,11 +107,11 @@ namespace MWWorld
 
         const T *search(const std::string &id) const {
             T item;
-            item.mId = StringUtils::lowerCase(id);
+            item.mId = Misc::StringUtils::lowerCase(id);
 
             typename std::map<std::string, T>::const_iterator it = mStatic.find(item.mId);
             
-            if (it != mStatic.end() && StringUtils::ciEqual(it->second.mId, id)) {
+            if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
                 return &(it->second);
             }
 
@@ -134,7 +134,7 @@ namespace MWWorld
         }
 
         void load(ESM::ESMReader &esm, const std::string &id) {
-            std::string idLower = StringUtils::lowerCase(id);
+            std::string idLower = Misc::StringUtils::lowerCase(id);
             mStatic[idLower] = T();
             mStatic[idLower].mId = idLower;
             mStatic[idLower].load(esm);
@@ -171,7 +171,7 @@ namespace MWWorld
         }
 
         T *insert(const T &item) {
-            std::string id = StringUtils::lowerCase(item.mId);
+            std::string id = Misc::StringUtils::lowerCase(item.mId);
             std::pair<typename Dynamic::iterator, bool> result =
                 mDynamic.insert(std::pair<std::string, T>(id, item));
             T *ptr = &result.first->second;
@@ -185,11 +185,11 @@ namespace MWWorld
 
         bool eraseStatic(const std::string &id) {
             T item;
-            item.mId = StringUtils::lowerCase(id);
+            item.mId = Misc::StringUtils::lowerCase(id);
 
             typename std::map<std::string, T>::const_iterator it = mStatic.find(item.mId);
             
-            if (it != mStatic.end() && StringUtils::ciEqual(it->second.mId, id)) {
+            if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
                 mStatic.erase(it);
             }
 
@@ -197,7 +197,7 @@ namespace MWWorld
         }
         
         bool erase(const std::string &id) {
-            std::string key = StringUtils::lowerCase(id);
+            std::string key = Misc::StringUtils::lowerCase(id);
             typename Dynamic::iterator it = mDynamic.find(key);
             if (it == mDynamic.end()) {
                 return false;
@@ -219,7 +219,7 @@ namespace MWWorld
 
     template <>
     inline void Store<ESM::Dialogue>::load(ESM::ESMReader &esm, const std::string &id) {
-        std::string idLower = StringUtils::lowerCase(id);
+        std::string idLower = Misc::StringUtils::lowerCase(id);
         mStatic[idLower] = ESM::Dialogue();
         mStatic[idLower].mId = id; // don't smash case here, as this line is printed... I think
         mStatic[idLower].load(esm);
@@ -229,7 +229,7 @@ namespace MWWorld
     inline void Store<ESM::Script>::load(ESM::ESMReader &esm, const std::string &id) {
         ESM::Script scpt;
         scpt.load(esm);
-        StringUtils::toLower(scpt.mId);
+        Misc::StringUtils::toLower(scpt.mId);
         mStatic[scpt.mId] = scpt;
     }
 
@@ -328,6 +328,16 @@ namespace MWWorld
     public:
         typedef SharedIterator<ESM::Land> iterator;
 
+        virtual ~Store<ESM::Land>()
+        {
+            for (std::vector<ESM::Land *>::const_iterator it =
+                             mStatic.begin(); it != mStatic.end(); ++it)
+            {
+                delete *it;
+            }
+
+        }
+
         int getSize() const {
             return mStatic.size();
         }
@@ -417,11 +427,11 @@ namespace MWWorld
 
         const ESM::Cell *search(const std::string &id) const {
             ESM::Cell cell;
-            cell.mName = StringUtils::lowerCase(id);
+            cell.mName = Misc::StringUtils::lowerCase(id);
 
             std::map<std::string, ESM::Cell>::const_iterator it = mInt.find(cell.mName);
 
-            if (it != mInt.end() && StringUtils::ciEqual(it->second.mName, id)) {
+            if (it != mInt.end() && Misc::StringUtils::ciEqual(it->second.mName, id)) {
                 return &(it->second);
             }
 
@@ -520,7 +530,7 @@ namespace MWWorld
             //  are not available until both cells have been loaded! So first, proceed as usual.
             
             // All cells have a name record, even nameless exterior cells.
-            std::string idLower = StringUtils::lowerCase(id);
+            std::string idLower = Misc::StringUtils::lowerCase(id);
             ESM::Cell *cell = new ESM::Cell;
             cell->mName = id;
 
@@ -589,7 +599,7 @@ namespace MWWorld
         const ESM::Cell *searchExtByName(const std::string &id) const {
             std::vector<ESM::Cell *>::const_iterator it = mSharedExt.begin();
             for (; it != mSharedExt.end(); ++it) {
-                if (StringUtils::ciEqual((*it)->mName, id)) {
+                if (Misc::StringUtils::ciEqual((*it)->mName, id)) {
                     return *it;
                 }
             }
@@ -600,7 +610,7 @@ namespace MWWorld
         const ESM::Cell *searchExtByRegion(const std::string &id) const {
             std::vector<ESM::Cell *>::const_iterator it = mSharedExt.begin();
             for (; it != mSharedExt.end(); ++it) {
-                if (StringUtils::ciEqual((*it)->mRegion, id)) {
+                if (Misc::StringUtils::ciEqual((*it)->mRegion, id)) {
                     return *it;
                 }
             }
@@ -640,7 +650,7 @@ namespace MWWorld
                 ptr = &result.first->second;
                 mSharedExt.push_back(ptr);
             } else {
-                std::string key = StringUtils::lowerCase(cell.mName);
+                std::string key = Misc::StringUtils::lowerCase(cell.mName);
 
                 // duplicate insertions are avoided by search(ESM::Cell &)
                 std::pair<DynamicInt::iterator, bool> result =
@@ -660,7 +670,7 @@ namespace MWWorld
         }
 
         bool erase(const std::string &id) {
-            std::string key = StringUtils::lowerCase(id);
+            std::string key = Misc::StringUtils::lowerCase(id);
             DynamicInt::iterator it = mDynamicInt.find(key);
 
             if (it == mDynamicInt.end()) {
@@ -790,7 +800,7 @@ namespace MWWorld
             pg.mCell = name;
 
             iterator it = std::lower_bound(mIntBegin, mIntEnd, pg, RecordCmp());
-            if (it != mIntEnd && StringUtils::ciEqual(it->mCell, name)) {
+            if (it != mIntEnd && Misc::StringUtils::ciEqual(it->mCell, name)) {
                 return &(*it);
             }
             return 0;
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index 009b325c0..917a8d7d4 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -497,7 +497,7 @@ void WeatherManager::update(float duration)
     if (exterior)
     {
         std::string regionstr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell()->mCell->mRegion;
-        boost::algorithm::to_lower(regionstr);
+        Misc::StringUtils::toLower(regionstr);
 
         if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
         {
@@ -738,7 +738,7 @@ void WeatherManager::update(float duration)
         if (std::find(mSoundsPlaying.begin(), mSoundsPlaying.end(), ambientSnd) == mSoundsPlaying.end())
         {
             mSoundsPlaying.push_back(ambientSnd);
-            MWBase::Environment::get().getSoundManager()->playSound(ambientSnd, 1.0, 1.0, true);
+            MWBase::Environment::get().getSoundManager()->playSound(ambientSnd, 1.0, 1.0, MWBase::SoundManager::Play_Loop);
         }
     }
 
@@ -749,7 +749,7 @@ void WeatherManager::update(float duration)
         if (std::find(mSoundsPlaying.begin(), mSoundsPlaying.end(), rainSnd) == mSoundsPlaying.end())
         {
             mSoundsPlaying.push_back(rainSnd);
-            MWBase::Environment::get().getSoundManager()->playSound(rainSnd, 1.0, 1.0, true);
+            MWBase::Environment::get().getSoundManager()->playSound(rainSnd, 1.0, 1.0, MWBase::SoundManager::Play_Loop);
         }
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6dbba2a45..62b4f3037 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -11,6 +11,8 @@
 #include "../mwrender/sky.hpp"
 #include "../mwrender/player.hpp"
 
+#include "../mwclass/door.hpp"
+
 #include "player.hpp"
 #include "manualref.hpp"
 #include "cellfunctors.hpp"
@@ -169,10 +171,10 @@ namespace MWWorld
         const Files::Collections& fileCollections,
         const std::vector<std::string>& master, const std::vector<std::string>& plugins,
 	const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir, bool newGame,
-        const std::string& encoding, std::map<std::string,std::string> fallbackMap)
+        ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap, int mActivationDistanceOverride)
     : mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0),
       mSky (true), mCells (mStore, mEsm),
-      mNumFacing(0)
+      mNumFacing(0), mActivationDistanceOverride (mActivationDistanceOverride)
     {
         mPhysics = new PhysicsSystem(renderer);
         mPhysEngine = mPhysics->getEngine();
@@ -192,7 +194,7 @@ namespace MWWorld
 
             // This parses the ESM file
             ESM::ESMReader lEsm;
-            lEsm.setEncoding(encoding);
+            lEsm.setEncoder(encoder);
             lEsm.setIndex(idx);
             lEsm.setGlobalReaderList(&mEsm);
             lEsm.open (masterPath.string());
@@ -208,7 +210,7 @@ namespace MWWorld
 
             // This parses the ESP file
             ESM::ESMReader lEsm;
-            lEsm.setEncoding(encoding);
+            lEsm.setEncoder(encoder);
             lEsm.setIndex(idx);
             lEsm.setGlobalReaderList(&mEsm);
             lEsm.open (pluginPath.string());
@@ -222,7 +224,7 @@ namespace MWWorld
         mRendering->attachCameraTo(mPlayer->getPlayer());
 
         mPhysics->addActor(mPlayer->getPlayer());
-        
+
         // global variables
         mGlobalVariables = new Globals (mStore);
 
@@ -232,6 +234,8 @@ namespace MWWorld
             mGlobalVariables->setInt ("chargenstate", 1);
         }
 
+        mGlobalVariables->setInt ("pcrace", 3);
+
         mWorldScene = new Scene(*mRendering, mPhysics);
 
         setFallbackValues(fallbackMap);
@@ -264,7 +268,7 @@ namespace MWWorld
         MWWorld::Store<ESM::Region>::iterator it = regions.begin();
         for (; it != regions.end(); ++it)
         {
-            if (MWWorld::StringUtils::ciEqual(cellName, it->mName))
+            if (Misc::StringUtils::ciEqual(cellName, it->mName))
             {
                 return mStore.get<ESM::Cell>().searchExtByRegion(it->mId);
             }
@@ -323,6 +327,54 @@ namespace MWWorld
         return mGlobalVariables->getType (name);
     }
 
+    std::vector<std::string> World::getGlobals () const
+    {
+        return mGlobalVariables->getGlobals();
+    }
+    
+    std::string World::getCurrentCellName () const
+    {
+        std::string name;
+
+        Ptr::CellStore *cell = mWorldScene->getCurrentCell();
+        if (cell->mCell->isExterior())
+        {    
+            if (cell->mCell->mName != "")
+            {    
+                name = cell->mCell->mName;
+            }    
+            else 
+            {    
+                const ESM::Region* region =
+                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(cell->mCell->mRegion);
+                if (region)
+                    name = region->mName;
+                else
+                { 
+                    const ESM::GameSetting *setting =
+                        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().search("sDefaultCellname");
+
+                    if (setting && setting->mType == ESM::VT_String)
+                        name = setting->getString();
+                    else
+                        name = "Wilderness";
+                }
+
+            }    
+        }    
+        else 
+        {    
+            name = cell->mCell->mName;
+        }    
+        
+        return name;
+    }
+
+    void World::removeRefScript (MWWorld::RefData *ref)
+    {
+        mLocalScripts.remove (ref);
+    }
+
     Ptr World::getPtr (const std::string& name, bool activeOnly)
     {
         // the player is always in an active cell.
@@ -378,23 +430,62 @@ namespace MWWorld
         return MWWorld::Ptr();
     }
 
+    void World::addContainerScripts(const Ptr& reference, Ptr::CellStore * cell)
+    {
+        if( reference.getTypeName()==typeid (ESM::Container).name() ||
+            reference.getTypeName()==typeid (ESM::NPC).name() ||
+            reference.getTypeName()==typeid (ESM::Creature).name())
+        {
+            MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+            for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+            {
+                std::string script = MWWorld::Class::get(*it).getScript(*it);
+                if(script != "")
+                {
+                    MWWorld::Ptr item = *it;
+                    item.mCell = cell;
+                    mLocalScripts.add (script, item);
+                }
+            }
+        }
+    }
+
     void World::enable (const Ptr& reference)
     {
         if (!reference.getRefData().isEnabled())
         {
             reference.getRefData().enable();
-
+            
             if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->addObjectToScene (reference);
         }
     }
+    
+    void World::removeContainerScripts(const Ptr& reference)
+    {
+        if( reference.getTypeName()==typeid (ESM::Container).name() ||
+            reference.getTypeName()==typeid (ESM::NPC).name() ||
+            reference.getTypeName()==typeid (ESM::Creature).name())
+        {
+            MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+            for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+            {
+                std::string script = MWWorld::Class::get(*it).getScript(*it);
+                if(script != "")
+                {
+                    MWWorld::Ptr item = *it;
+                    mLocalScripts.remove (item);
+                }
+            }
+        }
+    }
 
     void World::disable (const Ptr& reference)
     {
         if (reference.getRefData().isEnabled())
         {
             reference.getRefData().disable();
-
+            
             if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->removeObjectFromScene (reference);
         }
@@ -555,23 +646,55 @@ namespace MWWorld
         return mWorldScene->markCellAsUnchanged();
     }
 
-    std::string World::getFacedHandle()
+    float World::getMaxActivationDistance ()
     {
+        if (mActivationDistanceOverride >= 0)
+            return mActivationDistanceOverride;
+
+        return (std::max) (getNpcActivationDistance (), getObjectActivationDistance ());
+    }
+
+    float World::getNpcActivationDistance ()
+    {
+        if (mActivationDistanceOverride >= 0)
+            return mActivationDistanceOverride;
+
+        return getStore().get<ESM::GameSetting>().find ("iMaxActivateDist")->getInt()*5/4;
+    }
+
+    float World::getObjectActivationDistance ()
+    {
+        if (mActivationDistanceOverride >= 0)
+            return mActivationDistanceOverride;
+
+        return getStore().get<ESM::GameSetting>().find ("iMaxActivateDist")->getInt();
+    }
+
+    MWWorld::Ptr World::getFacedObject()
+    {
+        std::pair<float, std::string> result;
+
         if (!mRendering->occlusionQuerySupported())
-        {
-            std::pair<std::string, float> result = mPhysics->getFacedHandle (*this);
-
-            if (result.first.empty() ||
-                    result.second>getStore().get<ESM::GameSetting>().find ("iMaxActivateDist")->getInt())
-                return "";
-
-            return result.first;
-        }
+            result = mPhysics->getFacedHandle (*this, getMaxActivationDistance ());
         else
-        {
-            // updated every few frames in update()
-            return mFacedHandle;
-        }
+            result = std::make_pair (mFacedDistance, mFacedHandle);
+
+        if (result.second.empty())
+            return MWWorld::Ptr ();
+
+        MWWorld::Ptr object = searchPtrViaHandle (result.second);
+
+        float ActivationDistance;
+
+        if (object.getTypeName ().find("NPC") != std::string::npos)
+            ActivationDistance = getNpcActivationDistance ();
+        else
+            ActivationDistance = getObjectActivationDistance ();
+
+        if (result.first > ActivationDistance)
+            return MWWorld::Ptr ();
+
+        return object;
     }
 
     void World::deleteObject (const Ptr& ptr)
@@ -585,20 +708,11 @@ namespace MWWorld
             {
                 mWorldScene->removeObjectFromScene (ptr);
                 mLocalScripts.remove (ptr);
+                removeContainerScripts (ptr);
             }
         }
     }
 
-    std::string toLower (const std::string& name)
-    {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
-
-        return lowerCase;
-    }
-
     void World::moveObject(const Ptr &ptr, CellStore &newCell, float x, float y, float z)
     {
         ESM::Position &pos = ptr.getRefData().getPosition();
@@ -608,12 +722,14 @@ namespace MWWorld
         CellStore *currCell = ptr.getCell();
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = mWorldScene->isCellActive(*currCell) || isPlayer;
+        
+        removeContainerScripts(ptr);
 
         if (*currCell != newCell)
         {
             if (isPlayer)
                 if (!newCell.isExterior())
-                    changeToInteriorCell(toLower(newCell.mCell->mName), pos);
+                    changeToInteriorCell(Misc::StringUtils::lowerCase(newCell.mCell->mName), pos);
                 else
                 {
                     int cellX = newCell.mCell->getGridX();
@@ -635,6 +751,8 @@ namespace MWWorld
                     MWWorld::Ptr copy =
                         MWWorld::Class::get(ptr).copyToCell(ptr, newCell);
 
+                    addContainerScripts(copy, &newCell);
+
                     mRendering->moveObjectToCell(copy, vec, currCell);
 
                     if (MWWorld::Class::get(ptr).isActor())
@@ -689,7 +807,7 @@ namespace MWWorld
     {
         MWWorld::Class::get(ptr).adjustScale(ptr,scale);
         ptr.getCellRef().mScale = scale;
-        
+
         if(ptr.getRefData().getBaseNode() == 0)
             return;
         mRendering->scaleObject(ptr, Vector3(scale,scale,scale));
@@ -702,7 +820,7 @@ namespace MWWorld
         rot.x = Ogre::Degree(x).valueRadians();
         rot.y = Ogre::Degree(y).valueRadians();
         rot.z = Ogre::Degree(z).valueRadians();
-        
+
         float *objRot = ptr.getRefData().getPosition().rot;
         if(ptr.getRefData().getBaseNode() == 0 || !mRendering->rotateObject(ptr, rot, adjust))
         {
@@ -810,7 +928,7 @@ namespace MWWorld
 
     const ESM::Potion *World::createRecord (const ESM::Potion& record)
     {
-        return mStore.insert(record); 
+        return mStore.insert(record);
     }
 
     const ESM::Class *World::createRecord (const ESM::Class& record)
@@ -831,14 +949,30 @@ namespace MWWorld
     const ESM::NPC *World::createRecord(const ESM::NPC &record)
     {
         bool update = false;
-        if (StringUtils::ciEqual(record.mId, "player")) {
+
+        if (Misc::StringUtils::ciEqual(record.mId, "player"))
+        {
+            static const char *sRaces[] =
+            {
+                "Argonian", "Breton", "Dark Elf", "High Elf", "Imperial", "Khajiit", "Nord", "Orc", "Redguard",
+                "Woodelf",  0
+            };
+
+            int i=0;
+
+            for (; sRaces[i]; ++i)
+                if (Misc::StringUtils::ciEqual (sRaces[i], record.mRace))
+                    break;
+
+            mGlobalVariables->setInt ("pcrace", sRaces[i] ? i+1 : 0);
+
             const ESM::NPC *player =
                 mPlayer->getPlayer().get<ESM::NPC>()->mBase;
 
             update = record.isMale() != player->isMale() ||
-                     !StringUtils::ciEqual(record.mRace, player->mRace) ||
-                     !StringUtils::ciEqual(record.mHead, player->mHead) ||
-                     !StringUtils::ciEqual(record.mHair, player->mHair);
+                     !Misc::StringUtils::ciEqual(record.mRace, player->mRace) ||
+                     !Misc::StringUtils::ciEqual(record.mHead, player->mHead) ||
+                     !Misc::StringUtils::ciEqual(record.mHair, player->mHair);
         }
         const ESM::NPC *ret = mStore.insert(record);
         if (update) {
@@ -860,10 +994,8 @@ namespace MWWorld
 
     void World::update (float duration, bool paused)
     {
-        /// \todo split this function up into subfunctions
-
         mWorldScene->update (duration, paused);
-        
+
         float pitch, yaw;
         Ogre::Vector3 eyepos;
         mRendering->getPlayerData(eyepos, pitch, yaw);
@@ -871,8 +1003,15 @@ namespace MWWorld
 
         mWeatherManager->update (duration);
 
+        performUpdateSceneQueries ();
+
+        updateWindowManager ();
+    }
+
+    void World::updateWindowManager ()
+    {
         // inform the GUI about focused object
-        MWWorld::Ptr object = searchPtrViaHandle(mFacedHandle);
+        MWWorld::Ptr object = getFacedObject ();
 
         MWBase::Environment::get().getWindowManager()->setFocusObject(object);
 
@@ -894,7 +1033,10 @@ namespace MWWorld
                     screenCoords[0], screenCoords[1], screenCoords[2], screenCoords[3]);
             }
         }
+    }
 
+    void World::performUpdateSceneQueries ()
+    {
         if (!mRendering->occlusionQuerySupported())
         {
             // cast a ray from player to sun to detect if the sun is visible
@@ -913,121 +1055,154 @@ namespace MWWorld
             MWRender::OcclusionQuery* query = mRendering->getOcclusionQuery();
             if (!query->occlusionTestPending())
             {
-                // get result of last query
-                if (mNumFacing == 0) mFacedHandle = "";
-                else if (mNumFacing == 1)
-                {
-                    bool result = query->getTestResult();
-                    mFacedHandle = result ? mFaced1Name : "";
-                }
-                else if (mNumFacing == 2)
-                {
-                    bool result = query->getTestResult();
-                    mFacedHandle = result ? mFaced2Name : mFaced1Name;
-                }
-
-                // send new query
-                // figure out which object we want to test against
-                std::vector < std::pair < float, std::string > > results;
-                if (MWBase::Environment::get().getWindowManager()->isGuiMode())
-                {
-                    float x, y;
-                    MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
-                    results = mPhysics->getFacedObjects(x, y);
-                }
-                else
-                    results = mPhysics->getFacedObjects();
-
-                // ignore the player and other things we're not interested in
-                std::vector < std::pair < float, std::string > >::iterator it = results.begin();
-                while (it != results.end())
-                {
-                    if ( (*it).second.find("HeightField") != std::string::npos // not interested in terrain
-                    || getPtrViaHandle((*it).second) == mPlayer->getPlayer() ) // not interested in player (unless you want to talk to yourself)
-                    {
-                        it = results.erase(it);
-                    }
-                    else
-                        ++it;
-                }
-
-                if (results.size() == 0)
-                {
-                    mNumFacing = 0;
-                }
-                else if (results.size() == 1)
-                {
-                    mFaced1 = getPtrViaHandle(results.front().second);
-                    mFaced1Name = results.front().second;
-                    mNumFacing = 1;
-
-                    btVector3 p;
-                    if (MWBase::Environment::get().getWindowManager()->isGuiMode())
-                    {
-                        float x, y;
-                        MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
-                        p = mPhysics->getRayPoint(results.front().first, x, y);
-                    }
-                    else
-                        p = mPhysics->getRayPoint(results.front().first);
-                    Ogre::Vector3 pos(p.x(), p.z(), -p.y());
-                    Ogre::SceneNode* node = mFaced1.getRefData().getBaseNode();
-
-                    //std::cout << "Num facing 1 : " << mFaced1Name <<  std::endl;
-                    //std::cout << "Type 1 " << mFaced1.getTypeName() <<  std::endl;
-
-                    query->occlusionTest(pos, node);
-                }
-                else
-                {
-                    mFaced1Name = results.front().second;
-                    mFaced2Name = results[1].second;
-                    mFaced1 = getPtrViaHandle(results.front().second);
-                    mFaced2 = getPtrViaHandle(results[1].second);
-                    mNumFacing = 2;
-
-                    btVector3 p;
-                    if (MWBase::Environment::get().getWindowManager()->isGuiMode())
-                    {
-                        float x, y;
-                        MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
-                        p = mPhysics->getRayPoint(results[1].first, x, y);
-                    }
-                    else
-                        p = mPhysics->getRayPoint(results[1].first);
-                    Ogre::Vector3 pos(p.x(), p.z(), -p.y());
-                    Ogre::SceneNode* node1 = mFaced1.getRefData().getBaseNode();
-                    Ogre::SceneNode* node2 = mFaced2.getRefData().getBaseNode();
-
-                    // no need to test if the first node is not occluder
-                    if (!query->isPotentialOccluder(node1) && (mFaced1.getTypeName().find("Static") == std::string::npos))
-                    {
-                        mFacedHandle = mFaced1Name;
-                        //std::cout << "node1 Not an occluder" << std::endl;
-                        return;
-                    }
-
-                    // no need to test if the second object is static (thus cannot be activated)
-                    if (mFaced2.getTypeName().find("Static") != std::string::npos)
-                    {
-                        mFacedHandle = mFaced1Name;
-                        return;
-                    }
-
-                    // work around door problems
-                    if (mFaced1.getTypeName().find("Static") != std::string::npos
-                        && mFaced2.getTypeName().find("Door") != std::string::npos)
-                    {
-                        mFacedHandle = mFaced2Name;
-                        return;
-                    }
-
-                    query->occlusionTest(pos, node2);
-                }
+                processFacedQueryResults (query);
+                beginFacedQueryProcess (query);
             }
         }
     }
 
+    void World::processFacedQueryResults (MWRender::OcclusionQuery* query)
+    {
+        // get result of last query
+        if (mNumFacing == 0)
+        {
+            mFacedHandle = "";
+            mFacedDistance = FLT_MAX;
+        }
+        else if (mNumFacing == 1)
+        {
+            bool result = query->getTestResult();
+            mFacedHandle = result ? mFaced1Name : "";
+            mFacedDistance = result ? mFaced1Distance : FLT_MAX;
+        }
+        else if (mNumFacing == 2)
+        {
+            bool result = query->getTestResult();
+            mFacedHandle = result ? mFaced2Name : mFaced1Name;
+            mFacedDistance = result ? mFaced1Distance : mFaced1Distance;
+        }
+    }
+
+    void World::beginFacedQueryProcess (MWRender::OcclusionQuery* query)
+    {
+        // send new query
+        // figure out which object we want to test against
+        std::vector < std::pair < float, std::string > > results;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+        {
+            float x, y;
+            MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
+            results = mPhysics->getFacedHandles(x, y, getMaxActivationDistance ());
+        }
+        else
+        {
+            results = mPhysics->getFacedHandles(getMaxActivationDistance ());
+        }
+
+        // ignore the player and other things we're not interested in
+        std::vector < std::pair < float, std::string > >::iterator it = results.begin();
+        while (it != results.end())
+        {
+            if ( (*it).second.find("HeightField") != std::string::npos // not interested in terrain
+            || getPtrViaHandle((*it).second) == mPlayer->getPlayer() ) // not interested in player (unless you want to talk to yourself)
+            {
+                it = results.erase(it);
+            }
+            else
+                ++it;
+        }
+
+        if (results.size() == 0)
+        {
+            mNumFacing = 0;
+        }
+        else if (results.size() == 1)
+        {
+            beginSingleFacedQueryProcess (query, results);
+        }
+        else
+        {
+            beginDoubleFacedQueryProcess (query, results);
+        }
+    }
+
+    void World::beginSingleFacedQueryProcess (MWRender::OcclusionQuery* query, std::vector < std::pair < float, std::string > > const & results)
+    {
+        mFaced1 = getPtrViaHandle(results.front().second);
+        mFaced1Name = results.front().second;
+        mFaced1Distance = results.front().first;
+        mNumFacing = 1;
+
+        btVector3 p;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+        {
+            float x, y;
+            MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
+            p = mPhysics->getRayPoint(results.front().first, x, y);
+        }
+        else
+            p = mPhysics->getRayPoint(results.front().first);
+        Ogre::Vector3 pos(p.x(), p.z(), -p.y());
+        Ogre::SceneNode* node = mFaced1.getRefData().getBaseNode();
+
+        //std::cout << "Num facing 1 : " << mFaced1Name <<  std::endl;
+        //std::cout << "Type 1 " << mFaced1.getTypeName() <<  std::endl;
+
+        query->occlusionTest(pos, node);
+    }
+
+    void World::beginDoubleFacedQueryProcess (MWRender::OcclusionQuery* query, std::vector < std::pair < float, std::string > > const & results)
+    {
+        mFaced1Name = results.at (0).second;
+        mFaced2Name = results.at (1).second;
+        mFaced1Distance = results.at (0).first;
+        mFaced2Distance = results.at (1).first;
+        mFaced1 = getPtrViaHandle(results.at (0).second);
+        mFaced2 = getPtrViaHandle(results.at (1).second);
+        mNumFacing = 2;
+
+        btVector3 p;
+        if (MWBase::Environment::get().getWindowManager()->isGuiMode())
+        {
+            float x, y;
+            MWBase::Environment::get().getWindowManager()->getMousePosition(x, y);
+            p = mPhysics->getRayPoint(results.at (1).first, x, y);
+        }
+        else
+            p = mPhysics->getRayPoint(results.at (1).first);
+        Ogre::Vector3 pos(p.x(), p.z(), -p.y());
+        Ogre::SceneNode* node1 = mFaced1.getRefData().getBaseNode();
+        Ogre::SceneNode* node2 = mFaced2.getRefData().getBaseNode();
+
+        // no need to test if the first node is not occluder
+        if (!query->isPotentialOccluder(node1) && (mFaced1.getTypeName().find("Static") == std::string::npos))
+        {
+            mFacedHandle = mFaced1Name;
+            mFacedDistance = mFaced1Distance;
+            //std::cout << "node1 Not an occluder" << std::endl;
+            return;
+        }
+
+        // no need to test if the second object is static (thus cannot be activated)
+        if (mFaced2.getTypeName().find("Static") != std::string::npos)
+        {
+            mFacedHandle = mFaced1Name;
+            mFacedDistance = mFaced1Distance;
+            return;
+        }
+
+        // work around door problems
+        if (mFaced1.getTypeName().find("Static") != std::string::npos
+            && mFaced2.getTypeName().find("Door") != std::string::npos)
+        {
+            mFacedHandle = mFaced2Name;
+            mFacedDistance = mFaced2Distance;
+            return;
+        }
+
+        query->occlusionTest(pos, node2);
+    }
+
     bool World::isCellExterior() const
     {
         Ptr::CellStore *currentCell = mWorldScene->getCurrentCell();
@@ -1091,28 +1266,7 @@ namespace MWWorld
             if (ref.mRef.mTeleport)
             {
                 World::DoorMarker newMarker;
-
-                std::string dest;
-                if (ref.mRef.mDestCell != "")
-                {
-                    // door leads to an interior, use interior name
-                    dest = ref.mRef.mDestCell;
-                }
-                else
-                {
-                    // door leads to exterior, use cell name (if any), otherwise translated region name
-                    int x,y;
-                    positionToIndex (ref.mRef.mDoorDest.pos[0], ref.mRef.mDoorDest.pos[1], x, y);
-                    const ESM::Cell* cell = mStore.get<ESM::Cell>().find(x,y);
-                    if (cell->mName != "")
-                        dest = cell->mName;
-                    else
-                    {
-                        dest = mStore.get<ESM::Region>().find(cell->mRegion)->mName;
-                    }
-                }
-
-                newMarker.name = dest;
+                newMarker.name = MWClass::Door::getDestination(ref);
 
                 ESM::Position pos = ref.mData.getPosition ();
 
@@ -1207,15 +1361,16 @@ namespace MWWorld
             if (!script.empty()) {
                 mLocalScripts.add(script, dropped);
             }
+            addContainerScripts(dropped, &cell);
         }
     }
 
-    void World::dropObjectOnGround (const Ptr& object)
+    void World::dropObjectOnGround (const Ptr& actor, const Ptr& object)
     {
-        MWWorld::Ptr::CellStore* cell = getPlayer().getPlayer().getCell();
+        MWWorld::Ptr::CellStore* cell = actor.getCell();
 
         ESM::Position pos =
-            getPlayer().getPlayer().getRefData().getPosition();
+            actor.getRefData().getPosition();
 
         Ogre::Vector3 orig =
             Ogre::Vector3(pos.pos[0], pos.pos[1], pos.pos[2]);
@@ -1297,4 +1452,14 @@ namespace MWWorld
         return 0;
 
     }
+
+    void World::playVideo (const std::string &name, bool allowSkipping)
+    {
+        mRendering->playVideo(name, allowSkipping);
+    }
+
+    void World::stopVideo ()
+    {
+        mRendering->stopVideo();
+    }
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index f904ea275..3bd7935e7 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -71,11 +71,15 @@ namespace MWWorld
 
             Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore);
 
+            int mActivationDistanceOverride;
             std::string mFacedHandle;
+            float mFacedDistance;
             Ptr mFaced1;
             Ptr mFaced2;
             std::string mFaced1Name;
             std::string mFaced2Name;
+            float mFaced1Distance;
+            float mFaced2Distance;
             int mNumFacing;
             std::map<std::string,std::string> mFallback;
 
@@ -90,13 +94,27 @@ namespace MWWorld
             virtual void
             copyObjectToCell(const Ptr &ptr, CellStore &cell, const ESM::Position &pos);
 
+            void updateWindowManager ();
+            void performUpdateSceneQueries ();
+            void processFacedQueryResults (MWRender::OcclusionQuery* query);
+            void beginFacedQueryProcess (MWRender::OcclusionQuery* query);
+            void beginSingleFacedQueryProcess (MWRender::OcclusionQuery* query, std::vector < std::pair < float, std::string > > const & results);
+            void beginDoubleFacedQueryProcess (MWRender::OcclusionQuery* query, std::vector < std::pair < float, std::string > > const & results);
+
+            float getMaxActivationDistance ();
+            float getNpcActivationDistance ();
+            float getObjectActivationDistance ();
+
+            void removeContainerScripts(const Ptr& reference);
+            void addContainerScripts(const Ptr& reference, Ptr::CellStore* cell);
+
         public:
 
             World (OEngine::Render::OgreRenderer& renderer,
                 const Files::Collections& fileCollections,
                 const std::vector<std::string>& master, const std::vector<std::string>& plugins,
         	const boost::filesystem::path& resDir, const boost::filesystem::path& cacheDir, bool newGame,
-                const std::string& encoding, std::map<std::string,std::string> fallbackMap);
+                ToUTF8::Utf8Encoder* encoder, std::map<std::string,std::string> fallbackMap, int mActivationDistanceOverride);
 
             virtual ~World();
 
@@ -154,6 +172,13 @@ namespace MWWorld
 
             virtual char getGlobalVariableType (const std::string& name) const;
             ///< Return ' ', if there is no global variable with this name.
+            
+            virtual std::vector<std::string> getGlobals () const;
+            
+            virtual std::string getCurrentCellName () const;
+            
+            virtual void removeRefScript (MWWorld::RefData *ref);
+            //< Remove the script attached to ref from mLocalScripts
 
             virtual Ptr getPtr (const std::string& name, bool activeOnly);
             ///< Return a pointer to a liveCellRef with the given name.
@@ -214,8 +239,8 @@ namespace MWWorld
 
             virtual void markCellAsUnchanged();
 
-            virtual std::string getFacedHandle();
-            ///< Return handle of the object the player is looking at
+            virtual MWWorld::Ptr getFacedObject();
+            ///< Return pointer to the object the player is looking at, if it is within activation range
 
             virtual void deleteObject (const Ptr& ptr);
 
@@ -229,7 +254,7 @@ namespace MWWorld
             virtual void rotateObject (const Ptr& ptr,float x,float y,float z, bool adjust = false);
 
             virtual void safePlaceObject(const MWWorld::Ptr& ptr,MWWorld::CellStore &Cell,ESM::Position pos);
-            ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr. 
+            ///< place an object in a "safe" location (ie not in the void, etc). Makes a copy of the Ptr.
 
             virtual void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false)
                 const;
@@ -293,7 +318,7 @@ namespace MWWorld
             /// @param cursor Y (relative 0-1)
             /// @return true if the object was placed, or false if it was rejected because the position is too far away
 
-            virtual void dropObjectOnGround (const Ptr& object);
+            virtual void dropObjectOnGround (const Ptr& actor, const Ptr& object);
 
             virtual bool canPlaceObject(float cursorX, float cursorY);
             ///< @return true if it is possible to place on object at specified cursor location
@@ -324,7 +349,7 @@ namespace MWWorld
             }
 
             virtual void renderPlayer();
-            
+
             virtual void setupExternalRendering (MWRender::ExternalRendering& rendering);
 
             virtual int canRest();
@@ -333,6 +358,10 @@ namespace MWWorld
             /// 1 - only waiting \n
             /// 2 - player is underwater \n
             /// 3 - enemies are nearby (not implemented)
+
+            /// \todo this does not belong here
+            virtual void playVideo(const std::string& name, bool allowSkipping);
+            virtual void stopVideo();
     };
 }
 
diff --git a/cmake/FindBullet.cmake b/cmake/FindBullet.cmake
index 8d5ea2f1e..97feddffe 100644
--- a/cmake/FindBullet.cmake
+++ b/cmake/FindBullet.cmake
@@ -27,6 +27,8 @@ macro(_FIND_BULLET_LIBRARY _var)
         ${ARGN}
      PATHS
         ${BULLET_ROOT}
+		${BULLET_ROOT}/lib/Debug
+		${BULLET_ROOT}/lib/Release
         ${BULLET_ROOT}/out/release8/libs
         ${BULLET_ROOT}/out/debug8/libs
      PATH_SUFFIXES lib
diff --git a/cmake/FindFFMPEG.cmake b/cmake/FindFFMPEG.cmake
deleted file mode 100644
index 2e755d047..000000000
--- a/cmake/FindFFMPEG.cmake
+++ /dev/null
@@ -1,105 +0,0 @@
-# Find the FFmpeg library
-#
-# Sets
-#   FFMPEG_FOUND.  If false, don't try to use ffmpeg
-#   FFMPEG_INCLUDE_DIR
-#   FFMPEG_LIBRARIES
-#
-# Modified by Nicolay Korslund for OpenMW
-
-SET( FFMPEG_FOUND "NO" )
-
-FIND_PATH( FFMPEG_general_INCLUDE_DIR libavcodec/avcodec.h libavformat/avformat.h
-  HINTS
-  PATHS
-  /usr/include
-  /usr/local/include
-  /usr/include/ffmpeg
-  /usr/local/include/ffmpeg
-  /usr/include/ffmpeg/libavcodec
-  /usr/local/include/ffmpeg/libavcodec
-  /usr/include/libavcodec
-  /usr/local/include/libavcodec
-  )
-
-FIND_PATH( FFMPEG_avcodec_INCLUDE_DIR avcodec.h
-  HINTS
-  PATHS
-  ${FFMPEG_general_INCLUDE_DIR}/libavcodec
-  /usr/include
-  /usr/local/include
-  /usr/include/ffmpeg
-  /usr/local/include/ffmpeg
-  /usr/include/ffmpeg/libavcodec
-  /usr/local/include/ffmpeg/libavcodec
-  /usr/include/libavcodec
-  /usr/local/include/libavcodec
-)
-
-FIND_PATH( FFMPEG_avformat_INCLUDE_DIR avformat.h
-  HINTS
-  PATHS
-  ${FFMPEG_general_INCLUDE_DIR}/libavformat
-  /usr/include
-  /usr/local/include
-  /usr/include/ffmpeg
-  /usr/local/include/ffmpeg
-  /usr/include/ffmpeg/libavformat
-  /usr/local/include/ffmpeg/libavformat
-  /usr/include/libavformat
-  /usr/local/include/libavformat
-)
-
-set(FFMPEG_INCLUDE_DIR ${FFMPEG_general_INCLUDE_DIR} ${FFMPEG_avcodec_INCLUDE_DIR} ${FFMPEG_avformat_INCLUDE_DIR})
-
-IF( FFMPEG_INCLUDE_DIR )
-
-FIND_PROGRAM( FFMPEG_CONFIG ffmpeg-config
-  /usr/bin
-  /usr/local/bin
-  ${HOME}/bin
-)
-
-IF( FFMPEG_CONFIG )
-  EXEC_PROGRAM( ${FFMPEG_CONFIG} ARGS "--libs avformat" OUTPUT_VARIABLE FFMPEG_LIBS )
-  SET( FFMPEG_FOUND "YES" )
-  SET( FFMPEG_LIBRARIES "${FFMPEG_LIBS}" )
-  
-ELSE( FFMPEG_CONFIG )
-
-  FIND_LIBRARY( FFMPEG_avcodec_LIBRARY avcodec
-    /usr/lib
-    /usr/local/lib
-    /usr/lib64
-    /usr/local/lib64
-  )
-
-  FIND_LIBRARY( FFMPEG_avformat_LIBRARY avformat
-    /usr/lib
-    /usr/local/lib
-    /usr/lib64
-    /usr/local/lib64
-  )
-  
-  FIND_LIBRARY( FFMPEG_avutil_LIBRARY avutil
-    /usr/lib
-    /usr/local/lib
-    /usr/lib64
-    /usr/local/lib64
-  )
-  
-  IF( FFMPEG_avcodec_LIBRARY )
-  IF( FFMPEG_avformat_LIBRARY )
-
-    SET( FFMPEG_FOUND "YES" )
-    SET( FFMPEG_LIBRARIES ${FFMPEG_avformat_LIBRARY} ${FFMPEG_avcodec_LIBRARY} )
-    IF( FFMPEG_avutil_LIBRARY )
-       SET( FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_avutil_LIBRARY} )
-    ENDIF( FFMPEG_avutil_LIBRARY )
-
-  ENDIF( FFMPEG_avformat_LIBRARY )
-  ENDIF( FFMPEG_avcodec_LIBRARY )
-
-ENDIF( FFMPEG_CONFIG )
-
-ENDIF( FFMPEG_INCLUDE_DIR )
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
new file mode 100644
index 000000000..c80203a25
--- /dev/null
+++ b/cmake/FindFFmpeg.cmake
@@ -0,0 +1,148 @@
+# vim: ts=2 sw=2
+# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC)
+#
+# Once done this will define
+#  FFMPEG_FOUND         - System has the all required components.
+#  FFMPEG_INCLUDE_DIRS  - Include directory necessary for using the required components headers.
+#  FFMPEG_LIBRARIES     - Link these to use the required ffmpeg components.
+#  FFMPEG_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
+#
+# For each of the components it will additionaly set.
+#   - AVCODEC
+#   - AVDEVICE
+#   - AVFORMAT
+#   - AVUTIL
+#   - POSTPROCESS
+#   - SWSCALE
+# the following variables will be defined
+#  <component>_FOUND        - System has <component>
+#  <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
+#  <component>_LIBRARIES    - Link these to use <component>
+#  <component>_DEFINITIONS  - Compiler switches required for using <component>
+#  <component>_VERSION      - The components version
+#
+# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
+# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(FindPackageHandleStandardArgs)
+
+# The default components were taken from a survey over other FindFFMPEG.cmake files
+if (NOT FFmpeg_FIND_COMPONENTS)
+  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
+endif ()
+
+#
+### Macro: set_component_found
+#
+# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present.
+#
+macro(set_component_found _component )
+  if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS)
+    # message(STATUS "  - ${_component} found.")
+    set(${_component}_FOUND TRUE)
+  else ()
+    # message(STATUS "  - ${_component} not found.")
+  endif ()
+endmacro()
+
+#
+### Macro: find_component
+#
+# Checks for the given component by invoking pkgconfig and then looking up the libraries and
+# include directories.
+#
+macro(find_component _component _pkgconfig _library _header)
+
+  if (NOT WIN32)
+     # use pkg-config to get the directories and then use these values
+     # in the FIND_PATH() and FIND_LIBRARY() calls
+     find_package(PkgConfig)
+     if (PKG_CONFIG_FOUND)
+       pkg_check_modules(PC_${_component} ${_pkgconfig})
+     endif ()
+  endif (NOT WIN32)
+
+  find_path(${_component}_INCLUDE_DIRS ${_header}
+    HINTS
+      ${PC_LIB${_component}_INCLUDEDIR}
+      ${PC_LIB${_component}_INCLUDE_DIRS}
+    PATH_SUFFIXES
+      ffmpeg
+  )
+
+  find_library(${_component}_LIBRARIES NAMES ${_library}
+      HINTS
+      ${PC_LIB${_component}_LIBDIR}
+      ${PC_LIB${_component}_LIBRARY_DIRS}
+  )
+
+  set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
+  set(${_component}_VERSION      ${PC_${_component}_VERSION}      CACHE STRING "The ${_component} version number.")
+
+  set_component_found(${_component})
+
+  mark_as_advanced(
+    ${_component}_INCLUDE_DIRS
+    ${_component}_LIBRARIES
+    ${_component}_DEFINITIONS
+    ${_component}_VERSION)
+
+endmacro()
+
+
+# Check for cached results. If there are skip the costly part.
+if (NOT FFMPEG_LIBRARIES)
+
+  # Check for all possible component.
+  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
+  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
+  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
+  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
+
+  # Check if the required components were found and add their stuff to the FFMPEG_* vars.
+  foreach (_component ${FFmpeg_FIND_COMPONENTS})
+    if (${_component}_FOUND)
+      # message(STATUS "Required component ${_component} present.")
+      set(FFMPEG_LIBRARIES   ${FFMPEG_LIBRARIES}   ${${_component}_LIBRARIES})
+      set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS})
+      list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
+    else ()
+      # message(STATUS "Required component ${_component} missing.")
+    endif ()
+  endforeach ()
+
+  # Build the include path with duplicates removed.
+  if (FFMPEG_INCLUDE_DIRS)
+    list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
+  endif ()
+
+  # cache the vars.
+  set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
+  set(FFMPEG_LIBRARIES    ${FFMPEG_LIBRARIES}    CACHE STRING "The FFmpeg libraries." FORCE)
+  set(FFMPEG_DEFINITIONS  ${FFMPEG_DEFINITIONS}  CACHE STRING "The FFmpeg cflags." FORCE)
+
+  mark_as_advanced(FFMPEG_INCLUDE_DIRS
+                   FFMPEG_LIBRARIES
+                   FFMPEG_DEFINITIONS)
+
+endif ()
+
+# Now set the noncached _FOUND vars for the components.
+foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE)
+  set_component_found(${_component})
+endforeach ()
+
+# Compile the list of required vars
+set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
+foreach (_component ${FFmpeg_FIND_COMPONENTS})
+  list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS)
+endforeach ()
+
+# Give a nice error message if some of the required vars are missing.
+find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS})
diff --git a/cmake/FindSDL.cmake b/cmake/FindSDL.cmake
new file mode 100644
index 000000000..0dc02f5b6
--- /dev/null
+++ b/cmake/FindSDL.cmake
@@ -0,0 +1,177 @@
+# Locate SDL library
+# This module defines
+# SDL_LIBRARY, the name of the library to link against
+# SDL_FOUND, if false, do not try to link to SDL
+# SDL_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL_BUILDING_LIBRARY
+# If this is defined, then no SDL_main will be linked in because 
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL_LIBRARY variable.
+#
+# Don't forget to include SDLmain.h and SDLmain.m your project for the 
+# OS X framework based version. (Other versions link to -lSDLmain which
+# this module will try to find on your behalf.) Also for OS X, this 
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL_LIBRARY_TEMP in your configuration
+# and no SDL_LIBRARY, it means CMake did not find your SDL library 
+# (SDL.dll, libsdl.so, SDL.framework, etc). 
+# Set SDL_LIBRARY_TEMP to point to your SDL library, and configure again. 
+# Similarly, if you see an empty SDLMAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL_LIBRARY
+# variable, but when these values are unset, SDL_LIBRARY does not get created.
+#
+#
+# $SDLDIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDLDIR
+# used in building SDL.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing. 
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and 
+# additional Unix paths (FreeBSD, etc). 
+# Also corrected the header search path to follow "proper" SDL guidelines.
+# Added a search for SDLmain which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of 
+# SDL_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL/SDL.h to just SDL.h
+# This needed to change because "proper" SDL convention
+# is #include "SDL.h", not <SDL/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL/ (see FreeBSD).
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PATH(SDL_INCLUDE_DIR SDL.h
+  HINTS
+  $ENV{SDLDIR}
+  PATH_SUFFIXES include/SDL include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local/include/SDL12
+  /usr/local/include/SDL11 # FreeBSD ports
+  /usr/include/SDL12
+  /usr/include/SDL11
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
+
+# SDL-1.1 is the name used by FreeBSD ports...
+# don't confuse it for the version number.
+FIND_LIBRARY(SDL_LIBRARY_TEMP 
+  NAMES SDL SDL-1.1
+  HINTS
+  $ENV{SDLDIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
+
+IF(NOT SDL_BUILDING_LIBRARY)
+  IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+    # Non-OS X framework versions expect you to also dynamically link to 
+    # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms 
+    # seem to provide SDLmain for compatibility even though they don't
+    # necessarily need it.
+    FIND_LIBRARY(SDLMAIN_LIBRARY 
+      NAMES SDLmain SDLmain-1.1
+      HINTS
+      $ENV{SDLDIR}
+      PATH_SUFFIXES lib64 lib
+      PATHS
+      /sw
+      /opt/local
+      /opt/csw
+      /opt
+    )
+  ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL_BUILDING_LIBRARY)
+
+# SDL may require threads on your system.
+# The Apple build may not need an explicit flag because one of the 
+# frameworks may already provide it. 
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+SET(SDL_FOUND "NO")
+IF(SDL_LIBRARY_TEMP)
+  # For SDLmain
+  IF(NOT SDL_BUILDING_LIBRARY)
+    IF(SDLMAIN_LIBRARY)
+      SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+    ENDIF(SDLMAIN_LIBRARY)
+  ENDIF(NOT SDL_BUILDING_LIBRARY)
+
+  # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
+  # CMake doesn't display the -framework Cocoa string in the UI even 
+  # though it actually is there if I modify a pre-used variable.
+  # I think it has something to do with the CACHE STRING.
+  # So I use a temporary variable until the end so I can set the 
+  # "real" variable in one-shot.
+  IF(APPLE)
+    SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
+  ENDIF(APPLE)
+    
+  # For threads, as mentioned Apple doesn't need this.
+  # In fact, there seems to be a problem if I used the Threads package
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  IF(NOT APPLE)
+    SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  ENDIF(NOT APPLE)
+
+  # For MinGW library
+  IF(MINGW)
+    SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
+  ENDIF(MINGW)
+
+  # Set the final string here so the GUI reflects the final state.
+  SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
+  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+  SET(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "")
+
+  SET(SDL_FOUND "YES")
+ENDIF(SDL_LIBRARY_TEMP)
+
+#MESSAGE("SDL_LIBRARY is ${SDL_LIBRARY}")
+
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 29d6f46cd..3da09ecb8 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -48,7 +48,7 @@ add_component_dir (misc
 
 add_component_dir (files
     linuxpath windowspath macospath fixedpath multidircollection collections fileops configurationmanager
-    filelibrary ogreplugin
+    filelibrary ogreplugin constrainedfiledatastream lowlevelfile
     )
 
 add_component_dir (compiler
@@ -59,7 +59,11 @@ add_component_dir (compiler
 
 add_component_dir (interpreter
     context controlopcodes genericopcodes installopcodes interpreter localopcodes mathopcodes
-    miscopcodes opcodes runtime scriptopcodes spatialopcodes types
+    miscopcodes opcodes runtime scriptopcodes spatialopcodes types defines
+    )
+
+add_component_dir (translation
+    translation
     )
 
 include_directories(${BULLET_INCLUDE_DIRS})
diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 8380b0838..5274564a6 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -29,135 +29,71 @@
 #include <OgreArchiveManager.h>
 #include "bsa_file.hpp"
 
-namespace
-{
+#include "../files/constrainedfiledatastream.hpp"
 
 using namespace Ogre;
-using namespace Bsa;
-
-struct ciLessBoost : std::binary_function<std::string, std::string, bool>
-{
-    bool operator() (const std::string & s1, const std::string & s2) const {
-                                               //case insensitive version of is_less
-        return boost::ilexicographical_compare(s1, s2);
-    }
-};
-
-struct pathComparer
-{
-private:
-    std::string find;
-
-public:
-    pathComparer(const std::string& toFind) : find(toFind) { }
-
-    bool operator() (const std::string& other)
-    {
-        return boost::iequals(find, other);
-    }
-};
 
 static bool fsstrict = false;
 
-/// An OGRE Archive wrapping a BSAFile archive
-class DirArchive: public Ogre::FileSystemArchive
+static char strict_normalize_char(char ch)
 {
-    boost::filesystem::path currentdir;
-    std::map<std::string, std::vector<std::string>, ciLessBoost> m;
-    unsigned int cutoff;
+    return ch == '\\' ? '/' : ch;
+}
 
-    bool findFile(const String& filename, std::string& copy) const
+static char nonstrict_normalize_char(char ch)
+{
+    return ch == '\\' ? '/' : std::tolower(ch);
+}
+
+template<typename T1, typename T2>
+static std::string normalize_path(T1 begin, T2 end)
+{
+    std::string normalized;
+    normalized.reserve(std::distance(begin, end));
+    char (*normalize_char)(char) = fsstrict ? &strict_normalize_char : &nonstrict_normalize_char;
+    std::transform(begin, end, std::back_inserter(normalized), normalize_char);
+    return normalized;
+}
+
+/// An OGRE Archive wrapping a BSAFile archive
+class DirArchive: public Ogre::Archive
+{
+    typedef std::map <std::string, std::string> index;
+
+    index mIndex;
+
+    index::const_iterator lookup_filename (std::string const & filename) const
     {
-        copy = filename;
-        std::replace(copy.begin(), copy.end(), '\\', '/');
-
-        if(copy.at(0) == '/')
-            copy.erase(0, 1);
-
-        if(fsstrict == true)
-            return true;
-
-        std::string folder;
-        //int delimiter = 0;
-        size_t lastSlash = copy.rfind('/');
-        if (lastSlash != std::string::npos)
-        {
-            folder = copy.substr(0, lastSlash);
-            //delimiter = lastSlash+1;
-        }
-
-        std::vector<std::string> current;
-        {
-            std::map<std::string,std::vector<std::string>,ciLessBoost>::const_iterator found = m.find(folder);
-
-            if (found == m.end())
-            {
-                return false;
-            }
-            else
-                current = found->second;
-        }
-
-        std::vector<std::string>::iterator find = std::lower_bound(current.begin(), current.end(), copy, ciLessBoost());
-        if (find != current.end() && !ciLessBoost()(copy, current.front()))
-        {
-            if (!boost::iequals(copy, *find))
-                if ((find = std::find_if(current.begin(), current.end(), pathComparer(copy))) == current.end()) //\todo Check if this line is actually needed
-                    return false;
-
-            copy = *find;
-            return true;
-        }
-
-        return false;
+        std::string normalized = normalize_path (filename.begin (), filename.end ());
+        return mIndex.find (normalized);
     }
 
-    public:
+public:
 
     DirArchive(const String& name)
-    : FileSystemArchive(name, "Dir"), currentdir (name)
+        : Archive(name, "Dir")
     {
-        mType = "Dir";
-        std::string s = name;
-        cutoff = s.size() + 1;
-        if(fsstrict == false)
-            populateMap(currentdir);
+        typedef boost::filesystem::recursive_directory_iterator directory_iterator;
 
-  }
-  void populateMap(boost::filesystem::path d){
-     //need to cut off first
-      boost::filesystem::directory_iterator dir_iter(d), dir_end;
-      std::vector<std::string> filesind;
-      for(;dir_iter != dir_end; dir_iter++)
-    {
-        if(boost::filesystem::is_directory(*dir_iter))
-            populateMap(*dir_iter);
-        else
+        directory_iterator end;
+
+        size_t prefix = name.size ();
+
+        if (name.size () > 0 && name [prefix - 1] != '\\' && name [prefix - 1] != '/')
+            ++prefix;
+
+        for (directory_iterator i (name); i != end; ++i)
         {
-            std::string s = dir_iter->path().string();
-            std::replace(s.begin(), s.end(), '\\', '/');
+            if(boost::filesystem::is_directory (*i))
+                continue;
 
-            std::string small;
-            if(cutoff < s.size())
-                small = s.substr(cutoff, s.size() - cutoff);
-            else
-                small = s.substr(cutoff - 1, s.size() - cutoff);
+            std::string proper = i->path ().string ();
 
-            filesind.push_back(small);
+            std::string searchable = normalize_path (proper.begin () + prefix, proper.end ());
+
+            mIndex.insert (std::make_pair (std::move (searchable), std::move (proper)));
         }
     }
-    std::sort(filesind.begin(), filesind.end(), ciLessBoost());
-
-    std::string small;
-    std::string original = d.string();
-    std::replace(original.begin(), original.end(), '\\', '/');
-    if(cutoff < original.size())
-        small = original.substr(cutoff, original.size() - cutoff);
-    else
-        small = original.substr(cutoff - 1, original.size() - cutoff);
-
-    m[small] = filesind;
-  }
 
     bool isCaseSensitive() const { return fsstrict; }
 
@@ -165,31 +101,106 @@ class DirArchive: public Ogre::FileSystemArchive
     void load() {}
     void unload() {}
 
-     bool exists(const String& filename) {
-        std::string copy;
-
-        if (findFile(filename, copy))
-            return FileSystemArchive::exists(copy);
-
-      return false;
-     }
-
     DataStreamPtr open(const String& filename, bool readonly = true) const
-  {
-        std::string copy;
+    {
+        index::const_iterator i = lookup_filename (filename);
 
-        if (findFile(filename, copy))
-            return FileSystemArchive::open(copy, readonly);
+        if (i == mIndex.end ())
+        {
+            std::ostringstream os;
+            os << "The file '" << filename << "' could not be found.";
+            throw std::runtime_error (os.str ());
+        }
 
-        DataStreamPtr p;
-      return p;
-  }
+        return openConstrainedFileDataStream (i->second.c_str ());
+    }
 
+    StringVectorPtr list(bool recursive = true, bool dirs = false)
+    {
+        return find ("*", recursive, dirs);
+    }
+
+    FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false)
+    {
+        return findFileInfo ("*", recursive, dirs);
+    }
+
+    StringVectorPtr find(const String& pattern, bool recursive = true,
+                        bool dirs = false)
+    {
+        std::string normalizedPattern = normalize_path(pattern.begin(), pattern.end());
+        StringVectorPtr ptr = StringVectorPtr(new StringVector());
+        for(index::const_iterator iter = mIndex.begin();iter != mIndex.end();iter++)
+        {
+            if(Ogre::StringUtil::match(iter->first, normalizedPattern) ||
+               (recursive && Ogre::StringUtil::match(iter->first, "*/"+normalizedPattern)))
+                ptr->push_back(iter->first);
+        }
+        return ptr;
+    }
+
+    bool exists(const String& filename)
+    {
+        return lookup_filename(filename) != mIndex.end ();
+    }
+
+    time_t getModifiedTime(const String&) { return 0; }
+
+    FileInfoListPtr findFileInfo(const String& pattern, bool recursive = true,
+                            bool dirs = false) const
+    {
+        std::string normalizedPattern = normalize_path(pattern.begin(), pattern.end());
+        FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
+
+        index::const_iterator i = mIndex.find(normalizedPattern);
+        if(i != mIndex.end())
+        {
+            std::string::size_type pt = i->first.rfind('/');
+            if(pt == std::string::npos)
+                pt = 0;
+
+            FileInfo fi;
+            fi.archive = const_cast<DirArchive*>(this);
+            fi.path = i->first.substr(0, pt);
+            fi.filename = i->first.substr((i->first[pt]=='/') ? pt+1 : pt);
+            fi.compressedSize = fi.uncompressedSize = 0;
+
+            ptr->push_back(fi);
+        }
+        else
+        {
+            for(index::const_iterator iter = mIndex.begin();iter != mIndex.end();iter++)
+            {
+                if(Ogre::StringUtil::match(iter->first, normalizedPattern) ||
+                   (recursive && Ogre::StringUtil::match(iter->first, "*/"+normalizedPattern)))
+                {
+                    std::string::size_type pt = iter->first.rfind('/');
+                    if(pt == std::string::npos)
+                        pt = 0;
+
+                    FileInfo fi;
+                    fi.archive = const_cast<DirArchive*>(this);
+                    fi.path = iter->first.substr(0, pt);
+                    fi.filename = iter->first.substr((iter->first[pt]=='/') ? pt+1 : pt);
+                    fi.compressedSize = fi.uncompressedSize = 0;
+
+                    ptr->push_back(fi);
+                }
+            }
+        }
+
+        return ptr;
+    }
 };
 
 class BSAArchive : public Archive
 {
-  BSAFile arc;
+  Bsa::BSAFile arc;
+
+  static const char *extractFilename(const Bsa::BSAFile::FileStruct &entry)
+  {
+      return entry.name;
+  }
 
 public:
   BSAArchive(const String& name)
@@ -202,13 +213,13 @@ public:
   void load() {}
   void unload() {}
 
-  DataStreamPtr open(const String& filename, bool recursive = true) const
+  DataStreamPtr open(const String& filename, bool readonly = true) const
   {
     // Get a non-const reference to arc. This is a hack and it's all
     // OGRE's fault. You should NOT expect an open() command not to
     // have any side effects on the archive, and hence this function
     // should not have been declared const in the first place.
-    BSAFile *narc = const_cast<BSAFile*>(&arc);
+    Bsa::BSAFile *narc = const_cast<Bsa::BSAFile*>(&arc);
 
     // Open the file
     return narc->getFile(filename.c_str());
@@ -218,93 +229,65 @@ public:
     return arc.exists(filename.c_str());
   }
 
-  bool cexists(const String& filename) const {
-    return arc.exists(filename.c_str());
-  }
-
   time_t getModifiedTime(const String&) { return 0; }
 
   // This is never called as far as I can see.
   StringVectorPtr list(bool recursive = true, bool dirs = false)
   {
-    //std::cout << "list(" << recursive << ", " << dirs << ")\n";
-    StringVectorPtr ptr = StringVectorPtr(new StringVector());
-    return ptr;
+    return find ("*", recursive, dirs);
   }
 
   // Also never called.
   FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false)
   {
-    //std::cout << "listFileInfo(" << recursive << ", " << dirs << ")\n";
-    FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
-    return ptr;
+    return findFileInfo ("*", recursive, dirs);
   }
 
-  // After load() is called, find("*") is called once. It doesn't seem
-  // to matter that we return an empty list, exists() gets called on
-  // the correct files anyway.
-  StringVectorPtr find(const String& pattern, bool recursive = true,
-                       bool dirs = false)
-  {
-    //std::cout << "find(" << pattern << ", " << recursive
-    //          << ", " << dirs << ")\n";
-    StringVectorPtr ptr = StringVectorPtr(new StringVector());
-    return ptr;
-  }
+    StringVectorPtr find(const String& pattern, bool recursive = true,
+                         bool dirs = false)
+    {
+        std::string normalizedPattern = normalize_path(pattern.begin(), pattern.end());
+        const Bsa::BSAFile::FileList &filelist = arc.getList();
+        StringVectorPtr ptr = StringVectorPtr(new StringVector());
+        for(Bsa::BSAFile::FileList::const_iterator iter = filelist.begin();iter != filelist.end();iter++)
+        {
+            std::string ent = normalize_path(iter->name, iter->name+std::strlen(iter->name));
+            if(Ogre::StringUtil::match(ent, normalizedPattern) ||
+               (recursive && Ogre::StringUtil::match(ent, "*/"+normalizedPattern)))
+                ptr->push_back(iter->name);
+        }
+        return ptr;
+    }
 
-  /* Gets called once for each of the ogre formats, *.program,
-     *.material etc. We ignore all these.
+    FileInfoListPtr findFileInfo(const String& pattern, bool recursive = true,
+                                bool dirs = false) const
+    {
+        std::string normalizedPattern = normalize_path(pattern.begin(), pattern.end());
+        FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
+        const Bsa::BSAFile::FileList &filelist = arc.getList();
 
-     However, it's also called by MyGUI to find individual textures,
-     and we can't ignore these since many of the GUI textures are
-     located in BSAs. So instead we channel it through exists() and
-     set up a single-element result list if the file is found.
-  */
-  FileInfoListPtr findFileInfo(const String& pattern, bool recursive = true,
-                               bool dirs = false) const
-  {
-      FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
+        for(Bsa::BSAFile::FileList::const_iterator iter = filelist.begin();iter != filelist.end();iter++)
+        {
+            std::string ent = normalize_path(iter->name, iter->name+std::strlen(iter->name));
+            if(Ogre::StringUtil::match(ent, normalizedPattern) ||
+                (recursive && Ogre::StringUtil::match(ent, "*/"+normalizedPattern)))
+            {
+                std::string::size_type pt = ent.rfind('/');
+                if(pt == std::string::npos)
+                    pt = 0;
 
-    // Check if the file exists (only works for single files - wild
-    // cards and recursive search isn't implemented.)
-    if(cexists(pattern))
-      {
-        FileInfo fi;
-        fi.archive = this;
-        fi.filename = pattern;
-        // It apparently doesn't matter that we return bogus
-        // information
-        fi.path = "";
-        fi.compressedSize = fi.uncompressedSize = 0;
+                FileInfo fi;
+                fi.archive = const_cast<BSAArchive*>(this);
+                fi.path = std::string(iter->name, pt);
+                fi.filename = std::string(iter->name + ((ent[pt]=='/') ? pt+1 : pt));
+                fi.compressedSize = fi.uncompressedSize = iter->fileSize;
 
-        ptr->push_back(fi);
-      }
+                ptr->push_back(fi);
+            }
+        }
 
-    return ptr;
-  }
-
-  FileInfoListPtr findFileInfo(const String& pattern, bool recursive = true,
-                               bool dirs = false)
-  {
-    FileInfoListPtr ptr = FileInfoListPtr(new FileInfoList());
-
-    // Check if the file exists (only works for single files - wild
-    // cards and recursive search isn't implemented.)
-    if(cexists(pattern))
-      {
-        FileInfo fi;
-        fi.archive = this;
-        fi.filename = pattern;
-        // It apparently doesn't matter that we return bogus
-        // information
-        fi.path = "";
-        fi.compressedSize = fi.uncompressedSize = 0;
-
-        ptr->push_back(fi);
-      }
-
-    return ptr;
-  }
+        return ptr;
+    }
 };
 
 // An archive factory for BSA archives
@@ -364,7 +347,6 @@ static void insertDirFactory()
     }
 }
 
-}
 
 namespace Bsa
 {
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 1700e1aab..5e529e18e 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -23,94 +23,15 @@
 
 #include "bsa_file.hpp"
 
-#include <stdexcept>
-#include <cstdlib>
-#include <cassert>
+//#include <stdexcept>
+//#include <cstdlib>
+//#include <cassert>
 
-#include <OgreDataStream.h>
+#include "../files/constrainedfiledatastream.hpp"
 
 using namespace std;
 using namespace Bsa;
 
-class ConstrainedDataStream : public Ogre::DataStream {
-    std::ifstream mStream;
-    const size_t mStart;
-    size_t mPos;
-    bool mIsEOF;
-
-public:
-    ConstrainedDataStream(const Ogre::String &fname, size_t start, size_t length)
-      : mStream(fname.c_str(), std::ios_base::binary), mStart(start), mPos(0), mIsEOF(false)
-    {
-        mSize = length;
-        if(!mStream.seekg(mStart, std::ios_base::beg))
-            throw std::runtime_error("Error seeking to start of BSA entry");
-    }
-
-    ConstrainedDataStream(const Ogre::String &name, const Ogre::String &fname,
-                          size_t start, size_t length)
-      : Ogre::DataStream(name), mStream(fname.c_str(), std::ios_base::binary),
-        mStart(start), mPos(0), mIsEOF(false)
-    {
-        mSize = length;
-        if(!mStream.seekg(mStart, std::ios_base::beg))
-            throw std::runtime_error("Error seeking to start of BSA entry");
-    }
-
-
-    virtual size_t read(void *buf, size_t count)
-    {
-        mStream.clear();
-
-        if(count > mSize-mPos)
-        {
-            count = mSize-mPos;
-            mIsEOF = true;
-        }
-        mStream.read(reinterpret_cast<char*>(buf), count);
-
-        count = mStream.gcount();
-        mPos += count;
-        return count;
-    }
-
-    virtual void skip(long count)
-    {
-        if((count >= 0 && (size_t)count <= mSize-mPos) ||
-           (count < 0 && (size_t)-count <= mPos))
-        {
-            mStream.clear();
-            if(mStream.seekg(count, std::ios_base::cur))
-            {
-                mPos += count;
-                mIsEOF = false;
-            }
-        }
-    }
-
-    virtual void seek(size_t pos)
-    {
-        if(pos < mSize)
-        {
-            mStream.clear();
-            if(mStream.seekg(pos+mStart, std::ios_base::beg))
-            {
-                mPos = pos;
-                mIsEOF = false;
-            }
-        }
-    }
-
-    virtual size_t tell() const
-    { return mPos; }
-
-    virtual bool eof() const
-    { return mIsEOF; }
-
-    virtual void close()
-    { mStream.close(); }
-};
-
 
 /// Error handling
 void BSAFile::fail(const string &msg)
@@ -253,5 +174,5 @@ Ogre::DataStreamPtr BSAFile::getFile(const char *file)
         fail("File not found: " + string(file));
 
     const FileStruct &fs = files[i];
-    return Ogre::DataStreamPtr(new ConstrainedDataStream(filename, fs.offset, fs.fileSize));
+	return openConstrainedFileDataStream (filename.c_str (), fs.offset, fs.fileSize);
 }
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 52192625b..027f3de71 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -14,6 +14,7 @@
 #include "stringparser.hpp"
 #include "extensions.hpp"
 #include "context.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace Compiler
 {
@@ -199,8 +200,8 @@ namespace Compiler
     {
         mMemberOp = false;
 
-        std::string name2 = toLower (name);
-        std::string id = toLower (mExplicit);
+        std::string name2 = Misc::StringUtils::lowerCase (name);
+        std::string id = Misc::StringUtils::lowerCase (mExplicit);
 
         char type = getContext().getMemberType (name2, id);
 
@@ -285,7 +286,7 @@ namespace Compiler
         {
             start();
 
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
 
             char type = mLocals.getType (name2);
 
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index a4cbc1ffe..210d18dc9 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -8,6 +8,7 @@
 #include "locals.hpp"
 #include "generator.hpp"
 #include "extensions.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace Compiler
 {
@@ -91,13 +92,13 @@ namespace Compiler
                 return false;
             }
 
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
 
             char type = mLocals.getType (name2);
 
             if (type!=' ')
             {
-                getErrorHandler().error ("can't re-declare local variable", loc);
+                getErrorHandler().error ("catoLowern't re-declare local variable", loc);
                 SkipParser skip (getErrorHandler(), getContext());
                 scanner.scan (skip);
                 return false;
@@ -112,7 +113,7 @@ namespace Compiler
 
         if (mState==SetState)
         {
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
             mName = name2;
 
             // local variable?
@@ -138,7 +139,7 @@ namespace Compiler
 
         if (mState==SetMemberVarState)
         {
-            mMemberName = toLower (name);
+            mMemberName = Misc::StringUtils::lowerCase (name);
             char type = getContext().getMemberType (mMemberName, mName);
 
             if (type!=' ')
@@ -205,13 +206,13 @@ namespace Compiler
         if (mState==BeginState && getContext().isId (name))
         {
             mState = PotentialExplicitState;
-            mExplicit = toLower (name);
+            mExplicit = Misc::StringUtils::lowerCase (name);
             return true;
         }
 
         if (mState==BeginState && mAllowExpression)
         {
-            std::string name2 = toLower (name);
+            std::string name2 = Misc::StringUtils::lowerCase (name);
 
             char type = mLocals.getType (name2);
 
diff --git a/components/compiler/parser.cpp b/components/compiler/parser.cpp
index 90368eee0..896458e48 100644
--- a/components/compiler/parser.cpp
+++ b/components/compiler/parser.cpp
@@ -9,6 +9,8 @@
 #include "exception.hpp"
 #include "scanner.hpp"
 
+#include <components/misc/stringops.hpp>
+
 namespace Compiler
 {
     // Report the error and throw an exception.
@@ -57,10 +59,7 @@ namespace Compiler
 
     std::string Parser::toLower (const std::string& name)
     {
-        std::string lowerCase;
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
+        std::string lowerCase = Misc::StringUtils::lowerCase(name);
 
         return lowerCase;
     }
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index 962699dfa..7f43c36a5 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -11,6 +11,8 @@
 #include "parser.hpp"
 #include "extensions.hpp"
 
+#include <components/misc/stringops.hpp>
+
 namespace Compiler
 {
     bool Scanner::get (char& c)
@@ -268,11 +270,7 @@ namespace Compiler
 
         int i = 0;
 
-        std::string lowerCase;
-        lowerCase.reserve (name.size());
-
-        std::transform (name.begin(), name.end(), std::back_inserter (lowerCase),
-            (int(*)(int)) std::tolower);
+        std::string lowerCase = Misc::StringUtils::lowerCase(name);
 
         for (; keywords[i]; ++i)
             if (lowerCase==keywords[i])
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index 396a88c78..09c902131 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -6,6 +6,7 @@
 
 #include "scanner.hpp"
 #include "generator.hpp"
+#include <components/misc/stringops.hpp>
 
 namespace Compiler
 {
@@ -22,7 +23,7 @@ namespace Compiler
         {
             start();
             if (mSmashCase)
-                Generator::pushString (mCode, mLiterals, toLower (name));
+                Generator::pushString (mCode, mLiterals, Misc::StringUtils::lowerCase (name));
             else
                 Generator::pushString (mCode, mLiterals, name);
 
diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 2915a1ce7..eca0d7854 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -1,6 +1,8 @@
 #include "esmreader.hpp"
 #include <stdexcept>
 
+#include "../files/constrainedfiledatastream.hpp"
+
 namespace ESM
 {
 
@@ -13,6 +15,11 @@ ESM_Context ESMReader::getContext()
     return mCtx;
 }
 
+ESMReader::ESMReader(void):
+    mBuffer(50*1024)
+{
+}
+
 void ESMReader::restoreContext(const ESM_Context &rc)
 {
     // Reopen the file if necessary
@@ -108,16 +115,12 @@ void ESMReader::open(Ogre::DataStreamPtr _esm, const std::string &name)
 
 void ESMReader::open(const std::string &file)
 {
-    std::ifstream *stream = OGRE_NEW_T(std::ifstream, Ogre::MEMCATEGORY_GENERAL)(file.c_str(), std::ios_base::binary);
-    // Ogre will delete the stream for us
-    open(Ogre::DataStreamPtr(new Ogre::FileStreamDataStream(stream)), file);
+    open (openConstrainedFileDataStream (file.c_str ()), file);
 }
 
 void ESMReader::openRaw(const std::string &file)
 {
-    std::ifstream *stream = OGRE_NEW_T(std::ifstream, Ogre::MEMCATEGORY_GENERAL)(file.c_str(), std::ios_base::binary);
-    // Ogre will delete the stream for us
-    openRaw(Ogre::DataStreamPtr(new Ogre::FileStreamDataStream(stream)), file);
+    openRaw (openConstrainedFileDataStream (file.c_str ()), file);
 }
 
 int64_t ESMReader::getHNLong(const char *name)
@@ -325,11 +328,21 @@ void ESMReader::getExact(void*x, int size)
 
 std::string ESMReader::getString(int size)
 {
-    char *ptr = ToUTF8::getBuffer(size);
-    mEsm->read(ptr, size);
+    size_t s = size;
+    if (mBuffer.size() <= s)
+        // Add some extra padding to reduce the chance of having to resize
+        // again later.
+        mBuffer.resize(3*s);
+
+    // And make sure the string is zero terminated
+    mBuffer[s] = 0;
+
+    // read ESM data
+    char *ptr = &mBuffer[0];
+    getExact(ptr, size);
 
     // Convert to UTF8 and return
-    return ToUTF8::getUtf8(mEncoding);
+    return mEncoder->getUtf8(ptr, size);
 }
 
 void ESMReader::fail(const std::string &msg)
@@ -347,21 +360,9 @@ void ESMReader::fail(const std::string &msg)
     throw std::runtime_error(ss.str());
 }
 
-void ESMReader::setEncoding(const std::string& encoding)
+void ESMReader::setEncoder(ToUTF8::Utf8Encoder* encoder)
 {
-  if (encoding == "win1250")
-  {
-    mEncoding = ToUTF8::WINDOWS_1250;
-  }
-  else if (encoding == "win1251")
-  {
-    mEncoding = ToUTF8::WINDOWS_1251;
-  }
-  else
-  {
-    // Default Latin encoding
-    mEncoding = ToUTF8::WINDOWS_1252;
-  }
+    mEncoder = encoder;
 }
 
 }
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index ba7d6c3e0..45d6d9164 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -20,6 +20,8 @@ class ESMReader
 {
 public:
 
+  ESMReader(void);
+
   /*************************************************************************
    *
    *  Public type definitions
@@ -252,8 +254,8 @@ public:
   /// Used for error handling
   void fail(const std::string &msg);
 
-  /// Sets font encoding for ESM strings
-  void setEncoding(const std::string& encoding);
+  /// Sets font encoder for ESM strings
+  void setEncoder(ToUTF8::Utf8Encoder* encoder);
 
 private:
   Ogre::DataStreamPtr mEsm;
@@ -263,10 +265,13 @@ private:
   // Special file signifier (see SpecialFile enum above)
   int mSpf;
 
+  // Buffer for ESM strings
+  std::vector<char> mBuffer;
+
   SaveData mSaveData;
   MasterList mMasters;
   std::vector<ESMReader> *mGlobalReaderList;
-  ToUTF8::FromType mEncoding;
+  ToUTF8::Utf8Encoder* mEncoder;
 };
 }
 #endif
diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index c1ae06490..e2f878a25 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -157,12 +157,8 @@ void ESMWriter::writeHString(const std::string& data)
         write("\0", 1);
     else
     {
-        char *ptr = ToUTF8::getBuffer(data.size()+1);
-        strncpy(ptr, &data[0], data.size());
-        ptr[data.size()] = '\0';
-
         // Convert to UTF8 and return
-        std::string ascii = ToUTF8::getLegacyEnc(m_encoding);
+        std::string ascii = m_encoder->getLegacyEnc(data);
 
         write(ascii.c_str(), ascii.size());
     }
@@ -192,21 +188,9 @@ void ESMWriter::write(const char* data, int size)
     m_stream->write(data, size);
 }
 
-void ESMWriter::setEncoding(const std::string& encoding)
+void ESMWriter::setEncoder(ToUTF8::Utf8Encoder* encoder)
 {
-    if (encoding == "win1250")
-    {
-        m_encoding = ToUTF8::WINDOWS_1250;
-    }
-    else if (encoding == "win1251")
-    {
-        m_encoding = ToUTF8::WINDOWS_1251;
-    }
-    else
-    {
-        // Default Latin encoding
-        m_encoding = ToUTF8::WINDOWS_1252;
-    }
+    m_encoder = encoder;
 }
 
 }
diff --git a/components/esm/esmwriter.hpp b/components/esm/esmwriter.hpp
index d3777be81..b557a29ad 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm/esmwriter.hpp
@@ -6,7 +6,7 @@
 #include <assert.h>
 
 #include "esmcommon.hpp"
-#include "../to_utf8/to_utf8.hpp"
+#include <components/to_utf8/to_utf8.hpp>
 
 namespace ESM {
 
@@ -24,7 +24,7 @@ public:
     void setVersion(int ver);
     int getType();
     void setType(int type);
-    void setEncoding(const std::string& encoding); // Write strings as UTF-8?
+    void setEncoder(ToUTF8::Utf8Encoder *encoding); // Write strings as UTF-8?
     void setAuthor(const std::string& author);
     void setDescription(const std::string& desc);
 
@@ -94,11 +94,10 @@ private:
     std::list<RecordData> m_records;
     std::ostream* m_stream;
     std::streampos m_headerPos;
-    ToUTF8::FromType m_encoding;
+    ToUTF8::Utf8Encoder* m_encoder;
     int m_recordCount;
 
     HEDRstruct m_header;
-    SaveData m_saveData;
 };
 
 }
diff --git a/components/esm/loadglob.cpp b/components/esm/loadglob.cpp
index 39c07fb31..ceaa86948 100644
--- a/components/esm/loadglob.cpp
+++ b/components/esm/loadglob.cpp
@@ -44,4 +44,14 @@ void Global::save(ESMWriter &esm)
     esm.writeHNT("FLTV", mValue);
 }
 
+    void Global::blank()
+    {
+        mValue = 0;
+        mType = VT_Float;
+    }
+
+    bool operator== (const Global& left, const Global& right)
+    {
+        return left.mId==right.mId && left.mValue==right.mValue && left.mType==right.mType;
+    }
 }
diff --git a/components/esm/loadglob.hpp b/components/esm/loadglob.hpp
index 302729d2e..6111648a6 100644
--- a/components/esm/loadglob.hpp
+++ b/components/esm/loadglob.hpp
@@ -18,11 +18,17 @@ class ESMWriter;
 struct Global
 {
     std::string mId;
-    unsigned mValue;
+    float mValue;
     VarType mType;
 
     void load(ESMReader &esm);
     void save(ESMWriter &esm);
+
+    void blank();
+    ///< Set record to default state (does not touch the ID).
 };
+
+bool operator== (const Global& left, const Global& right);
+
 }
 #endif
diff --git a/components/esm/loadgmst.cpp b/components/esm/loadgmst.cpp
index 14e29f4ae..a73095a66 100644
--- a/components/esm/loadgmst.cpp
+++ b/components/esm/loadgmst.cpp
@@ -2,146 +2,16 @@
 
 #include <stdexcept>
 
-#include <boost/algorithm/string.hpp>
-
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
 namespace ESM
 {
 
-/// \todo Review GMST "fixing". Probably remove completely or at least make it optional. Its definitely not
-/// working properly in its current state and I doubt it can be fixed without breaking other stuff.
-
-// Some handy macros
-#define cI(s,x) { label = (s); boost::algorithm::to_lower(label); if (mId == label) return (mI == (x)); }
-#define cF(s,x) { label = (s); boost::algorithm::to_lower(label); if (mId == label) return (mF == (x)); }
-#define cS(s,x) { label = (s); boost::algorithm::to_lower(label); if (mId == label) return (mStr == (x)); }
-
-bool GameSetting::isDirtyTribunal()
-{
-    /*
-     Here, mId contains the game setting name, and we check the
-     setting for certain values. If it matches, this is a "mDirty"
-     entry. The correct entry (as defined in Tribunal and Bloodmoon
-     esms) are given in the comments. Many of the values are correct,
-     and are marked as 'same'. We still ignore them though, as they
-     are still in the wrong file and might override custom values
-     from other mods.
-     */
-
-    std::string label;
-    // Strings
-    cS("sProfitValue", "Profit Value"); // 'Profit:'
-    cS("sEditNote", "Edit Note"); // same
-    cS("sDeleteNote", "Delete Note?"); // same
-    cS("sMaxSale", "Max Sale"); // 'Seller Max'
-    cS("sMagicFabricantID", "Fabricant"); // 'Fabricant_summon'
-    cS("sTeleportDisabled",
-            "Teleportation magic does not work here.");// same
-    cS("sLevitateDisabled",
-            "Levitation magic does not work here."); // same
-    cS("sCompanionShare", "Companion Share"); // 'Share'
-    cS("sCompanionWarningButtonOne",
-            "Let the mercenary quit."); // same
-    cS("sCompanionWarningButtonTwo",
-            "Return to Companion Share display."); // same
-    cS("sCompanionWarningMessage",
-            "Your mercenary is poorer now than when he contracted with you.  Your mercenary will quit if you do not give him gold or goods to bring his Profit Value to a positive value.");
-    // 'Your mercenary is poorer now than when he contracted with
-    // you.  Your mercenary will quit if you do not give him gold
-    // or goods to bring his Profit to a positive value.'
-    // [The difference here is "Profit Value" -> "Profit"]
-
-    // Strings that matches the mId
-    cS("sEffectSummonFabricant", "sEffectSummonFabricant");// 'Summon Fabricant'
-    return false;
-}
-
-// Bloodmoon variant
-bool GameSetting::isDirtyBloodmoon()
-{
-    std::string label;
-    // Strings
-    cS("sWerewolfPopup", "Werewolf"); // same
-    cS("sWerewolfRestMessage",
-            "You cannot rest in werewolf form."); // same
-    cS("sWerewolfRefusal",
-            "You cannot do this as a werewolf."); // same
-    cS("sWerewolfAlarmMessage",
-            "You have been detected changing from a werewolf state.");
-    // 'You have been detected as a known werewolf.'
-
-    // Strings that matches the mId
-    cS("sMagicCreature01ID", "sMagicCreature01ID"); // 'BM_wolf_grey_summon'
-    cS("sMagicCreature02ID", "sMagicCreature02ID"); // 'BM_bear_black_summon'
-    cS("sMagicCreature03ID", "sMagicCreature03ID"); // 'BM_wolf_bone_summon'
-    cS("sMagicCreature04ID", "sMagicCreature04ID"); // same
-    cS("sMagicCreature05ID", "sMagicCreature05ID"); // same
-    cS("sEffectSummonCreature01", "sEffectSummonCreature01"); // 'Calf Wolf'
-    cS("sEffectSummonCreature02", "sEffectSummonCreature02"); // 'Calf Bear'
-    cS("sEffectSummonCreature03", "sEffectSummonCreature03"); // 'Summon Bonewolf'
-    cS("sEffectSummonCreature04", "sEffectSummonCreature04"); // same
-    cS("sEffectSummonCreature05", "sEffectSummonCreature05"); // same
-
-    // Integers
-    cI("iWereWolfBounty", 10000); // 1000
-    cI("iWereWolfFightMod", 100); // same
-    cI("iWereWolfFleeMod", 100); // same
-    cI("iWereWolfLevelToAttack", 20); // same
-
-    // Floats
-    cF("fFleeDistance", 3000); // same
-    cF("fCombatDistanceWerewolfMod", 0.3); // same
-    cF("fWereWolfFatigue", 400); // same
-    cF("fWereWolfEnchant", 1); // 0
-    cF("fWereWolfArmorer", 1); // 0
-    cF("fWereWolfBlock", 1); // 0
-    cF("fWereWolfSneak", 1); // 95
-    cF("fWereWolfDestruction", 1); // 0
-    cF("fWereWolfEndurance", 150); // same
-    cF("fWereWolfConjuration", 1); // 0
-    cF("fWereWolfRestoration", 1); // 0
-    cF("fWereWolfAthletics", 150); // 50
-    cF("fWereWolfLuck", 1); // 25
-    cF("fWereWolfSilverWeaponDamageMult", 1.5); // 2
-    cF("fWereWolfMediumArmor", 1); // 0
-    cF("fWereWolfShortBlade", 1); // 0
-    cF("fWereWolfAcrobatics", 150); // 80
-    cF("fWereWolfSpeechcraft", 1); // 0
-    cF("fWereWolfAlteration", 1); // 0
-    cF("fWereWolfIllusion", 1); // 0
-    cF("fWereWolfLongBlade", 1); // 0
-    cF("fWereWolfMarksman", 1); // 0
-    cF("fWereWolfHandtoHand", 100); // same
-    cF("fWereWolfIntellegence", 1); // 0
-    cF("fWereWolfAlchemy", 1); // 0
-    cF("fWereWolfUnarmored", 100); // same
-    cF("fWereWolfAxe", 1); // 0
-    cF("fWereWolfRunMult", 1.5); // 1.3
-    cF("fWereWolfMagicka", 100); // same
-    cF("fWereWolfAgility", 150); // same
-    cF("fWereWolfBluntWeapon", 1); // 0
-    cF("fWereWolfSecurity", 1); // 0
-    cF("fWereWolfPersonality", 1); // 0
-    cF("fWereWolfMerchantile", 1); // 0
-    cF("fWereWolfHeavyArmor", 1); // 0
-    cF("fWereWolfSpear", 1); // 0
-    cF("fWereWolfStrength", 150); // same
-    cF("fWereWolfHealth", 2); // same
-    cF("fWereWolfMysticism", 1); // 0
-    cF("fWereWolfLightArmor", 1); // 0
-    cF("fWereWolfWillPower", 1); // 0
-    cF("fWereWolfSpeed", 150); // 90
-    return false;
-}
-
 void GameSetting::load(ESMReader &esm)
 {
     assert(mId != "");
 
-    mDirty = false;
-
     // We are apparently allowed to be empty
     if (!esm.hasMoreSubs())
     {
@@ -169,17 +39,8 @@ void GameSetting::load(ESMReader &esm)
     }
     else
         esm.fail("Unwanted subrecord type");
-
-    int spf = esm.getSpecial();
-
-    // Check if this is one of the mDirty values mentioned above. If it
-    // is, we set the mDirty flag. This will ONLY work if you've set
-    // the 'id' string correctly before calling load().
-
-    if ((spf != SF_Tribunal && isDirtyTribunal()) || (spf != SF_Bloodmoon
-            && isDirtyBloodmoon()))
-        mDirty = true;
 }
+
 void GameSetting::save(ESMWriter &esm)
 {
     switch(mType)
diff --git a/components/esm/loadgmst.hpp b/components/esm/loadgmst.hpp
index a3471598c..ab9a9551e 100644
--- a/components/esm/loadgmst.hpp
+++ b/components/esm/loadgmst.hpp
@@ -25,66 +25,6 @@ struct GameSetting
     float mF;
     VarType mType;
 
-    // Set to true if this is a 'dirty' entry which should be ignored
-    bool mDirty;
-
-    /*
-     These functions check if this game setting is one of the "dirty"
-     GMST records found in many mods. These are due to a serious bug in
-     the official TES3 editor. It only occurs in the newer editor
-     versions that came with Tribunal and Bloodmoon, and only if a
-     modder tries to make a mod without loading the corresponding
-     expansion master file. For example, if you have Tribunal installed
-     and try to make a mod without loading Tribunal.esm, the editor
-     will insert these GMST records as a replacement for the entries it
-     cannot find in the ESMs.
-
-     The values of these "dirty" records differ in general from their
-     values as defined in Tribunal.esm and Bloodmoon.esm, and are
-     always set to the same "default" values. Most of these values are
-     nonsensical, ie. changing the "Seller Max" string to "Max Sale",
-     or change the stats of werewolves to useless values like 1. Some
-     of them break certain spell effects.
-
-     It is most likely that these values are just leftover values from
-     an early stage of development that are inserted as default values
-     by the editor code. They are supposed to be overridden when the
-     correct esm file is loaded. When it isn't loaded however, you get
-     stuck with the initial value, and this gets written to every mod
-     by the editor, for some reason.
-
-     Bethesda themselves have fallen for this bug. If you install both
-     Tribunal and Bloodmoon, the updated Tribunal.esm will contain the
-     dirty GMST settings from Bloodmoon, and Bloodmoon.esm will contain
-     some of the dirty settings from Tribunal. In other words, this bug
-     affects the game EVEN IF YOU DO NOT USE ANY MODS!
-
-     The guys at Bethesda are well aware of this bug (and many others),
-     as the mod community and fan base complained about them for a long
-     time. But unfortunately it was never fixed.
-
-     There are several tools available to help modders remove these
-     records from their files, but not all modders use them, and they
-     really shouldn't have to. In this file we choose instead to reject
-     all the corrupt values at load time.
-
-     These functions checks if the current game setting is one of the
-     "dirty" ones as described above. TODO: I have not checked this
-     against other sources yet, do that later. Currently recognizes 22
-     values for tribunal and 50 for bloodmoon. Legitimate GMSTs in mods
-     (setting values other than the default "dirty" ones) are not
-     affected and will work correctly.
-     */
-
-    /*
-     Checks for dirty tribunal values. These will be ignored if found
-     in any file except when they are found in "Tribunal.esm".
-     */
-    bool isDirtyTribunal();
-
-    // Bloodmoon variant
-    bool isDirtyBloodmoon();
-
     void load(ESMReader &esm);
     
     int getInt() const;
diff --git a/components/files/constrainedfiledatastream.cpp b/components/files/constrainedfiledatastream.cpp
new file mode 100644
index 000000000..dd2985e56
--- /dev/null
+++ b/components/files/constrainedfiledatastream.cpp
@@ -0,0 +1,175 @@
+#include "constrainedfiledatastream.hpp"
+#include "lowlevelfile.hpp"
+
+#include <stdexcept>
+#include <cassert>
+#ifndef __clang__
+#include <cstdint>
+#else
+#include <tr1/cstdint>
+#endif
+
+namespace {
+
+class ConstrainedDataStream : public Ogre::DataStream {
+public:
+
+	static const size_t sBufferSize = 4096; // somewhat arbitrary though 64KB buffers didn't seem to improve performance any
+	static const size_t sBufferThreshold = 1024; // reads larger than this bypass buffering as cost of memcpy outweighs cost of system call
+
+    ConstrainedDataStream(const Ogre::String &fname, size_t start, size_t length)
+	{
+		mFile.open (fname.c_str ());
+		mSize  = length != 0xFFFFFFFF ? length : mFile.size () - start;
+
+		mPos    = 0;
+		mOrigin = start;
+		mExtent = start + mSize;
+
+		mBufferOrigin = 0;
+		mBufferExtent = 0;
+	}
+		
+
+	size_t read(void* buf, size_t count)
+	{
+		assert (mPos <= mSize);
+
+		uint8_t * out = reinterpret_cast <uint8_t *> (buf);
+
+		size_t posBeg = mOrigin + mPos;
+		size_t posEnd = posBeg + count;
+
+		if (posEnd > mExtent)
+			posEnd = mExtent;
+
+		size_t posCur = posBeg;
+
+		while (posCur != posEnd)
+		{
+			size_t readLeft = posEnd - posCur;
+
+			if (posCur < mBufferOrigin || posCur >= mBufferExtent)
+			{
+				if (readLeft >= sBufferThreshold || (posCur == mOrigin && posEnd == mExtent))
+				{
+					assert (mFile.tell () == mBufferExtent);
+
+					if (posCur != mBufferExtent)
+						mFile.seek (posCur);
+
+					posCur += mFile.read (out, readLeft);
+
+					mBufferOrigin = mBufferExtent = posCur;
+
+					mPos = posCur - mOrigin;
+
+					return posCur - posBeg;
+				}
+				else
+				{
+					size_t newBufferOrigin;
+
+					if ((posCur < mBufferOrigin) && (mBufferOrigin - posCur < sBufferSize))
+						newBufferOrigin = std::max (mOrigin, mBufferOrigin > sBufferSize ? mBufferOrigin - sBufferSize : 0);
+					else
+						newBufferOrigin = posCur;
+
+					fill (newBufferOrigin);
+				}
+			}
+
+			size_t xfer = std::min (readLeft, mBufferExtent - posCur);
+
+			memcpy (out, mBuffer + (posCur - mBufferOrigin), xfer);
+
+			posCur += xfer;
+			out += xfer;
+		}
+
+		count = posEnd - posBeg;
+		mPos += count;
+		return count;
+	}
+
+    void skip(long count)
+    {
+		assert (mPos <= mSize);
+
+        if((count >= 0 && (size_t)count <= mSize-mPos) ||
+           (count < 0 && (size_t)-count <= mPos))
+			mPos += count;
+    }
+
+    void seek(size_t pos)
+    {
+		assert (mPos <= mSize);
+
+        if (pos < mSize)
+			mPos = pos;
+    }
+
+    virtual size_t tell() const
+    {
+		assert (mPos <= mSize);
+
+		return mPos;
+	}
+
+    virtual bool eof() const
+    {
+		assert (mPos <= mSize);
+
+		return mPos == mSize;
+	}
+
+    virtual void close()
+    {
+		mFile.close();
+	}
+
+private:
+
+	void fill (size_t newOrigin)
+	{
+		assert (mFile.tell () == mBufferExtent);
+
+		size_t newExtent = newOrigin + sBufferSize;
+
+		if (newExtent > mExtent)
+			newExtent = mExtent;
+
+		size_t oldExtent = mBufferExtent;
+
+		if (newOrigin != oldExtent)
+			mFile.seek (newOrigin);
+
+		mBufferOrigin = mBufferExtent = newOrigin;
+
+		size_t amountRequested = newExtent - newOrigin;
+
+		size_t amountRead = mFile.read (mBuffer, amountRequested);
+
+		if (amountRead != amountRequested)
+			throw std::runtime_error ("An unexpected condition occurred while reading from a file.");
+
+		mBufferExtent = newExtent;
+	}
+
+	LowLevelFile mFile;
+
+	size_t mOrigin;
+	size_t mExtent;
+	size_t mPos;
+
+	uint8_t mBuffer [sBufferSize];
+	size_t mBufferOrigin;
+	size_t mBufferExtent;
+};
+
+} // end of unnamed namespace
+
+Ogre::DataStreamPtr openConstrainedFileDataStream (char const * filename, size_t offset, size_t length)
+{
+	return Ogre::DataStreamPtr(new ConstrainedDataStream(filename, offset, length));
+}
diff --git a/components/files/constrainedfiledatastream.hpp b/components/files/constrainedfiledatastream.hpp
new file mode 100644
index 000000000..367defcbc
--- /dev/null
+++ b/components/files/constrainedfiledatastream.hpp
@@ -0,0 +1,8 @@
+#ifndef COMPONENTS_FILES_CONSTRAINEDFILEDATASTREAM_HPP
+#define COMPONENTS_FILES_CONSTRAINEDFILEDATASTREAM_HPP
+
+#include <OgreDataStream.h>
+
+Ogre::DataStreamPtr openConstrainedFileDataStream (char const * filename, size_t offset = 0, size_t length = 0xFFFFFFFF);
+
+#endif // COMPONENTS_FILES_CONSTRAINEDFILEDATASTREAM_HPP
diff --git a/components/files/filelibrary.cpp b/components/files/filelibrary.cpp
index ce67f0c66..ce2d95f57 100644
--- a/components/files/filelibrary.cpp
+++ b/components/files/filelibrary.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 
 #include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
+#include <../components/misc/stringops.hpp>
 
 namespace Files
 {
@@ -45,14 +45,14 @@ namespace Files
             if( !acceptableExtensions.empty() )
             {
                 fileExtension = boost::filesystem::path (listIter->extension()).string();
-                boost::algorithm::to_lower(fileExtension);
+                Misc::StringUtils::toLower(fileExtension);
                 if(!containsVectorString(acceptableExtensions, fileExtension))
                     continue;
             }
 
             type = boost::filesystem::path (listIter->parent_path().leaf()).string();
             if (!strict)
-                boost::algorithm::to_lower(type);
+                Misc::StringUtils::toLower(type);
 
             mMap[type].push_back(*listIter);
             // std::cout << "Added path: " << listIter->string() << " in section "<< type <<std::endl;
@@ -63,7 +63,7 @@ namespace Files
     bool FileLibrary::containsSection(std::string sectionName, bool strict)
     {
         if (!strict)
-            boost::algorithm::to_lower(sectionName);
+            Misc::StringUtils::toLower(sectionName);
         StringPathContMap::const_iterator mapIter = mMap.find(sectionName);
         if (mapIter == mMap.end())
             return false;
@@ -75,7 +75,7 @@ namespace Files
     const PathContainer* FileLibrary::section(std::string sectionName, bool strict)
     {
         if (!strict)
-            boost::algorithm::to_lower(sectionName);
+            Misc::StringUtils::toLower(sectionName);
         StringPathContMap::const_iterator mapIter = mMap.find(sectionName);
         if (mapIter == mMap.end())
         {
diff --git a/components/files/fileops.cpp b/components/files/fileops.cpp
index 4bb71f866..fbc2eef05 100644
--- a/components/files/fileops.cpp
+++ b/components/files/fileops.cpp
@@ -4,6 +4,7 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
+#include <../components/misc/stringops.hpp>
 
 namespace Files
 {
@@ -87,7 +88,7 @@ bool isFile(const char *name)
 
         if (!strict)
         {
-            boost::algorithm::to_lower(toFindStr);
+            Misc::StringUtils::toLower(toFindStr);
         }
 
         for (Files::PathContainer::const_iterator it = list.begin(); it != list.end(); ++it)
@@ -99,7 +100,7 @@ bool isFile(const char *name)
 
             if (!strict)
             {
-                boost::algorithm::to_lower(fullPath);
+                Misc::StringUtils::toLower(fullPath);
             }
             if(endingMatches(fullPath, toFindStr))
             {
diff --git a/components/files/lowlevelfile.cpp b/components/files/lowlevelfile.cpp
new file mode 100644
index 000000000..71fd1b523
--- /dev/null
+++ b/components/files/lowlevelfile.cpp
@@ -0,0 +1,299 @@
+#include "lowlevelfile.hpp"
+
+#include <stdexcept>
+#include <sstream>
+#include <cassert>
+
+#if FILE_API == FILE_API_POSIX
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#endif
+
+#if FILE_API == FILE_API_STDIO
+/*
+ *
+ *	Implementation of LowLevelFile methods using c stdio
+ *
+ */
+
+LowLevelFile::LowLevelFile ()
+{
+	mHandle = NULL;
+}
+
+LowLevelFile::~LowLevelFile ()
+{
+	if (mHandle != NULL)
+		fclose (mHandle);
+}
+
+void LowLevelFile::open (char const * filename)
+{
+	assert (mHandle == NULL);
+
+	mHandle = fopen (filename, "rb");
+
+	if (mHandle == NULL)
+	{
+		std::ostringstream os;
+		os << "Failed to open '" << filename << "' for reading.";
+		throw std::runtime_error (os.str ());
+	}
+}
+
+void LowLevelFile::close ()
+{
+	assert (mHandle != NULL);
+
+	fclose (mHandle);
+
+	mHandle = NULL;
+}
+
+size_t LowLevelFile::size ()
+{
+	assert (mHandle != NULL);
+
+	long oldPosition = ftell (mHandle);
+
+	if (oldPosition == -1)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	if (fseek (mHandle, 0, SEEK_END) != 0)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	long Size = ftell (mHandle);
+
+	if (Size == -1)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	if (fseek (mHandle, oldPosition, SEEK_SET) != 0)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	return size_t (Size);
+}
+
+void LowLevelFile::seek (size_t Position)
+{
+	assert (mHandle != NULL);
+
+	if (fseek (mHandle, Position, SEEK_SET) != 0)
+		throw std::runtime_error ("A seek operation on a file failed.");
+}
+
+size_t LowLevelFile::tell ()
+{
+	assert (mHandle != NULL);
+
+	long Position = ftell (mHandle);
+
+	if (Position == -1)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	return size_t (Position);
+}
+
+size_t LowLevelFile::read (void * data, size_t size)
+{
+	assert (mHandle != NULL);
+
+	int amount = fread (data, 1, size, mHandle);
+
+	if (amount == 0 && ferror (mHandle))
+		throw std::runtime_error ("A read operation on a file failed.");
+
+	return amount;
+}
+
+#elif FILE_API == FILE_API_POSIX
+/*
+ *
+ *	Implementation of LowLevelFile methods using posix IO calls
+ *
+ */
+
+LowLevelFile::LowLevelFile ()
+{
+	mHandle = -1;
+}
+
+LowLevelFile::~LowLevelFile ()
+{
+	if (mHandle != -1)
+		::close (mHandle);
+}
+
+void LowLevelFile::open (char const * filename)
+{
+	assert (mHandle == -1);
+
+#ifdef O_BINARY
+	static const int openFlags = O_RDONLY | O_BINARY;
+#else
+	static const int openFlags = O_RDONLY;
+#endif
+
+	mHandle = ::open (filename, openFlags, 0);
+
+	if (mHandle == -1)
+	{
+		std::ostringstream os;
+		os << "Failed to open '" << filename << "' for reading.";
+		throw std::runtime_error (os.str ());
+	}
+}
+
+void LowLevelFile::close ()
+{
+	assert (mHandle != -1);
+
+	::close (mHandle);
+
+	mHandle = -1;
+}
+
+size_t LowLevelFile::size ()
+{
+	assert (mHandle != -1);
+
+	size_t oldPosition = ::lseek (mHandle, 0, SEEK_CUR);
+
+	if (oldPosition == size_t (-1))
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	size_t Size = ::lseek (mHandle, 0, SEEK_END);
+
+	if (Size == size_t (-1))
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	if (lseek (mHandle, oldPosition, SEEK_SET) == -1)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	return Size;
+}
+
+void LowLevelFile::seek (size_t Position)
+{
+	assert (mHandle != -1);
+
+	if (::lseek (mHandle, Position, SEEK_SET) == -1)
+		throw std::runtime_error ("A seek operation on a file failed.");
+}
+
+size_t LowLevelFile::tell ()
+{
+	assert (mHandle != -1);
+
+	size_t Position = ::lseek (mHandle, 0, SEEK_CUR);
+
+	if (Position == size_t (-1))
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	return Position;
+}
+
+size_t LowLevelFile::read (void * data, size_t size)
+{
+	assert (mHandle != -1);
+
+	int amount = ::read (mHandle, data, size);
+
+	if (amount == -1)
+		throw std::runtime_error ("A read operation on a file failed.");
+
+	return amount;
+}
+
+#elif FILE_API == FILE_API_WIN32
+/*
+ *
+ *	Implementation of LowLevelFile methods using Win32 API calls
+ *
+ */
+
+LowLevelFile::LowLevelFile ()
+{
+	mHandle = INVALID_HANDLE_VALUE;
+}
+
+LowLevelFile::~LowLevelFile ()
+{
+	if (mHandle == INVALID_HANDLE_VALUE)
+		CloseHandle (mHandle);
+}
+
+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);
+
+	if (handle == NULL)
+	{
+		std::ostringstream os;
+		os << "Failed to open '" << filename << "' for reading.";
+		throw std::runtime_error (os.str ());
+	}
+
+	mHandle = handle;
+}
+
+void LowLevelFile::close ()
+{
+	assert (mHandle != INVALID_HANDLE_VALUE);
+
+	CloseHandle (mHandle);
+
+	mHandle = INVALID_HANDLE_VALUE;
+}
+
+size_t LowLevelFile::size ()
+{
+	assert (mHandle != INVALID_HANDLE_VALUE);
+
+	BY_HANDLE_FILE_INFORMATION info;
+
+	if (!GetFileInformationByHandle (mHandle, &info))
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	if (info.nFileSizeHigh != 0)
+		throw std::runtime_error ("Files greater that 4GB are not supported.");
+
+	return info.nFileSizeLow;
+}
+
+void LowLevelFile::seek (size_t Position)
+{
+	assert (mHandle != INVALID_HANDLE_VALUE);
+
+	if (SetFilePointer (mHandle, Position, NULL, SEEK_SET) == INVALID_SET_FILE_POINTER)
+		if (GetLastError () != NO_ERROR)
+			throw std::runtime_error ("A seek operation on a file failed.");
+}
+
+size_t LowLevelFile::tell ()
+{
+	assert (mHandle != INVALID_HANDLE_VALUE);
+
+	DWORD value = SetFilePointer (mHandle, 0, NULL, SEEK_CUR);
+
+	if (value == INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR)
+		throw std::runtime_error ("A query operation on a file failed.");
+
+	return value;
+}
+
+size_t LowLevelFile::read (void * data, size_t size)
+{
+	assert (mHandle != INVALID_HANDLE_VALUE);
+
+	DWORD read;
+
+	if (!ReadFile (mHandle, data, size, &read, NULL))
+		throw std::runtime_error ("A read operation on a file failed.");
+
+	return read;
+}
+
+#endif
diff --git a/components/files/lowlevelfile.hpp b/components/files/lowlevelfile.hpp
new file mode 100644
index 000000000..f49c466a5
--- /dev/null
+++ b/components/files/lowlevelfile.hpp
@@ -0,0 +1,56 @@
+#ifndef COMPONENTS_FILES_LOWLEVELFILE_HPP
+#define COMPONENTS_FILES_LOWLEVELFILE_HPP
+
+#include <OgrePlatform.h>
+
+#include <cstdlib>
+
+#define FILE_API_STDIO	0
+#define FILE_API_POSIX	1
+#define FILE_API_WIN32	2
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_LINUX
+#define FILE_API	FILE_API_POSIX
+#elif OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#define FILE_API	FILE_API_WIN32
+#else
+#define FILE_API	FILE_API_STDIO
+#endif
+
+#if FILE_API == FILE_API_STDIO
+#include <cstdio>
+#elif FILE_API == FILE_API_POSIX
+#elif FILE_API == FILE_API_WIN32
+#include <windows.h>
+#else
+#error Unsupported File API
+#endif
+
+class LowLevelFile
+{
+public:
+
+	LowLevelFile ();
+	~LowLevelFile ();
+
+	void open (char const * filename);
+	void close ();
+
+	size_t size ();
+
+	void seek (size_t Position);
+	size_t tell ();
+
+	size_t read (void * data, size_t size);
+
+private:
+#if FILE_API == FILE_API_STDIO
+	FILE* mHandle;
+#elif FILE_API == FILE_API_POSIX
+	int mHandle;
+#elif FILE_API == FILE_API_WIN32
+	HANDLE mHandle;
+#endif
+};
+
+#endif
diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp
index b44c42986..347de96a6 100644
--- a/components/files/multidircollection.cpp
+++ b/components/files/multidircollection.cpp
@@ -95,6 +95,11 @@ namespace Files
         return iter->second;
     }
 
+    bool MultiDirCollection::doesExist (const std::string& file) const
+    {
+        return mFiles.find (file)!=mFiles.end();
+    }
+
     MultiDirCollection::TIter MultiDirCollection::begin() const
     {
         return mFiles.begin();
diff --git a/components/files/multidircollection.hpp b/components/files/multidircollection.hpp
index e8abeb45d..3b420d677 100644
--- a/components/files/multidircollection.hpp
+++ b/components/files/multidircollection.hpp
@@ -73,6 +73,9 @@ namespace Files
             /// If the file does not exist, an exception is thrown. \a file must include
             /// the extension.
 
+            bool doesExist (const std::string& file) const;
+            ///< \return Does a file with the given name exist?
+
             TIter begin() const;
             ///< Return iterator pointing to the first file.
 
diff --git a/components/files/ogreplugin.cpp b/components/files/ogreplugin.cpp
index ca90fd30e..c319f7758 100644
--- a/components/files/ogreplugin.cpp
+++ b/components/files/ogreplugin.cpp
@@ -6,11 +6,6 @@
 namespace Files {
 
 bool loadOgrePlugin(const std::string &pluginDir, std::string pluginName, Ogre::Root &ogreRoot) {
-    // Append plugin suffix if debugging.
-#if defined(DEBUG)
-	pluginName = pluginName + OGRE_PLUGIN_DEBUG_SUFFIX;
-#endif
-
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
 	std::ostringstream verStream;
 	verStream << "." << OGRE_VERSION_MAJOR << "." << OGRE_VERSION_MINOR << "." << OGRE_VERSION_PATCH;
@@ -28,13 +23,28 @@ bool loadOgrePlugin(const std::string &pluginDir, std::string pluginName, Ogre::
     pluginExt = ".so";
 #endif
 
-    std::string pluginPath = pluginDir + "/" + pluginName + pluginExt;
+    // Append plugin suffix if debugging.
+    std::string pluginPath;
+#if defined(DEBUG)
+    pluginPath = pluginDir + "/" + pluginName + OGRE_PLUGIN_DEBUG_SUFFIX + pluginExt;
     if (boost::filesystem::exists(pluginPath)) {
-    	ogreRoot.loadPlugin(pluginPath);
-    	return true;
+        ogreRoot.loadPlugin(pluginPath);
+        return true;
     }
     else {
-    	return false;
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        return false;
+#endif //OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+    }
+#endif //defined(DEBUG)
+    
+    pluginPath = pluginDir + "/" + pluginName + pluginExt;
+    if (boost::filesystem::exists(pluginPath)) {
+        ogreRoot.loadPlugin(pluginPath);
+        return true;
+    }
+    else {
+        return false;
     }
 }
 
diff --git a/components/interpreter/context.hpp b/components/interpreter/context.hpp
index 4221da36e..bdba7b6af 100644
--- a/components/interpreter/context.hpp
+++ b/components/interpreter/context.hpp
@@ -49,6 +49,36 @@ namespace Interpreter
 
             virtual void setGlobalFloat (const std::string& name, float value) = 0;
 
+            virtual std::vector<std::string> getGlobals () const = 0;
+            
+            virtual char getGlobalType (const std::string& name) const = 0;
+
+            virtual std::string getActionBinding(const std::string& action) const = 0;
+            
+            virtual std::string getNPCName() const = 0;
+            
+            virtual std::string getNPCRace() const = 0;
+            
+            virtual std::string getNPCClass() const = 0;
+            
+            virtual std::string getNPCFaction() const = 0;
+            
+            virtual std::string getNPCRank() const = 0;
+
+            virtual std::string getPCName() const = 0;
+            
+            virtual std::string getPCRace() const = 0;
+            
+            virtual std::string getPCClass() const = 0;
+            
+            virtual std::string getPCRank() const = 0;
+            
+            virtual std::string getPCNextRank() const = 0;
+            
+            virtual int getPCBounty() const = 0;
+            
+            virtual std::string getCurrentCellName() const = 0;
+
             virtual bool isScriptRunning (const std::string& name) const = 0;
 
             virtual void startScript (const std::string& name) = 0;
diff --git a/components/interpreter/defines.cpp b/components/interpreter/defines.cpp
new file mode 100644
index 000000000..18e5f81c1
--- /dev/null
+++ b/components/interpreter/defines.cpp
@@ -0,0 +1,209 @@
+#include "defines.hpp"
+
+#include <algorithm>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace Interpreter{
+
+    bool Check(const std::string str, const std::string escword, unsigned int* i, unsigned int* start){
+        bool retval = str.find(escword) == 0;
+        if(retval){
+            (*i) += escword.length();
+            (*start) = (*i) + 1;
+        }
+        return retval;
+    }
+
+    std::vector<std::string> globals;
+
+    bool longerStr(const std::string a, const std::string b){
+        return a.length() > b.length();
+    }
+
+    std::string fixDefinesReal(std::string text, char eschar, bool isBook, Context& context){
+
+        unsigned int start = 0;
+        std::ostringstream retval;
+        for(unsigned int i = 0; i < text.length(); i++){
+            if(text[i] == eschar){
+                retval << text.substr(start, i - start);
+                std::string temp = text.substr(i+1, 100);
+                transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
+                
+                bool found;
+            
+                if(     (found = Check(temp, "actionslideright", &i, &start))){
+                    retval << context.getActionBinding("#{sRight}");
+                }
+                else if((found = Check(temp, "actionreadymagic", &i, &start))){
+                    retval << context.getActionBinding("#{sReady_Magic}");
+                }
+                else if((found = Check(temp, "actionprevweapon", &i, &start))){
+                    retval << "PLACEHOLDER_ACTION_PREV_WEAPON";
+                }
+                else if((found = Check(temp, "actionnextweapon", &i, &start))){
+                    retval << "PLACEHOLDER_ACTION_PREV_WEAPON";
+                }
+                else if((found = Check(temp, "actiontogglerun", &i, &start))){
+                    retval << context.getActionBinding("#{sAuto_Run}");
+                }
+                else if((found = Check(temp, "actionslideleft", &i, &start))){
+                    retval << context.getActionBinding("#{sLeft}");
+                }
+                else if((found = Check(temp, "actionreadyitem", &i, &start))){
+                    retval << context.getActionBinding("#{sReady_Weapon}");
+                }
+                else if((found = Check(temp, "actionprevspell", &i, &start))){
+                    retval << "PLACEHOLDER_ACTION_PREV_SPELL";
+                }
+                else if((found = Check(temp, "actionnextspell", &i, &start))){
+                    retval << "PLACEHOLDER_ACTION_NEXT_SPELL";
+                }
+                else if((found = Check(temp, "actionrestmenu", &i, &start))){
+                    retval << context.getActionBinding("#{sRestKey}");
+                }
+                else if((found = Check(temp, "actionmenumode", &i, &start))){
+                    retval << context.getActionBinding("#{sJournal}");
+                }
+                else if((found = Check(temp, "actionactivate", &i, &start))){
+                    retval << context.getActionBinding("#{sActivate}");
+                }
+                else if((found = Check(temp, "actionjournal", &i, &start))){
+                    retval << context.getActionBinding("#{sJournal}");
+                }
+                else if((found = Check(temp, "actionforward", &i, &start))){
+                    retval << context.getActionBinding("#{sForward}");
+                }
+                else if((found = Check(temp, "pccrimelevel", &i, &start))){
+                    retval << context.getPCBounty();
+                }
+                else if((found = Check(temp, "actioncrouch", &i, &start))){
+                    retval << context.getActionBinding("#{sCrouch_Sneak}");
+                }
+                else if((found = Check(temp, "actionjump", &i, &start))){
+                    retval << context.getActionBinding("#{sJump}");
+                }
+                else if((found = Check(temp, "actionback", &i, &start))){
+                    retval << context.getActionBinding("#{sBack}");
+                }
+                else if((found = Check(temp, "actionuse", &i, &start))){
+                    retval << "PLACEHOLDER_ACTION_USE";
+                }
+                else if((found = Check(temp, "actionrun", &i, &start))){
+                    retval << "PLACEHOLDER_ACTION_RUN";
+                }
+                else if((found = Check(temp, "pcclass", &i, &start))){
+                    retval << context.getPCClass();
+                }
+                else if((found = Check(temp, "pcrace", &i, &start))){
+                    retval << context.getPCRace();
+                }
+                else if((found = Check(temp, "pcname", &i, &start))){
+                    retval << context.getPCName();
+                }
+                else if((found = Check(temp, "cell", &i, &start))){
+                    retval << context.getCurrentCellName();
+                }
+
+                else if(eschar == '%' && !isBook) { // In Dialogue, not messagebox
+                    if(     (found = Check(temp, "faction", &i, &start))){
+                        retval << context.getNPCFaction();
+                    }
+                    else if((found = Check(temp, "nextpcrank", &i, &start))){
+                        retval << context.getPCNextRank();
+                    }
+                    else if((found = Check(temp, "pcnextrank", &i, &start))){
+                        retval << context.getPCNextRank();
+                    }
+                    else if((found = Check(temp, "pcrank", &i, &start))){
+                        retval << context.getPCRank();
+                    }
+                    else if((found = Check(temp, "rank", &i, &start))){
+                        retval << context.getNPCRank();
+                    }
+                    
+                    else if((found = Check(temp, "class", &i, &start))){
+                        retval << context.getNPCClass();
+                    }
+                    else if((found = Check(temp, "race", &i, &start))){
+                        retval << context.getNPCRace();
+                    }
+                    else if((found = Check(temp, "name", &i, &start))){
+                        retval << context.getNPCName();
+                    }
+                }
+                else { // In messagebox or book, not dialogue
+
+                    /* empty outside dialogue */
+                    if(     (found = Check(temp, "faction", &i, &start)));
+                    else if((found = Check(temp, "nextpcrank", &i, &start)));
+                    else if((found = Check(temp, "pcnextrank", &i, &start)));
+                    else if((found = Check(temp, "pcrank", &i, &start)));
+                    else if((found = Check(temp, "rank", &i, &start)));
+                    
+                    /* uses pc in messageboxes */
+                    else if((found = Check(temp, "class", &i, &start))){
+                        retval << context.getPCClass();
+                    }
+                    else if((found = Check(temp, "race", &i, &start))){
+                        retval << context.getPCRace();
+                    }
+                    else if((found = Check(temp, "name", &i, &start))){
+                        retval << context.getPCName();
+                    }
+                }
+                
+                /* Not a builtin, try global variables */    
+                if(!found){
+                    /* if list of globals is empty, grab it and sort it by descending string length */
+                    if(globals.empty()){
+                        globals = context.getGlobals();
+                        sort(globals.begin(), globals.end(), longerStr);
+                    }
+
+                    for(unsigned int j = 0; j < globals.size(); j++){
+                        if(globals[j].length() > temp.length()){ // Just in case there's a global with a huuuge name
+                            std::string temp = text.substr(i+1, globals[j].length());
+                            transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
+                        }
+
+                        if((found = Check(temp, globals[j], &i, &start))){
+                            char type = context.getGlobalType(globals[j]);
+
+                            switch(type){
+                                case 's': retval << context.getGlobalShort(globals[j]);  break;
+                                case 'l': retval << context.getGlobalLong(globals[j]); break; 
+                                case 'f': retval << context.getGlobalFloat(globals[j]); break;
+                            }
+                            break;
+                        }
+                    }
+                }
+                
+                /* Not found */
+                if(!found){
+                    /* leave unmodified */
+                    i += 1;
+                    start = i;
+                    retval << eschar;
+                }
+            }
+        }
+        retval << text.substr(start, text.length() - start);
+        return retval.str ();
+    }
+
+    std::string fixDefinesDialog(std::string text, Context& context){
+        return fixDefinesReal(text, '%', false, context);
+    }
+
+    std::string fixDefinesMsgBox(std::string text, Context& context){
+        return fixDefinesReal(text, '^', false, context);
+    }
+
+    std::string fixDefinesBook(std::string text, Context& context){
+        return fixDefinesReal(text, '%', true, context);
+    }
+}
diff --git a/components/interpreter/defines.hpp b/components/interpreter/defines.hpp
new file mode 100644
index 000000000..00c4386b8
--- /dev/null
+++ b/components/interpreter/defines.hpp
@@ -0,0 +1,13 @@
+#ifndef INTERPRETER_DEFINES_H_INCLUDED
+#define INTERPRETER_DEFINES_H_INCLUDED
+
+#include <string>
+#include "context.hpp"
+
+namespace Interpreter{
+    std::string fixDefinesDialog(std::string text, Context& context);
+    std::string fixDefinesMsgBox(std::string text, Context& context);
+    std::string fixDefinesBook(std::string text, Context& context);
+}
+
+#endif
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 37c38fc30..1b4c823a0 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -10,6 +10,7 @@
 
 #include "opcodes.hpp"
 #include "runtime.hpp"
+#include "defines.hpp"
 
 namespace Interpreter
 {
@@ -69,7 +70,8 @@ namespace Interpreter
                 }
             }
         }
-
+        
+        formattedMessage = fixDefinesMsgBox(formattedMessage, runtime.getContext());
         return formattedMessage;
     }
 
diff --git a/components/misc/stringops.cpp b/components/misc/stringops.cpp
index 53eed1fdc..0bc8e290a 100644
--- a/components/misc/stringops.cpp
+++ b/components/misc/stringops.cpp
@@ -1,8 +1,14 @@
 #include "stringops.hpp"
 
+#include <cctype>
+#include <algorithm>
+#include <iterator>
+
 #include <string.h>
 #include <libs/platform/strings.h>
 
+
+
 namespace Misc
 {
 
diff --git a/components/misc/stringops.hpp b/components/misc/stringops.hpp
index a32104bf3..029b617e1 100644
--- a/components/misc/stringops.hpp
+++ b/components/misc/stringops.hpp
@@ -1,8 +1,59 @@
 #ifndef MISC_STRINGOPS_H
 #define MISC_STRINGOPS_H
 
+#include <cctype>
+#include <string>
+#include <algorithm>
+
 namespace Misc
 {
+class StringUtils
+{
+    struct ci
+    {
+        bool operator()(int x, int y) const {
+            return std::tolower(x) < std::tolower(y);
+        }
+    };
+
+public:
+    static bool ciLess(const std::string &x, const std::string &y) {
+        return std::lexicographical_compare(x.begin(), x.end(), y.begin(), y.end(), ci());
+    }
+
+    static bool ciEqual(const std::string &x, const std::string &y) {
+        if (x.size() != y.size()) {
+            return false;
+        }
+        std::string::const_iterator xit = x.begin();
+        std::string::const_iterator yit = y.begin();
+        for (; xit != x.end(); ++xit, ++yit) {
+            if (std::tolower(*xit) != std::tolower(*yit)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /// Transforms input string to lower case w/o copy
+    static std::string &toLower(std::string &inout) {
+        std::transform(
+            inout.begin(),
+            inout.end(),
+            inout.begin(),
+            (int (*)(int)) std::tolower
+        );
+        return inout;
+    }
+
+    /// Returns lower case copy of input string
+    static std::string lowerCase(const std::string &in)
+    {
+        std::string out = in;
+        return toLower(out);
+    }
+};
+
 
 /// Returns true if str1 begins with substring str2
 bool begins(const char* str1, const char* str2);
diff --git a/components/nif/nif_file.cpp b/components/nif/nif_file.cpp
index 3313d89ab..e6d3182ed 100644
--- a/components/nif/nif_file.cpp
+++ b/components/nif/nif_file.cpp
@@ -34,9 +34,159 @@
 #include "controller.hpp"
 
 #include <iostream>
-using namespace std;
-using namespace Nif;
-using namespace Misc;
+
+//TODO: when threading is needed, enable these
+//#include <boost/mutex.hpp>
+//#include <boost/thread/locks.hpp>
+
+namespace Nif
+{
+
+class NIFFile::LoadedCache
+{
+    //TODO: enable this to make cache thread safe...
+    //typedef boost::mutex mutex;
+    
+    struct mutex
+    {
+        void lock () {};
+        void unlock () {}
+    };
+    
+    typedef boost::lock_guard <mutex> lock_guard;
+    typedef std::map < std::string, boost::weak_ptr <NIFFile> > loaded_map;
+    typedef std::vector < boost::shared_ptr <NIFFile> > locked_files;
+
+    static int sLockLevel;
+    static mutex sProtector;
+    static loaded_map sLoadedMap;
+    static locked_files sLockedFiles;
+
+public:
+
+    static ptr create (const std::string &name)
+    {
+        lock_guard _ (sProtector);
+
+        ptr result;
+
+        // lookup the resource
+        loaded_map::iterator i = sLoadedMap.find (name);
+
+        if (i == sLoadedMap.end ()) // it doesn't existing currently,
+        {                           // or hasn't in the very near past
+
+            // create it now, for smoother threading if needed, the
+            // loading should be performed outside of the sLoaderMap
+            // lock and an alternate mechanism should be used to
+            // synchronize threads competing to load the same resource
+            result = boost::make_shared <NIFFile> (name, psudo_private_modifier());
+
+            // if we are locking the cache add an extra reference
+            // to keep the file in memory
+            if (sLockLevel > 0)
+                sLockedFiles.push_back (result);
+
+            // stash a reference to the resource so that future
+            // calls can benefit
+            sLoadedMap [name] = boost::weak_ptr <NIFFile> (result);
+        }
+        else // it may (probably) still exists
+        {
+            // attempt to get the reference
+            result = i->second.lock ();
+
+            if (!result) // resource is in the process of being destroyed
+            {
+                // create a new instance, to replace the one that has
+                // begun the irreversible process of being destroyed
+                result = boost::make_shared <NIFFile> (name, psudo_private_modifier());
+
+                // respect the cache lock...
+                if (sLockLevel > 0)
+                    sLockedFiles.push_back (result);
+
+                // we potentially overwrite an expired pointer here
+                // but the other thread performing the delete on
+                // the previous copy of this resource will detect it
+                // and make sure not to erase the new reference
+                sLoadedMap [name] = boost::weak_ptr <NIFFile> (result);
+            }
+        }
+
+        // we made it!
+        return result;
+    }
+
+    static void release (NIFFile * file)
+    {
+        lock_guard _ (sProtector);
+
+        loaded_map::iterator i = sLoadedMap.find (file->filename);
+
+        // its got to be in here, it just might not be us...
+        assert (i != sLoadedMap.end ());
+
+        // if weak_ptr is still expired, this resource hasn't been recreated
+        // between the initiation of the final release due to destruction
+        // of the last shared pointer and this thread acquiring the lock on
+        // the loader map
+        if (i->second.expired ())
+            sLoadedMap.erase (i);
+    }
+
+    static void lockCache ()
+    {
+        lock_guard _ (sProtector);
+
+        sLockLevel++;
+    }
+
+    static void unlockCache ()
+    {
+        locked_files resetList;
+
+        {
+            lock_guard _ (sProtector);
+
+            if (--sLockLevel)
+                sLockedFiles.swap(resetList);
+        }
+
+        // this not necessary, but makes it clear that the
+        // deletion of the locked cache entries is being done
+        // outside the protection of sProtector
+        resetList.clear ();
+    }
+};
+
+int NIFFile::LoadedCache::sLockLevel = 0;
+NIFFile::LoadedCache::mutex NIFFile::LoadedCache::sProtector;
+NIFFile::LoadedCache::loaded_map NIFFile::LoadedCache::sLoadedMap;
+NIFFile::LoadedCache::locked_files NIFFile::LoadedCache::sLockedFiles;
+
+// these three calls are forwarded to the cache implementation...
+void NIFFile::lockCache ()     { LoadedCache::lockCache (); }
+void NIFFile::unlockCache ()   { LoadedCache::unlockCache (); }
+NIFFile::ptr NIFFile::create (const std::string &name) { return LoadedCache::create  (name); }
+
+/// Open a NIF stream. The name is used for error messages.
+NIFFile::NIFFile(const std::string &name, psudo_private_modifier)
+    : filename(name)
+{
+    inp = Ogre::ResourceGroupManager::getSingleton().openResource(name);
+    parse();
+    // Make sure to close the file after it was loaded into memory
+    inp.setNull();
+}
+
+NIFFile::~NIFFile()
+{
+    LoadedCache::release (this);
+
+    for(std::size_t i=0; i<records.size(); i++)
+        delete records[i];
+}
 
 /* This file implements functions from the NIFFile class. It is also
    where we stash all the functions we couldn't add as inline
@@ -56,7 +206,7 @@ void NIFFile::parse()
     fail("Unsupported NIF version");
 
   // Number of records
-  int recNum = getInt();
+  size_t recNum = getInt();
   records.resize(recNum);
 
   /* The format for 10.0.1.0 seems to be a bit different. After the
@@ -68,7 +218,7 @@ void NIFFile::parse()
      we do not support or plan to support other versions yet.
   */
 
-  for(int i=0;i<recNum;i++)
+  for(size_t i = 0;i < recNum;i++)
     {
       std::string rec = getString();
       //cout << i << ": " << rec.toString() << endl;
@@ -160,6 +310,7 @@ void NIFFile::parse()
       assert(r != NULL);
       assert(r->recType != RC_MISSING);
       r->recName = rec;
+      r->recIndex = i;
       records[i] = r;
       r->read(this);
 
@@ -178,11 +329,8 @@ void NIFFile::parse()
      tree, but for the moment we ignore it.
    */
 
-  // TODO: Set up kf file here first, if applicable. It needs its own
-  // code to link it up with the main NIF structure.
-
   // Once parsing is done, do post-processing.
-  for(int i=0; i<recNum; i++)
+  for(size_t i=0; i<recNum; i++)
     records[i]->post(this);
 }
 
@@ -211,16 +359,18 @@ void NiSkinInstance::post(NIFFile *nif)
     }
 }
 
-Ogre::Matrix4 Node::getLocalTransform()
+Ogre::Matrix4 Node::getLocalTransform() const
 {
     Ogre::Matrix4 mat4(Ogre::Matrix4::IDENTITY);
     mat4.makeTransform(trafo.pos, Ogre::Vector3(trafo.scale), Ogre::Quaternion(trafo.rotation));
     return mat4;
 }
 
-Ogre::Matrix4 Node::getWorldTransform()
+Ogre::Matrix4 Node::getWorldTransform() const
 {
     if(parent != NULL)
         return parent->getWorldTransform() * getLocalTransform();
     return getLocalTransform();
 }
+
+}
diff --git a/components/nif/nif_file.hpp b/components/nif/nif_file.hpp
index 23bccb0fe..e8884cd4d 100644
--- a/components/nif/nif_file.hpp
+++ b/components/nif/nif_file.hpp
@@ -37,6 +37,11 @@
 #include <vector>
 #include <cassert>
 
+#include <boost/weak_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/detail/endian.hpp>
+
 #include <libs/platform/stdint.h>
 
 #include "record.hpp"
@@ -93,6 +98,14 @@ class NIFFile
         return u.f;
     }
 
+    class LoadedCache;
+    friend class LoadedCache;
+
+    // attempt to protect NIFFile from misuse...
+    struct psudo_private_modifier {}; // this dirty little trick should optimize out
+    NIFFile (NIFFile const &);
+    void operator = (NIFFile const &);
+
 public:
     /// Used for error handling
     void fail(const std::string &msg)
@@ -108,19 +121,21 @@ public:
                  << "File: "<<filename <<std::endl;
     }
 
-    /// Open a NIF stream. The name is used for error messages.
-    NIFFile(const std::string &name)
-      : filename(name)
-    {
-        inp = Ogre::ResourceGroupManager::getSingleton().openResource(name);
-        parse();
-    }
+    typedef boost::shared_ptr <NIFFile> ptr;
 
-    ~NIFFile()
+    /// Open a NIF stream. The name is used for error messages.
+    NIFFile(const std::string &name, psudo_private_modifier);
+    ~NIFFile();
+
+    static ptr create (const std::string &name);
+    static void lockCache ();
+    static void unlockCache ();
+
+    struct CacheLock
     {
-        for(std::size_t i=0; i<records.size(); i++)
-            delete records[i];
-    }
+        CacheLock () { lockCache (); }
+        ~CacheLock () { unlockCache (); }
+    };
 
     /// Get a given record
     Record *getRecord(size_t index)
@@ -131,7 +146,7 @@ public:
     }
 
     /// Number of records
-    int numRecords() { return records.size(); }
+    size_t numRecords() { return records.size(); }
 
     /*************************************************
                Parser functions
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index f7d3c6e96..07e7868cc 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -111,8 +111,8 @@ public:
         boneIndex = ind;
     }
 
-    Ogre::Matrix4 getLocalTransform();
-    Ogre::Matrix4 getWorldTransform();
+    Ogre::Matrix4 getLocalTransform() const;
+    Ogre::Matrix4 getWorldTransform() const;
 };
 
 struct NiNode : Node
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 5c4141fa9..d5f65e83a 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -91,8 +91,9 @@ struct Record
     // Record type and type name
     int recType;
     std::string recName;
+    size_t recIndex;
 
-    Record() : recType(RC_MISSING) {}
+    Record() : recType(RC_MISSING), recIndex(~(size_t)0) {}
 
     /// Parses the record from file
     virtual void read(NIFFile *nif) = 0;
diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp
index 42f6a8e68..9c6dafa34 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bullet_nif_loader.cpp
@@ -51,7 +51,7 @@ ManualBulletShapeLoader::~ManualBulletShapeLoader()
 }
 
 
-btQuaternion ManualBulletShapeLoader::getbtQuat(Ogre::Matrix3 &m)
+btQuaternion ManualBulletShapeLoader::getbtQuat(Ogre::Matrix3 const &m)
 {
     Ogre::Quaternion oquat(m);
     btQuaternion quat;
@@ -62,7 +62,7 @@ btQuaternion ManualBulletShapeLoader::getbtQuat(Ogre::Matrix3 &m)
     return quat;
 }
 
-btVector3 ManualBulletShapeLoader::getbtVector(Ogre::Vector3 &v)
+btVector3 ManualBulletShapeLoader::getbtVector(Ogre::Vector3 const &v)
 {
     return btVector3(v[0], v[1], v[2]);
 }
@@ -82,7 +82,8 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     // of the early stages of development. Right now we WANT to catch
     // every error as early and intrusively as possible, as it's most
     // likely a sign of incomplete code rather than faulty input.
-    Nif::NIFFile nif(resourceName.substr(0, resourceName.length()-7));
+    Nif::NIFFile::ptr pnif (Nif::NIFFile::create (resourceName.substr(0, resourceName.length()-7)));
+    Nif::NIFFile & nif = *pnif.get ();
     if (nif.numRecords() < 1)
     {
         warn("Found no records in NIF.");
@@ -138,7 +139,7 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     }
 }
 
-bool ManualBulletShapeLoader::hasRootCollisionNode(Nif::Node* node)
+bool ManualBulletShapeLoader::hasRootCollisionNode(Nif::Node const * node)
 {
     if (node->recType == Nif::RC_NiNode)
     {
@@ -164,8 +165,8 @@ bool ManualBulletShapeLoader::hasRootCollisionNode(Nif::Node* node)
     return false;
 }
 
-void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
-   const Nif::Transformation *trafo,bool hasCollisionNode,bool isCollisionNode,bool raycastingOnly)
+void ManualBulletShapeLoader::handleNode(Nif::Node const *node, int flags,
+   const Nif::Transformation *parentTrafo,bool hasCollisionNode,bool isCollisionNode,bool raycastingOnly)
 {
 
     // Accumulate the flags from all the child nodes. This works for all
@@ -181,7 +182,7 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
     }
 
     // Check for extra data
-    Nif::Extra *e = node;
+    Nif::Extra const *e = node;
     while (!e->extra.empty())
     {
         // Get the next extra data in the list
@@ -208,23 +209,23 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
         }
     }
 
+    Nif::Transformation childTrafo = node->trafo;
 
-    if (trafo)
+    if (parentTrafo)
     {
 
         // Get a non-const reference to the node's data, since we're
         // overwriting it. TODO: Is this necessary?
-        Nif::Transformation &final = node->trafo;
 
         // For both position and rotation we have that:
         // final_vector = old_vector + old_rotation*new_vector*old_scale
-        final.pos = trafo->pos + trafo->rotation*final.pos*trafo->scale;
+        childTrafo.pos = parentTrafo->pos + parentTrafo->rotation*childTrafo.pos*parentTrafo->scale;
 
         // Merge the rotations together
-        final.rotation = trafo->rotation * final.rotation;
+        childTrafo.rotation = parentTrafo->rotation * childTrafo.rotation;
 
         // Scale
-        final.scale *= trafo->scale;
+        childTrafo.scale *= parentTrafo->scale;
 
     }
 
@@ -232,7 +233,7 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
     {
 
         
-        btVector3 boxsize = getbtVector((node->boundXYZ));
+        btVector3 boxsize = getbtVector(node->boundXYZ);
         cShape->boxTranslation = node->boundPos;
         cShape->boxRotation = node->boundRot;
 
@@ -243,20 +244,20 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
     // For NiNodes, loop through children
     if (node->recType == Nif::RC_NiNode)
     {
-        Nif::NodeList &list = ((Nif::NiNode*)node)->children;
+        Nif::NodeList const &list = ((Nif::NiNode const *)node)->children;
         int n = list.length();
         for (int i=0; i<n; i++)
         {
             if (!list[i].empty())
             {
-                handleNode(list[i].getPtr(), flags,&node->trafo,hasCollisionNode,isCollisionNode,raycastingOnly);
+                handleNode(list[i].getPtr(), flags,&childTrafo,hasCollisionNode,isCollisionNode,raycastingOnly);
             }
         }
     }
     else if (node->recType == Nif::RC_NiTriShape && (isCollisionNode || !hasCollisionNode))
     {
         cShape->mCollide = !(flags&0x800);
-        handleNiTriShape(dynamic_cast<Nif::NiTriShape*>(node), flags,node->trafo.rotation,node->trafo.pos,node->trafo.scale,raycastingOnly);
+        handleNiTriShape(dynamic_cast<Nif::NiTriShape const *>(node), flags,childTrafo.rotation,childTrafo.pos,childTrafo.scale,raycastingOnly);
     }
     else if(node->recType == Nif::RC_RootCollisionNode)
     {
@@ -265,12 +266,12 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
         for (int i=0; i<n; i++)
         {
             if (!list[i].empty())
-                handleNode(list[i].getPtr(), flags,&node->trafo, hasCollisionNode,true,raycastingOnly);
+                handleNode(list[i].getPtr(), flags,&childTrafo, hasCollisionNode,true,raycastingOnly);
         }
     }
 }
 
-void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags,Ogre::Matrix3 parentRot,Ogre::Vector3 parentPos,float parentScale,
+void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape const *shape, int flags,Ogre::Matrix3 parentRot,Ogre::Vector3 parentPos,float parentScale,
     bool raycastingOnly)
 {
     assert(shape != NULL);
diff --git a/components/nifbullet/bullet_nif_loader.hpp b/components/nifbullet/bullet_nif_loader.hpp
index 2190fda1b..520878ce1 100644
--- a/components/nifbullet/bullet_nif_loader.hpp
+++ b/components/nifbullet/bullet_nif_loader.hpp
@@ -79,25 +79,25 @@ public:
     void load(const std::string &name,const std::string &group);
 
 private:
-    btQuaternion getbtQuat(Ogre::Matrix3 &m);
+    btQuaternion getbtQuat(Ogre::Matrix3 const &m);
 
-    btVector3 getbtVector(Ogre::Vector3 &v);
+    btVector3 getbtVector(Ogre::Vector3 const &v);
 
     /**
     *Parse a node.
     */
-    void handleNode(Nif::Node *node, int flags,
+    void handleNode(Nif::Node const *node, int flags,
         const Nif::Transformation *trafo, bool hasCollisionNode,bool isCollisionNode,bool raycastingOnly);
 
     /**
     *Helper function
     */
-    bool hasRootCollisionNode(Nif::Node* node);
+    bool hasRootCollisionNode(Nif::Node const * node);
 
     /**
     *convert a NiTriShape to a bullet trishape.
     */
-    void handleNiTriShape(Nif::NiTriShape *shape, int flags,Ogre::Matrix3 parentRot,Ogre::Vector3 parentPos,float parentScales,bool raycastingOnly);
+    void handleNiTriShape(Nif::NiTriShape const *shape, int flags,Ogre::Matrix3 parentRot,Ogre::Vector3 parentPos,float parentScales,bool raycastingOnly);
 
     std::string resourceName;
     std::string resourceGroup;
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogre_nif_loader.cpp
index ad51d50b9..dfbc93ee9 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogre_nif_loader.cpp
@@ -43,16 +43,27 @@
 
 #include <extern/shiny/Main/Factory.hpp>
 
+#include <components/nif/node.hpp>
+#include <components/misc/stringops.hpp>
 #include <components/settings/settings.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
 typedef unsigned char ubyte;
 
-using namespace std;
-using namespace Nif;
-using namespace NifOgre;
+namespace std
+{
 
+// These operators allow extra data types to be stored in an Ogre::Any
+// object, which can then be stored in user object bindings on the nodes
 
+// TODO: Do something useful
+ostream& operator<<(ostream &o, const NifOgre::TextKeyMap&)
+{ return o; }
+
+}
+
+namespace NifOgre
+{
 // Helper class that computes the bounding box and of a mesh
 class BoundsFinder
 {
@@ -62,7 +73,7 @@ class BoundsFinder
 
         MaxMinFinder()
         {
-            min = numeric_limits<float>::infinity();
+            min = std::numeric_limits<float>::infinity();
             max = -min;
         }
 
@@ -152,8 +163,9 @@ static void fail(const std::string &msg)
 }
 
 
-static void insertTextKeys(const Nif::NiTextKeyExtraData *tk, TextKeyMap *textkeys)
+static TextKeyMap extractTextKeys(const Nif::NiTextKeyExtraData *tk)
 {
+    TextKeyMap textkeys;
     for(size_t i = 0;i < tk->list.size();i++)
     {
         const std::string &str = tk->list[i].text;
@@ -166,15 +178,16 @@ static void insertTextKeys(const Nif::NiTextKeyExtraData *tk, TextKeyMap *textke
                 break;
 
             std::string::size_type nextpos = std::min(str.find('\r', pos), str.find('\n', pos));
-            textkeys->insert(std::make_pair(tk->list[i].time, str.substr(pos, nextpos-pos)));
+            textkeys.insert(std::make_pair(tk->list[i].time, str.substr(pos, nextpos-pos)));
 
             pos = nextpos;
         }
     }
+    return textkeys;
 }
 
 
-void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, std::vector<Nif::NiKeyframeController*> &ctrls, Ogre::Bone *parent=NULL)
+void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, std::vector<Nif::NiKeyframeController const*> &ctrls, Ogre::Bone *parent=NULL)
 {
     Ogre::Bone *bone;
     if(!skel->hasBone(node->name))
@@ -197,6 +210,17 @@ void buildBones(Ogre::Skeleton *skel, const Nif::Node *node, std::vector<Nif::Ni
         ctrl = ctrl->next;
     }
 
+    Nif::ExtraPtr e = node->extra;
+    while(!e.empty())
+    {
+        if(e->recType == Nif::RC_NiTextKeyExtraData)
+        {
+            const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
+            bone->getUserObjectBindings().setUserAny("TextKeyExtraData", Ogre::Any(extractTextKeys(tk)));
+        }
+        e = e->extra;
+    }
+
     const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
     if(ninode)
     {
@@ -219,7 +243,7 @@ struct KeyTimeSort
 };
 
 
-typedef std::map<std::string,NIFSkeletonLoader,ciLessBoost> LoaderMap;
+typedef std::map<std::string,NIFSkeletonLoader> LoaderMap;
 static LoaderMap sLoaders;
 
 public:
@@ -228,10 +252,11 @@ void loadResource(Ogre::Resource *resource)
     Ogre::Skeleton *skel = dynamic_cast<Ogre::Skeleton*>(resource);
     OgreAssert(skel, "Attempting to load a skeleton into a non-skeleton resource!");
 
-    Nif::NIFFile nif(skel->getName());
+    Nif::NIFFile::ptr pnif(Nif::NIFFile::create (skel->getName()));
+    Nif::NIFFile & nif = *pnif.get ();
     const Nif::Node *node = dynamic_cast<const Nif::Node*>(nif.getRecord(0));
 
-    std::vector<Nif::NiKeyframeController*> ctrls;
+    std::vector<Nif::NiKeyframeController const*> ctrls;
     buildBones(skel, node, ctrls);
 
     std::vector<std::string> targets;
@@ -242,7 +267,7 @@ void loadResource(Ogre::Resource *resource)
     float maxtime = 0.0f;
     for(size_t i = 0;i < ctrls.size();i++)
     {
-        Nif::NiKeyframeController *ctrl = ctrls[i];
+        Nif::NiKeyframeController const *ctrl = ctrls[i];
         maxtime = std::max(maxtime, ctrl->timeStop);
         Nif::Named *target = dynamic_cast<Nif::Named*>(ctrl->target.getPtr());
         if(target != NULL)
@@ -265,20 +290,20 @@ void loadResource(Ogre::Resource *resource)
 
     for(size_t i = 0;i < ctrls.size();i++)
     {
-        Nif::NiKeyframeController *kfc = ctrls[i];
-        Nif::NiKeyframeData *kf = kfc->data.getPtr();
+        Nif::NiKeyframeController const *kfc = ctrls[i];
+        Nif::NiKeyframeData const *kf = kfc->data.getPtr();
 
         /* Get the keyframes and make sure they're sorted first to last */
-        QuaternionKeyList quatkeys = kf->mRotations;
-        Vector3KeyList trankeys = kf->mTranslations;
-        FloatKeyList scalekeys = kf->mScales;
+        Nif::QuaternionKeyList quatkeys = kf->mRotations;
+        Nif::Vector3KeyList trankeys = kf->mTranslations;
+        Nif::FloatKeyList scalekeys = kf->mScales;
         std::sort(quatkeys.mKeys.begin(), quatkeys.mKeys.end(), KeyTimeSort<Ogre::Quaternion>());
         std::sort(trankeys.mKeys.begin(), trankeys.mKeys.end(), KeyTimeSort<Ogre::Vector3>());
         std::sort(scalekeys.mKeys.begin(), scalekeys.mKeys.end(), KeyTimeSort<float>());
 
-        QuaternionKeyList::VecType::const_iterator quatiter = quatkeys.mKeys.begin();
-        Vector3KeyList::VecType::const_iterator traniter = trankeys.mKeys.begin();
-        FloatKeyList::VecType::const_iterator scaleiter = scalekeys.mKeys.begin();
+        Nif::QuaternionKeyList::VecType::const_iterator quatiter = quatkeys.mKeys.begin();
+        Nif::Vector3KeyList::VecType::const_iterator traniter = trankeys.mKeys.begin();
+        Nif::FloatKeyList::VecType::const_iterator scaleiter = scalekeys.mKeys.begin();
 
         Ogre::Bone *bone = skel->getBone(targets[i]);
         const Ogre::Quaternion startquat = bone->getInitialOrientation();
@@ -346,7 +371,7 @@ void loadResource(Ogre::Resource *resource)
                 kframe->setRotation(curquat);
             else
             {
-                QuaternionKeyList::VecType::const_iterator last = quatiter-1;
+                Nif::QuaternionKeyList::VecType::const_iterator last = quatiter-1;
                 float diff = (curtime-last->mTime) / (quatiter->mTime-last->mTime);
                 kframe->setRotation(Ogre::Quaternion::nlerp(diff, lastquat, curquat));
             }
@@ -354,7 +379,7 @@ void loadResource(Ogre::Resource *resource)
                 kframe->setTranslate(curtrans);
             else
             {
-                Vector3KeyList::VecType::const_iterator last = traniter-1;
+                Nif::Vector3KeyList::VecType::const_iterator last = traniter-1;
                 float diff = (curtime-last->mTime) / (traniter->mTime-last->mTime);
                 kframe->setTranslate(lasttrans + ((curtrans-lasttrans)*diff));
             }
@@ -362,7 +387,7 @@ void loadResource(Ogre::Resource *resource)
                 kframe->setScale(curscale);
             else
             {
-                FloatKeyList::VecType::const_iterator last = scaleiter-1;
+                Nif::FloatKeyList::VecType::const_iterator last = scaleiter-1;
                 float diff = (curtime-last->mTime) / (scaleiter->mTime-last->mTime);
                 kframe->setScale(lastscale + ((curscale-lastscale)*diff));
             }
@@ -371,35 +396,18 @@ void loadResource(Ogre::Resource *resource)
     anim->optimise();
 }
 
-bool createSkeleton(const std::string &name, const std::string &group, TextKeyMap *textkeys, const Nif::Node *node)
+bool createSkeleton(const std::string &name, const std::string &group, const Nif::Node *node)
 {
-    if(textkeys)
-    {
-        Nif::ExtraPtr e = node->extra;
-        while(!e.empty())
-        {
-            if(e->recType == Nif::RC_NiTextKeyExtraData)
-            {
-                const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
-                insertTextKeys(tk, textkeys);
-            }
-            e = e->extra;
-        }
-    }
-
     if(node->boneTrafo != NULL)
     {
         Ogre::SkeletonManager &skelMgr = Ogre::SkeletonManager::getSingleton();
-
         Ogre::SkeletonPtr skel = skelMgr.getByName(name);
         if(skel.isNull())
         {
             NIFSkeletonLoader *loader = &sLoaders[name];
             skel = skelMgr.create(name, group, true, loader);
         }
-
-        if(!textkeys || textkeys->size() > 0)
-            return true;
+        return true;
     }
 
     const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
@@ -410,7 +418,7 @@ bool createSkeleton(const std::string &name, const std::string &group, TextKeyMa
         {
             if(!children[i].empty())
             {
-                if(createSkeleton(name, group, textkeys, children[i].getPtr()))
+                if(createSkeleton(name, group, children[i].getPtr()))
                     return true;
             }
         }
@@ -484,7 +492,7 @@ static void fail(const std::string &msg)
 
 
 public:
-static Ogre::String getMaterial(const NiTriShape *shape, const Ogre::String &name, const Ogre::String &group)
+static Ogre::String getMaterial(const Nif::NiTriShape *shape, const Ogre::String &name, const Ogre::String &group)
 {
     Ogre::MaterialManager &matMgr = Ogre::MaterialManager::getSingleton();
     Ogre::MaterialPtr material = matMgr.getByName(name);
@@ -504,24 +512,24 @@ static Ogre::String getMaterial(const NiTriShape *shape, const Ogre::String &nam
     bool vertexColour = (shape->data->colors.size() != 0);
 
     // These are set below if present
-    const NiTexturingProperty *t = NULL;
-    const NiMaterialProperty *m = NULL;
-    const NiAlphaProperty *a = NULL;
+    const Nif::NiTexturingProperty *t = NULL;
+    const Nif::NiMaterialProperty *m = NULL;
+    const Nif::NiAlphaProperty *a = NULL;
 
     // Scan the property list for material information
-    const PropertyList &list = shape->props;
+    const Nif::PropertyList &list = shape->props;
     for (size_t i = 0;i < list.length();i++)
     {
         // Entries may be empty
         if (list[i].empty()) continue;
 
-        const Property *pr = list[i].getPtr();
-        if (pr->recType == RC_NiTexturingProperty)
-            t = static_cast<const NiTexturingProperty*>(pr);
-        else if (pr->recType == RC_NiMaterialProperty)
-            m = static_cast<const NiMaterialProperty*>(pr);
-        else if (pr->recType == RC_NiAlphaProperty)
-            a = static_cast<const NiAlphaProperty*>(pr);
+        const Nif::Property *pr = list[i].getPtr();
+        if (pr->recType == Nif::RC_NiTexturingProperty)
+            t = static_cast<const Nif::NiTexturingProperty*>(pr);
+        else if (pr->recType == Nif::RC_NiMaterialProperty)
+            m = static_cast<const Nif::NiMaterialProperty*>(pr);
+        else if (pr->recType == Nif::RC_NiAlphaProperty)
+            a = static_cast<const Nif::NiAlphaProperty*>(pr);
         else
             warn("Skipped property type: "+pr->recName);
     }
@@ -529,18 +537,27 @@ static Ogre::String getMaterial(const NiTriShape *shape, const Ogre::String &nam
     // Texture
     if (t && t->textures[0].inUse)
     {
-        NiSourceTexture *st = t->textures[0].texture.getPtr();
+        Nif::NiSourceTexture *st = t->textures[0].texture.getPtr();
         if (st->external)
         {
             /* Bethesda at some at some point converted all their BSA
              * textures from tga to dds for increased load speed, but all
              * texture file name references were kept as .tga.
              */
-            texName = "textures\\" + st->filename;
-            if(!Ogre::ResourceGroupManager::getSingleton().resourceExistsInAnyGroup(texName))
+            static const char path[] = "textures\\";
+
+            texName = path + st->filename;
+            Ogre::String::size_type pos = texName.rfind('.');
+            if(pos != Ogre::String::npos && texName.compare(pos, texName.length() - pos, ".dds") != 0)
             {
-                Ogre::String::size_type pos = texName.rfind('.');
+                // since we know all (GOTY edition or less) textures end
+                // in .dds, we change the extension
                 texName.replace(pos, texName.length(), ".dds");
+
+                // if it turns out that the above wasn't true in all cases (not for vanilla, but maybe mods)
+                // verify, and revert if false (this call succeeds quickly, but fails slowly)
+                if(!Ogre::ResourceGroupManager::getSingleton().resourceExistsInAnyGroup(texName))
+                    texName = path + st->filename;
             }
         }
         else warn("Found internal texture, ignoring.");
@@ -678,9 +695,10 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
 {
     std::string mName;
     std::string mGroup;
-    std::string mShapeName;
-    std::string mMaterialName;
+    size_t mShapeIndex;
     std::string mSkelName;
+    std::string mMaterialName;
+    std::string mShapeName;
 
     void warn(const std::string &msg)
     {
@@ -695,7 +713,7 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
 
 
     // Convert NiTriShape to Ogre::SubMesh
-    void handleNiTriShape(Ogre::Mesh *mesh, Nif::NiTriShape *shape)
+    void handleNiTriShape(Ogre::Mesh *mesh, Nif::NiTriShape const *shape)
     {
         Ogre::SkeletonPtr skel;
         const Nif::NiTriShapeData *data = shape->data.getPtr();
@@ -788,7 +806,8 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
         Ogre::VertexDeclaration *decl;
         int nextBuf = 0;
 
-        Ogre::SubMesh *sub = mesh->createSubMesh(shape->name);
+        Ogre::SubMesh *sub = ((mShapeName.length() > 0) ? mesh->createSubMesh(mShapeName) :
+                                                          mesh->createSubMesh());
 
         // Add vertices
         sub->useSharedVertices = false;
@@ -893,18 +912,18 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
             sub->setMaterialName(mMaterialName);
     }
 
-    bool findTriShape(Ogre::Mesh *mesh, Nif::Node *node)
+    bool findTriShape(Ogre::Mesh *mesh, Nif::Node const *node)
     {
-        if(node->recType == Nif::RC_NiTriShape && mShapeName == node->name)
+        if(node->recType == Nif::RC_NiTriShape && mShapeIndex == node->recIndex)
         {
-            handleNiTriShape(mesh, dynamic_cast<Nif::NiTriShape*>(node));
+            handleNiTriShape(mesh, dynamic_cast<const Nif::NiTriShape*>(node));
             return true;
         }
 
-        Nif::NiNode *ninode = dynamic_cast<Nif::NiNode*>(node);
+        const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
         if(ninode)
         {
-            Nif::NodeList &children = ninode->children;
+            Nif::NodeList const &children = ninode->children;
             for(size_t i = 0;i < children.length();i++)
             {
                 if(!children[i].empty())
@@ -918,14 +937,14 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
     }
 
 
-    typedef std::map<std::string,NIFMeshLoader,ciLessBoost> LoaderMap;
+    typedef std::map<std::string,NIFMeshLoader> LoaderMap;
     static LoaderMap sLoaders;
 
 public:
     NIFMeshLoader()
     { }
     NIFMeshLoader(const std::string &name, const std::string &group, const std::string skelName)
-      : mName(name), mGroup(group), mSkelName(skelName)
+      : mName(name), mGroup(group), mShapeIndex(~(size_t)0), mSkelName(skelName)
     { }
 
     virtual void loadResource(Ogre::Resource *resource)
@@ -933,15 +952,14 @@ public:
         Ogre::Mesh *mesh = dynamic_cast<Ogre::Mesh*>(resource);
         assert(mesh && "Attempting to load a mesh into a non-mesh resource!");
 
-        if(!mShapeName.length())
+        Nif::NIFFile::ptr nif = Nif::NIFFile::create(mName);
+        if(mShapeIndex >= nif->numRecords())
         {
-            if(mSkelName.length() > 0)
-                mesh->setSkeletonName(mSkelName);
+            mesh->setSkeletonName(mSkelName);
             return;
         }
 
-        Nif::NIFFile nif(mName);
-        Nif::Node *node = dynamic_cast<Nif::Node*>(nif.getRecord(0));
+        Nif::Node const *node = dynamic_cast<const Nif::Node*>(nif->getRecord(mShapeIndex));
         findTriShape(mesh, node);
     }
 
@@ -981,14 +999,17 @@ public:
 
         if(node->recType == Nif::RC_NiTriShape)
         {
-            const NiTriShape *shape = dynamic_cast<const NiTriShape*>(node);
+            const Nif::NiTriShape *shape = dynamic_cast<const Nif::NiTriShape*>(node);
+            mShapeName = shape->name;
 
             Ogre::MeshManager &meshMgr = Ogre::MeshManager::getSingleton();
-            std::string fullname = mName+"@shape="+shape->name;
+            std::string fullname = mName+"@index="+Ogre::StringConverter::toString(shape->recIndex);
+            if(mShapeName.length() > 0)
+                fullname += "@shape="+mShapeName;
             if(mSkelName.length() > 0 && mName != mSkelName)
                 fullname += "@skel="+mSkelName;
 
-            std::transform(fullname.begin(), fullname.end(), fullname.begin(), ::tolower);
+            Misc::StringUtils::toLower(fullname);
             Ogre::MeshPtr mesh = meshMgr.getByName(fullname);
             if(mesh.isNull())
             {
@@ -996,7 +1017,7 @@ public:
                 *loader = *this;
                 if(!(flags&0x01)) // Not hidden
                 {
-                    loader->mShapeName = shape->name;
+                    loader->mShapeIndex = shape->recIndex;
                     loader->mMaterialName = NIFMaterialLoader::getMaterial(shape, fullname, mGroup);
                 }
 
@@ -1004,7 +1025,7 @@ public:
                 mesh->setAutoBuildEdgeLists(false);
             }
 
-            meshes.push_back(std::make_pair(mesh, shape->name));
+            meshes.push_back(std::make_pair(mesh->getName(), shape->name));
         }
         else if(node->recType != Nif::RC_NiNode && node->recType != Nif::RC_RootCollisionNode &&
                 node->recType != Nif::RC_NiRotatingParticles)
@@ -1025,14 +1046,21 @@ public:
 NIFMeshLoader::LoaderMap NIFMeshLoader::sLoaders;
 
 
-MeshPairList NIFLoader::load(std::string name, std::string skelName, TextKeyMap *textkeys, const std::string &group)
+typedef std::map<std::string,MeshPairList> MeshPairMap;
+static MeshPairMap sMeshPairMap;
+
+MeshPairList NIFLoader::load(std::string name, std::string skelName, const std::string &group)
 {
-    MeshPairList meshes;
+    Misc::StringUtils::toLower(name);
+     Misc::StringUtils::toLower(skelName);
 
-    std::transform(name.begin(), name.end(), name.begin(), ::tolower);
-    std::transform(skelName.begin(), skelName.end(), skelName.begin(), ::tolower);
+    MeshPairMap::const_iterator meshiter = sMeshPairMap.find(name+"@skel="+skelName);
+    if(meshiter != sMeshPairMap.end())
+        return meshiter->second;
 
-    Nif::NIFFile nif(name);
+    MeshPairList &meshes = sMeshPairMap[name+"@skel="+skelName];
+    Nif::NIFFile::ptr pnif = Nif::NIFFile::create (name);
+    Nif::NIFFile &nif = *pnif.get ();
     if (nif.numRecords() < 1)
     {
         nif.warn("Found no records in NIF.");
@@ -1040,10 +1068,10 @@ MeshPairList NIFLoader::load(std::string name, std::string skelName, TextKeyMap
     }
 
     // The first record is assumed to be the root node
-    Nif::Record *r = nif.getRecord(0);
+    Nif::Record const *r = nif.getRecord(0);
     assert(r != NULL);
 
-    Nif::Node *node = dynamic_cast<Nif::Node*>(r);
+    Nif::Node const *node = dynamic_cast<Nif::Node const *>(r);
     if(node == NULL)
     {
         nif.warn("First record in file was not a node, but a "+
@@ -1052,7 +1080,7 @@ MeshPairList NIFLoader::load(std::string name, std::string skelName, TextKeyMap
     }
 
     NIFSkeletonLoader skelldr;
-    bool hasSkel = skelldr.createSkeleton(skelName, group, textkeys, node);
+    bool hasSkel = skelldr.createSkeleton(name, group, node);
 
     NIFMeshLoader meshldr(name, group, (hasSkel ? skelName : std::string()));
     meshldr.createMeshes(node, meshes);
@@ -1064,19 +1092,37 @@ EntityList NIFLoader::createEntities(Ogre::SceneNode *parent, TextKeyMap *textke
 {
     EntityList entitylist;
 
-    MeshPairList meshes = load(name, name, textkeys, group);
+    MeshPairList meshes = load(name, name, group);
     if(meshes.size() == 0)
         return entitylist;
 
     Ogre::SceneManager *sceneMgr = parent->getCreator();
     for(size_t i = 0;i < meshes.size();i++)
     {
-        entitylist.mEntities.push_back(sceneMgr->createEntity(meshes[i].first->getName()));
+        entitylist.mEntities.push_back(sceneMgr->createEntity(meshes[i].first));
         Ogre::Entity *entity = entitylist.mEntities.back();
         if(!entitylist.mSkelBase && entity->hasSkeleton())
             entitylist.mSkelBase = entity;
     }
 
+    if(entitylist.mSkelBase && textkeys)
+    {
+        // Would be nice if Ogre::SkeletonInstance allowed access to the 'master' Ogre::SkeletonPtr.
+        Ogre::SkeletonManager &skelMgr = Ogre::SkeletonManager::getSingleton();
+        Ogre::SkeletonPtr skel = skelMgr.getByName(entitylist.mSkelBase->getSkeleton()->getName());
+        Ogre::Skeleton::BoneIterator iter = skel->getBoneIterator();
+        while(iter.hasMoreElements())
+        {
+            Ogre::Bone *bone = iter.getNext();
+            const Ogre::Any &data = bone->getUserObjectBindings().getUserAny("TextKeyExtraData");
+            if(!data.isEmpty())
+            {
+                *textkeys = Ogre::any_cast<TextKeyMap>(data);
+                break;
+            }
+        }
+    }
+
     if(entitylist.mSkelBase)
     {
         parent->attachObject(entitylist.mSkelBase);
@@ -1101,13 +1147,6 @@ EntityList NIFLoader::createEntities(Ogre::SceneNode *parent, TextKeyMap *textke
     return entitylist;
 }
 
-struct checklow {
-    bool operator()(const char &a, const char &b) const
-    {
-        return ::tolower(a) == ::tolower(b);
-    }
-};
-
 EntityList NIFLoader::createEntities(Ogre::Entity *parent, const std::string &bonename,
                                      Ogre::SceneNode *parentNode,
                                      const std::string &name,
@@ -1115,23 +1154,24 @@ EntityList NIFLoader::createEntities(Ogre::Entity *parent, const std::string &bo
 {
     EntityList entitylist;
 
-    MeshPairList meshes = load(name, parent->getMesh()->getSkeletonName(), NULL, group);
+    MeshPairList meshes = load(name, parent->getMesh()->getSkeletonName(), group);
     if(meshes.size() == 0)
         return entitylist;
 
     Ogre::SceneManager *sceneMgr = parentNode->getCreator();
-    std::string filter = "Tri "+bonename;
+    std::string filter = "tri "+bonename;
+    std::transform(filter.begin()+4, filter.end(), filter.begin()+4, ::tolower);
     for(size_t i = 0;i < meshes.size();i++)
     {
-        Ogre::Entity *ent = sceneMgr->createEntity(meshes[i].first->getName());
+        Ogre::Entity *ent = sceneMgr->createEntity(meshes[i].first);
         if(ent->hasSkeleton())
         {
+             Misc::StringUtils::toLower(meshes[i].second);
+
             if(meshes[i].second.length() < filter.length() ||
-               std::mismatch(filter.begin(), filter.end(), meshes[i].second.begin(), checklow()).first != filter.end())
+               meshes[i].second.compare(0, filter.length(), filter) != 0)
             {
                 sceneMgr->destroyEntity(ent);
-                meshes.erase(meshes.begin()+i);
-                i--;
                 continue;
             }
             if(!entitylist.mSkelBase)
@@ -1216,3 +1256,5 @@ extern "C" void ogre_insertTexture(char* name, uint32_t width, uint32_t height,
 
 
 */
+
+} // nsmaepace NifOgre
diff --git a/components/nifogre/ogre_nif_loader.hpp b/components/nifogre/ogre_nif_loader.hpp
index a203112b5..3e05c5873 100644
--- a/components/nifogre/ogre_nif_loader.hpp
+++ b/components/nifogre/ogre_nif_loader.hpp
@@ -30,23 +30,6 @@
 
 #include <vector>
 #include <string>
-#include <cassert>
-#include <boost/algorithm/string.hpp>
-
-#include "../nif/node.hpp"
-
-#include <libs/platform/strings.h>
-
-class BoundsFinder;
-
-struct ciLessBoost : std::binary_function<std::string, std::string, bool>
-{
-    bool operator() (const std::string & s1, const std::string & s2) const
-    {
-        //case insensitive version of is_less
-        return boost::algorithm::lexicographical_compare(s1, s2, boost::algorithm::is_iless());
-    }
-};
 
 namespace Nif
 {
@@ -69,9 +52,8 @@ struct EntityList {
 };
 
 
-/** This holds a list of meshes along with the names of their parent nodes
- */
-typedef std::vector< std::pair<Ogre::MeshPtr,std::string> > MeshPairList;
+/** This holds a list of mesh names along with the names of their parent nodes */
+typedef std::vector< std::pair<std::string,std::string> > MeshPairList;
 
 /** Manual resource loader for NIF meshes. This is the main class
     responsible for translating the internal NIF mesh structure into
@@ -87,7 +69,7 @@ typedef std::vector< std::pair<Ogre::MeshPtr,std::string> > MeshPairList;
  */
 class NIFLoader
 {
-    static MeshPairList load(std::string name, std::string skelName, TextKeyMap *textkeys, const std::string &group);
+    static MeshPairList load(std::string name, std::string skelName, const std::string &group);
 
 public:
     static EntityList createEntities(Ogre::Entity *parent, const std::string &bonename,
diff --git a/components/nifoverrides/nifoverrides.cpp b/components/nifoverrides/nifoverrides.cpp
index 1c8fefd24..191b4ac2f 100644
--- a/components/nifoverrides/nifoverrides.cpp
+++ b/components/nifoverrides/nifoverrides.cpp
@@ -2,7 +2,8 @@
 
 #include <OgreStringConverter.h>
 
-#include <boost/algorithm/string.hpp>
+#include <../components/misc/stringops.hpp>
+
 
 using namespace NifOverrides;
 
@@ -19,7 +20,7 @@ TransparencyResult Overrides::getTransparencyOverride(const std::string& texture
     result.first = false;
 
     std::string tex = texture;
-    boost::to_lower(tex);
+    Misc::StringUtils::toLower(tex);
 
     Ogre::ConfigFile::SectionIterator seci = mTransparencyOverrides.getSectionIterator();
     while (seci.hasMoreElements())
diff --git a/components/to_utf8/tests/.gitignore b/components/to_utf8/tests/.gitignore
new file mode 100644
index 000000000..814490404
--- /dev/null
+++ b/components/to_utf8/tests/.gitignore
@@ -0,0 +1 @@
+*_test
diff --git a/components/to_utf8/tests/output/to_utf8_test.out b/components/to_utf8/tests/output/to_utf8_test.out
new file mode 100644
index 000000000..dcb32359a
--- /dev/null
+++ b/components/to_utf8/tests/output/to_utf8_test.out
@@ -0,0 +1,4 @@
+original:  Без вопро�ов отдаете ем� р�лет, зная, что позже вы �можете приве�ти � �обой �воих др�зей и тогда он пол�чит по за�л�гам?
+converted: Без вопро�ов отдаете ем� р�лет, зная, что позже вы �можете приве�ти � �обой �воих др�зей и тогда он пол�чит по за�л�гам?
+original:  Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
+converted: Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
diff --git a/components/to_utf8/tests/test.sh b/components/to_utf8/tests/test.sh
new file mode 100755
index 000000000..2d07708ad
--- /dev/null
+++ b/components/to_utf8/tests/test.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+make || exit
+
+mkdir -p output
+
+PROGS=*_test
+
+for a in $PROGS; do
+    if [ -f "output/$a.out" ]; then
+        echo "Running $a:"
+        ./$a | diff output/$a.out -
+    else
+        echo "Creating $a.out"
+        ./$a > "output/$a.out"
+        git add "output/$a.out"
+    fi
+done
diff --git a/components/to_utf8/tests/test_data/french-utf8.txt b/components/to_utf8/tests/test_data/french-utf8.txt
new file mode 100644
index 000000000..aaaccac73
--- /dev/null
+++ b/components/to_utf8/tests/test_data/french-utf8.txt
@@ -0,0 +1 @@
+Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
\ No newline at end of file
diff --git a/components/to_utf8/tests/test_data/french-win1252.txt b/components/to_utf8/tests/test_data/french-win1252.txt
new file mode 100644
index 000000000..1de4593e9
--- /dev/null
+++ b/components/to_utf8/tests/test_data/french-win1252.txt
@@ -0,0 +1 @@
+Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
\ No newline at end of file
diff --git a/components/to_utf8/tests/test_data/russian-utf8.txt b/components/to_utf8/tests/test_data/russian-utf8.txt
new file mode 100644
index 000000000..eb20b32dd
--- /dev/null
+++ b/components/to_utf8/tests/test_data/russian-utf8.txt
@@ -0,0 +1 @@
+Без вопро�ов отдаете ем� р�лет, зная, что позже вы �можете приве�ти � �обой �воих др�зей и тогда он пол�чит по за�л�гам?
\ No newline at end of file
diff --git a/components/to_utf8/tests/test_data/russian-win1251.txt b/components/to_utf8/tests/test_data/russian-win1251.txt
new file mode 100644
index 000000000..086e57edd
--- /dev/null
+++ b/components/to_utf8/tests/test_data/russian-win1251.txt
@@ -0,0 +1 @@
+Áĺç âîďđîńîâ îňäŕĺňĺ ĺěó đóëĺň, çíŕ˙, ÷ňî ďîçćĺ âű ńěîćĺňĺ ďđčâĺńňč ń ńîáîé ńâîčő äđóçĺé č ňîăäŕ îí ďîëó÷čň ďî çŕńëóăŕě?
\ No newline at end of file
diff --git a/components/to_utf8/tests/to_utf8_test.cpp b/components/to_utf8/tests/to_utf8_test.cpp
new file mode 100644
index 000000000..3fcddd158
--- /dev/null
+++ b/components/to_utf8/tests/to_utf8_test.cpp
@@ -0,0 +1,59 @@
+#include <iostream>
+#include <fstream>
+#include <cassert>
+#include <stdexcept>
+
+#include "../to_utf8.hpp"
+
+std::string getFirstLine(const std::string &filename);
+void testEncoder(ToUTF8::FromType encoding, const std::string &legacyEncFile,
+                 const std::string &utf8File);
+
+/// Test character encoding conversion to and from UTF-8
+void testEncoder(ToUTF8::FromType encoding, const std::string &legacyEncFile,
+                 const std::string &utf8File)
+{
+    // get some test data
+    std::string legacyEncLine = getFirstLine(legacyEncFile);
+    std::string utf8Line = getFirstLine(utf8File);
+
+    // create an encoder for specified character encoding
+    ToUTF8::Utf8Encoder encoder (encoding);
+
+    // convert text to UTF-8
+    std::string convertedUtf8Line = encoder.getUtf8(legacyEncLine);
+
+    std::cout << "original:  " << utf8Line          << std::endl;
+    std::cout << "converted: " << convertedUtf8Line << std::endl;
+
+    // check correctness
+    assert(convertedUtf8Line == utf8Line);
+
+    // convert UTF-8 text to legacy encoding
+    std::string convertedLegacyEncLine = encoder.getLegacyEnc(utf8Line);
+    // check correctness
+    assert(convertedLegacyEncLine == legacyEncLine);
+}
+
+std::string getFirstLine(const std::string &filename)
+{
+    std::string line;
+    std::ifstream text (filename.c_str());
+
+    if (!text.is_open())
+    {
+        throw std::runtime_error("Unable to open file " + filename);
+    }
+
+    std::getline(text, line);
+    text.close();
+
+    return line;
+}
+
+int main()
+{
+    testEncoder(ToUTF8::WINDOWS_1251, "test_data/russian-win1251.txt", "test_data/russian-utf8.txt");
+    testEncoder(ToUTF8::WINDOWS_1252, "test_data/french-win1252.txt", "test_data/french-utf8.txt");
+    return 0;
+}
diff --git a/components/to_utf8/to_utf8.cpp b/components/to_utf8/to_utf8.cpp
index 6f0ed8bfd..275f5483f 100644
--- a/components/to_utf8/to_utf8.cpp
+++ b/components/to_utf8/to_utf8.cpp
@@ -2,6 +2,8 @@
 
 #include <vector>
 #include <cassert>
+#include <iostream>
+#include <iomanip>
 
 /* This file contains the code to translate from WINDOWS-1252 (native
    charset used in English version of Morrowind) to UTF-8. The library
@@ -39,321 +41,298 @@
 // Generated tables
 #include "tables_gen.hpp"
 
-// Shared global buffers, we love you. These initial sizes are large
-// enough to hold the largest books in Morrowind.esm, but we will
-// resize automaticall if necessary.
-static std::vector<char> buf    (50*1024);
-static std::vector<char> output (50*1024);
-static int size;
+using namespace ToUTF8;
 
-// Make sure the given vector is large enough for 'size' bytes,
-// including a terminating zero after it.
-static void resize(std::vector<char> &buf, size_t size)
+Utf8Encoder::Utf8Encoder(const FromType sourceEncoding):
+    mOutput(50*1024)
 {
-  if(buf.size() <= size)
-    // Add some extra padding to reduce the chance of having to resize
-    // again later.
-    buf.resize(3*size);
-
-  // And make sure the string is zero terminated
-  buf[size] = 0;
+    switch (sourceEncoding)
+    {
+        case ToUTF8::WINDOWS_1252:
+        {
+            translationArray = ToUTF8::windows_1252;
+            break;
+        }
+        case ToUTF8::WINDOWS_1250:
+        {
+            translationArray = ToUTF8::windows_1250;
+            break;
+        }
+        case ToUTF8::WINDOWS_1251:
+        {
+            translationArray = ToUTF8::windows_1251;
+            break;
+        }
+        default:
+        {
+            assert(0);
+        }
+    }
 }
 
-// This is just used to spew out a reusable input buffer for the
-// conversion process.
-char *ToUTF8::getBuffer(int s)
+std::string Utf8Encoder::getUtf8(const char* input, int size)
 {
-  // Remember the requested size
-  size = s;
-  resize(buf, size);
-  return &buf[0];
+    // Double check that the input string stops at some point (it might
+    // contain zero terminators before this, inside its own data, which
+    // is also ok.)
+    assert(input[size] == 0);
+
+    // TODO: The rest of this function is designed for single-character
+    // input encodings only. It also assumes that the input the input
+    // encoding shares its first 128 values (0-127) with ASCII. These
+    // conditions must be checked again if you add more input encodings
+    // later.
+
+    // Compute output length, and check for pure ascii input at the same
+    // time.
+    bool ascii;
+    size_t outlen = getLength(input, ascii);
+
+    // If we're pure ascii, then don't bother converting anything.
+    if(ascii)
+        return std::string(input, outlen);
+
+    // Make sure the output is large enough
+    resize(outlen);
+    char *out = &mOutput[0];
+
+    // Translate
+    while (*input)
+        copyFromArray(*(input++), out);
+
+    // Make sure that we wrote the correct number of bytes
+    assert((out-&mOutput[0]) == (int)outlen);
+
+    // And make extra sure the output is null terminated
+    assert(mOutput.size() > outlen);
+    assert(mOutput[outlen] == 0);
+
+    // Return a string
+    return std::string(&mOutput[0], outlen);
+}
+
+std::string Utf8Encoder::getLegacyEnc(const char *input, int size)
+{
+    // Double check that the input string stops at some point (it might
+    // contain zero terminators before this, inside its own data, which
+    // is also ok.)
+    assert(input[size] == 0);
+
+    // TODO: The rest of this function is designed for single-character
+    // input encodings only. It also assumes that the input the input
+    // encoding shares its first 128 values (0-127) with ASCII. These
+    // conditions must be checked again if you add more input encodings
+    // later.
+
+    // Compute output length, and check for pure ascii input at the same
+    // time.
+    bool ascii;
+    size_t outlen = getLength2(input, ascii);
+
+    // If we're pure ascii, then don't bother converting anything.
+    if(ascii)
+        return std::string(input, outlen);
+
+    // Make sure the output is large enough
+    resize(outlen);
+    char *out = &mOutput[0];
+
+    // Translate
+    while(*input)
+        copyFromArray2(input, out);
+
+    // Make sure that we wrote the correct number of bytes
+    assert((out-&mOutput[0]) == (int)outlen);
+
+    // And make extra sure the output is null terminated
+    assert(mOutput.size() > outlen);
+    assert(mOutput[outlen] == 0);
+
+    // Return a string
+    return std::string(&mOutput[0], outlen);
+}
+
+// Make sure the output vector is large enough for 'size' bytes,
+// including a terminating zero after it.
+void Utf8Encoder::resize(size_t size)
+{
+    if (mOutput.size() <= size)
+        // Add some extra padding to reduce the chance of having to resize
+        // again later.
+        mOutput.resize(3*size);
+
+    // And make sure the string is zero terminated
+    mOutput[size] = 0;
 }
 
 /** Get the total length length needed to decode the given string with
-    the given translation array. The arrays are encoded with 6 bytes
-    per character, with the first giving the length and the next 5 the
-    actual data.
+  the given translation array. The arrays are encoded with 6 bytes
+  per character, with the first giving the length and the next 5 the
+  actual data.
 
-    The function serves a dual purpose for optimization reasons: it
-    checks if the input is pure ascii (all values are <= 127). If this
-    is the case, then the ascii parameter is set to true, and the
-    caller can optimize for this case.
+  The function serves a dual purpose for optimization reasons: it
+  checks if the input is pure ascii (all values are <= 127). If this
+  is the case, then the ascii parameter is set to true, and the
+  caller can optimize for this case.
  */
-static size_t getLength(const char *arr, const char* input, bool &ascii)
+size_t Utf8Encoder::getLength(const char* input, bool &ascii)
 {
-  ascii = true;
-  size_t len = 0;
-  const char* ptr = input;
-  unsigned char inp = *ptr;
+    ascii = true;
+    size_t len = 0;
+    const char* ptr = input;
+    unsigned char inp = *ptr;
 
-  // Do away with the ascii part of the string first (this is almost
-  // always the entire string.)
-  while(inp && inp < 128)
-    inp = *(++ptr);
-  len += (ptr-input);
+    // Do away with the ascii part of the string first (this is almost
+    // always the entire string.)
+    while (inp && inp < 128)
+        inp = *(++ptr);
+    len += (ptr-input);
 
-  // If we're not at the null terminator at this point, then there
-  // were some non-ascii characters to deal with. Go to slow-mode for
-  // the rest of the string.
-  if(inp)
+    // If we're not at the null terminator at this point, then there
+    // were some non-ascii characters to deal with. Go to slow-mode for
+    // the rest of the string.
+    if (inp)
     {
-      ascii = false;
-      while(inp)
+        ascii = false;
+        while (inp)
         {
-          // Find the translated length of this character in the
-          // lookup table.
-          len += arr[inp*6];
-          inp = *(++ptr);
+            // Find the translated length of this character in the
+            // lookup table.
+            len += translationArray[inp*6];
+            inp = *(++ptr);
         }
     }
-  return len;
+    return len;
 }
 
 // Translate one character 'ch' using the translation array 'arr', and
 // advance the output pointer accordingly.
-static void copyFromArray(const char *arr, unsigned char ch, char* &out)
+void Utf8Encoder::copyFromArray(unsigned char ch, char* &out)
 {
-  // Optimize for ASCII values
-  if(ch < 128)
+    // Optimize for ASCII values
+    if (ch < 128)
     {
-      *(out++) = ch;
-      return;
+        *(out++) = ch;
+        return;
     }
 
-  const char *in = arr + ch*6;
-  int len = *(in++);
-  for(int i=0; i<len; i++)
-    *(out++) = *(in++);
+    const char *in = translationArray + ch*6;
+    int len = *(in++);
+    for (int i=0; i<len; i++)
+        *(out++) = *(in++);
 }
 
-std::string ToUTF8::getUtf8(ToUTF8::FromType from)
+size_t Utf8Encoder::getLength2(const char* input, bool &ascii)
 {
-  // Pick translation array
-  const char *arr;
-  switch (from)
-  {
-    case ToUTF8::WINDOWS_1252:
+    ascii = true;
+    size_t len = 0;
+    const char* ptr = input;
+    unsigned char inp = *ptr;
+
+    // Do away with the ascii part of the string first (this is almost
+    // always the entire string.)
+    while (inp && inp < 128)
+        inp = *(++ptr);
+    len += (ptr-input);
+
+    // If we're not at the null terminator at this point, then there
+    // were some non-ascii characters to deal with. Go to slow-mode for
+    // the rest of the string.
+    if (inp)
     {
-      arr = ToUTF8::windows_1252;
-      break;
-    }
-    case ToUTF8::WINDOWS_1250:
-    {
-      arr = ToUTF8::windows_1250;
-      break;
-    }
-    case ToUTF8::WINDOWS_1251:
-    {
-      arr = ToUTF8::windows_1251;
-      break;
-    }
-    default:
-    {
-      assert(0);
-    }
-  }
-
-  // Double check that the input string stops at some point (it might
-  // contain zero terminators before this, inside its own data, which
-  // is also ok.)
-  const char* input = &buf[0];
-  assert(input[size] == 0);
-
-  // TODO: The rest of this function is designed for single-character
-  // input encodings only. It also assumes that the input the input
-  // encoding shares its first 128 values (0-127) with ASCII. These
-  // conditions must be checked again if you add more input encodings
-  // later.
-
-  // Compute output length, and check for pure ascii input at the same
-  // time.
-  bool ascii;
-  size_t outlen = getLength(arr, input, ascii);
-
-  // If we're pure ascii, then don't bother converting anything.
-  if(ascii)
-    return std::string(input, outlen);
-
-  // Make sure the output is large enough
-  resize(output, outlen);
-  char *out = &output[0];
-
-  // Translate
-  while(*input)
-    copyFromArray(arr, *(input++), out);
-
-  // Make sure that we wrote the correct number of bytes
-  assert((out-&output[0]) == (int)outlen);
-
-  // And make extra sure the output is null terminated
-  assert(output.size() > outlen);
-  assert(output[outlen] == 0);
-
-  // Return a string
-  return std::string(&output[0], outlen);
-}
-
-static size_t getLength2(const char *arr, const char* input, bool &ascii)
-{
-  ascii = true;
-  size_t len = 0;
-  const char* ptr = input;
-  unsigned char inp = *ptr;
-
-  // Do away with the ascii part of the string first (this is almost
-  // always the entire string.)
-  while(inp && inp < 128)
-    inp = *(++ptr);
-  len += (ptr-input);
-
-  // If we're not at the null terminator at this point, then there
-  // were some non-ascii characters to deal with. Go to slow-mode for
-  // the rest of the string.
-  if(inp)
-    {
-      ascii = false;
-      while(inp)
+        ascii = false;
+        while(inp)
         {
             len += 1;
-          // Find the translated length of this character in the
-          // lookup table.
+            // Find the translated length of this character in the
+            // lookup table.
             switch(inp)
             {
-            case 0xe2: len -= 2; break;
-            case 0xc2:
-            case 0xcb:
-            case 0xc4:
-            case 0xc6:
-            case 0xc3:
-            case 0xd0:
-            case 0xd1:
-            case 0xd2:
-            case 0xc5: len -= 1; break;
+                case 0xe2: len -= 2; break;
+                case 0xc2:
+                case 0xcb:
+                case 0xc4:
+                case 0xc6:
+                case 0xc3:
+                case 0xd0:
+                case 0xd1:
+                case 0xd2:
+                case 0xc5: len -= 1; break;
             }
 
-          inp = *(++ptr);
+            inp = *(++ptr);
         }
     }
-  return len;
+    return len;
 }
 
-#include <iostream>
-#include <iomanip>
-
-static void copyFromArray2(const char *arr, char*& chp, char* &out)
+void Utf8Encoder::copyFromArray2(const char*& chp, char* &out)
 {
     unsigned char ch = *(chp++);
-  // Optimize for ASCII values
-  if(ch < 128)
+    // Optimize for ASCII values
+    if (ch < 128)
     {
-      *(out++) = ch;
-      return;
+        *(out++) = ch;
+        return;
     }
 
-  int len = 1;
-  switch (ch)
-  {
-  case 0xe2: len = 3; break;
-  case 0xc2:
-  case 0xcb:
-  case 0xc4:
-  case 0xc6:
-  case 0xc3:
-  case 0xd0:
-  case 0xd1:
-  case 0xd2:
-  case 0xc5: len = 2; break;
-  }
+    int len = 1;
+    switch (ch)
+    {
+        case 0xe2: len = 3; break;
+        case 0xc2:
+        case 0xcb:
+        case 0xc4:
+        case 0xc6:
+        case 0xc3:
+        case 0xd0:
+        case 0xd1:
+        case 0xd2:
+        case 0xc5: len = 2; break;
+    }
 
-  if (len == 1) // There is no 1 length utf-8 glyph that is not 0x20 (empty space)
-  {
-      *(out++) = ch;
-      return;
-  }
+    if (len == 1) // There is no 1 length utf-8 glyph that is not 0x20 (empty space)
+    {
+        *(out++) = ch;
+        return;
+    }
 
-  unsigned char ch2 = *(chp++);
-  unsigned char ch3 = '\0';
-  if (len == 3)
-      ch3 = *(chp++);
+    unsigned char ch2 = *(chp++);
+    unsigned char ch3 = '\0';
+    if (len == 3)
+        ch3 = *(chp++);
 
-  for (int i = 128; i < 256; i++)
-  {
-      unsigned char b1 = arr[i*6 + 1], b2 = arr[i*6 + 2], b3 = arr[i*6 + 3];
-      if (b1 == ch && b2 == ch2 && (len != 3 || b3 == ch3))
-      {
-          *(out++) = (char)i;
-          return;
-      }
-  }
+    for (int i = 128; i < 256; i++)
+    {
+        unsigned char b1 = translationArray[i*6 + 1], b2 = translationArray[i*6 + 2], b3 = translationArray[i*6 + 3];
+        if (b1 == ch && b2 == ch2 && (len != 3 || b3 == ch3))
+        {
+            *(out++) = (char)i;
+            return;
+        }
+    }
 
-  std::cout << "Could not find glyph " << std::hex << (int)ch << " " << (int)ch2 << " " << (int)ch3 << std::endl;
+    std::cout << "Could not find glyph " << std::hex << (int)ch << " " << (int)ch2 << " " << (int)ch3 << std::endl;
 
-  *(out++) = ch; // Could not find glyph, just put whatever
+    *(out++) = ch; // Could not find glyph, just put whatever
 }
 
-std::string ToUTF8::getLegacyEnc(ToUTF8::FromType to)
+ToUTF8::FromType ToUTF8::calculateEncoding(const std::string& encodingName)
 {
-  // Pick translation array
-  const char *arr;
-  switch (to)
-  {
-    case ToUTF8::WINDOWS_1252:
-    {
-      arr = ToUTF8::windows_1252;
-      break;
-    }
-    case ToUTF8::WINDOWS_1250:
-    {
-      arr = ToUTF8::windows_1250;
-      break;
-    }
-    case ToUTF8::WINDOWS_1251:
-    {
-      arr = ToUTF8::windows_1251;
-      break;
-    }
-    default:
-    {
-      assert(0);
-    }
-  }
-
-  // Double check that the input string stops at some point (it might
-  // contain zero terminators before this, inside its own data, which
-  // is also ok.)
-  char* input = &buf[0];
-  assert(input[size] == 0);
-
-  // TODO: The rest of this function is designed for single-character
-  // input encodings only. It also assumes that the input the input
-  // encoding shares its first 128 values (0-127) with ASCII. These
-  // conditions must be checked again if you add more input encodings
-  // later.
-
-  // Compute output length, and check for pure ascii input at the same
-  // time.
-  bool ascii;
-  size_t outlen = getLength2(arr, input, ascii);
-
-  // If we're pure ascii, then don't bother converting anything.
-  if(ascii)
-      return std::string(input, outlen);
-
-  // Make sure the output is large enough
-  resize(output, outlen);
-  char *out = &output[0];
-
-  // Translate
-  while(*input)
-    copyFromArray2(arr, input, out);
-
-  // Make sure that we wrote the correct number of bytes
-  assert((out-&output[0]) == (int)outlen);
-
-  // And make extra sure the output is null terminated
-  assert(output.size() > outlen);
-  assert(output[outlen] == 0);
-
-  // Return a string
-  return std::string(&output[0], outlen);
+    if (encodingName == "win1250")
+        return ToUTF8::WINDOWS_1250;
+    else if (encodingName == "win1251")
+        return ToUTF8::WINDOWS_1251;
+    else
+        return ToUTF8::WINDOWS_1252;
+}
+
+std::string ToUTF8::encodingUsingMessage(const std::string& encodingName)
+{
+    if (encodingName == "win1250")
+        return "Using Central and Eastern European font encoding.";
+    else if (encodingName == "win1251")
+        return "Using Cyrillic font encoding.";
+    else
+        return "Using default (English) font encoding.";
 }
diff --git a/components/to_utf8/to_utf8.hpp b/components/to_utf8/to_utf8.hpp
index 69e9fc92c..e150cf17b 100644
--- a/components/to_utf8/to_utf8.hpp
+++ b/components/to_utf8/to_utf8.hpp
@@ -2,26 +2,53 @@
 #define COMPONENTS_TOUTF8_H
 
 #include <string>
+#include <cstring>
+#include <vector>
 
 namespace ToUTF8
 {
-  // These are all the currently supported code pages
-  enum FromType
+    // These are all the currently supported code pages
+    enum FromType
     {
-      WINDOWS_1250,      // Central ane Eastern European languages
-      WINDOWS_1251,      // Cyrillic languages
-      WINDOWS_1252       // Used by English version of Morrowind (and
-                         // probably others)
+        WINDOWS_1250,      // Central ane Eastern European languages
+        WINDOWS_1251,      // Cyrillic languages
+        WINDOWS_1252       // Used by English version of Morrowind (and
+            // probably others)
     };
 
-  // Return a writable buffer of at least 'size' bytes. The buffer
-  // does not have to be freed.
-  char* getBuffer(int size);
+    FromType calculateEncoding(const std::string& encodingName);
+    std::string encodingUsingMessage(const std::string& encodingName);
 
-  // Convert the previously written buffer to UTF8 from the given code
-  // page.
-  std::string getUtf8(FromType from);
-  std::string getLegacyEnc(FromType to);
+    // class
+
+    class Utf8Encoder
+    {
+        public:
+            Utf8Encoder(FromType sourceEncoding);
+
+            // Convert to UTF8 from the previously given code page.
+            std::string getUtf8(const char *input, int size);
+            inline std::string getUtf8(const std::string &str)
+            {
+                return getUtf8(str.c_str(), str.size());
+            }
+
+            std::string getLegacyEnc(const char *input, int size);
+            inline std::string getLegacyEnc(const std::string &str)
+            {
+                return getLegacyEnc(str.c_str(), str.size());
+            }
+
+        private:
+            void resize(size_t size);
+            size_t getLength(const char* input, bool &ascii);
+            void copyFromArray(unsigned char chp, char* &out);
+            size_t getLength2(const char* input, bool &ascii);
+            void copyFromArray2(const char*& chp, char* &out);
+
+            std::vector<char> mOutput;
+            char* translationArray;
+    };
 }
 
 #endif
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
new file mode 100644
index 000000000..d0ea4b7fb
--- /dev/null
+++ b/components/translation/translation.cpp
@@ -0,0 +1,115 @@
+#include "translation.hpp"
+#include <components/misc/stringops.hpp>
+
+#include <fstream>
+
+namespace Translation
+{
+    void Storage::loadTranslationData(const Files::Collections& dataFileCollections,
+                                      const std::string& esmFileName)
+    {
+        std::string esmNameNoExtension(Misc::StringUtils::lowerCase(esmFileName));
+        //changing the extension
+        size_t dotPos = esmNameNoExtension.rfind('.');
+        if (dotPos != std::string::npos)
+            esmNameNoExtension.resize(dotPos);
+
+        loadData(mCellNamesTranslations, esmNameNoExtension, ".cel", dataFileCollections);
+        loadData(mPhraseForms, esmNameNoExtension, ".top", dataFileCollections);
+        loadData(mTopicIDs, esmNameNoExtension, ".mrk", dataFileCollections);
+    }
+
+    void Storage::loadData(ContainerType& container,
+                           const std::string& fileNameNoExtension,
+                           const std::string& extension,
+                           const Files::Collections& dataFileCollections)
+    {
+        std::string fileName = fileNameNoExtension + extension;
+
+        if (dataFileCollections.getCollection (extension).doesExist (fileName))
+        {
+            std::string path = dataFileCollections.getCollection (extension).getPath (fileName).string();
+
+            std::ifstream stream (path.c_str());
+
+            if (!stream.is_open())
+                throw std::runtime_error ("failed to open translation file: " + fileName);
+
+            loadDataFromStream(container, stream);
+        }
+    }
+
+    void Storage::loadDataFromStream(ContainerType& container, std::istream& stream)
+    {
+        std::string line;
+        while (!stream.eof())
+        {
+            std::getline( stream, line );
+            if (!line.empty() && *line.rbegin() == '\r')
+              line.resize(line.size() - 1);
+
+            if (!line.empty())
+            {
+                line = mEncoder->getUtf8(line);
+
+                size_t tab_pos = line.find('\t');
+                if (tab_pos != std::string::npos && tab_pos > 0 && tab_pos < line.size() - 1)
+                {
+                    std::string key = line.substr(0, tab_pos);
+                    std::string value = line.substr(tab_pos + 1);
+
+                    if (!key.empty() && !value.empty())
+                        container.insert(std::make_pair(key, value));
+                }
+            }
+        }
+    }
+
+    std::string Storage::translateCellName(const std::string& cellName) const
+    {
+        std::map<std::string, std::string>::const_iterator entry =
+            mCellNamesTranslations.find(cellName);
+
+        if (entry == mCellNamesTranslations.end())
+            return cellName;
+
+        return entry->second;
+    }
+
+    std::string Storage::topicID(const std::string& phrase) const
+    {
+        std::string result = topicStandardForm(phrase);
+
+        //seeking for the topic ID
+        std::map<std::string, std::string>::const_iterator topicIDIterator =
+            mTopicIDs.find(result);
+
+        if (topicIDIterator != mTopicIDs.end())
+            result = topicIDIterator->second;
+
+        return result;
+    }
+
+    std::string Storage::topicStandardForm(const std::string& phrase) const
+    {
+        std::map<std::string, std::string>::const_iterator phraseFormsIterator =
+            mPhraseForms.find(phrase);
+
+        if (phraseFormsIterator != mPhraseForms.end())
+            return phraseFormsIterator->second;
+        else
+            return phrase;
+    }
+
+    void Storage::setEncoder(ToUTF8::Utf8Encoder* encoder)
+    {
+        mEncoder = encoder;
+    }
+
+    bool Storage::hasTranslation() const
+    {
+        return !mCellNamesTranslations.empty() ||
+               !mTopicIDs.empty() ||
+               !mPhraseForms.empty();
+    }
+}
diff --git a/components/translation/translation.hpp b/components/translation/translation.hpp
new file mode 100644
index 000000000..bca9ea255
--- /dev/null
+++ b/components/translation/translation.hpp
@@ -0,0 +1,42 @@
+#ifndef COMPONENTS_TRANSLATION_DATA_H
+#define COMPONENTS_TRANSLATION_DATA_H
+
+#include <components/to_utf8/to_utf8.hpp>
+#include <components/files/collections.hpp>
+
+namespace Translation
+{
+    class Storage
+    {
+    public:
+
+        void loadTranslationData(const Files::Collections& dataFileCollections,
+                                 const std::string& esmFileName);
+
+        std::string translateCellName(const std::string& cellName) const;
+        std::string topicID(const std::string& phrase) const;
+
+        // Standard form usually means nominative case
+        std::string topicStandardForm(const std::string& phrase) const;
+
+        void setEncoder(ToUTF8::Utf8Encoder* encoder);
+
+        bool hasTranslation() const;
+
+    private:
+        typedef std::map<std::string, std::string> ContainerType;
+
+        void loadData(ContainerType& container,
+                      const std::string& fileNameNoExtension,
+                      const std::string& extension,
+                      const Files::Collections& dataFileCollections);
+
+        void loadDataFromStream(ContainerType& container, std::istream& stream);
+
+
+        ToUTF8::Utf8Encoder* mEncoder;
+        ContainerType mCellNamesTranslations, mTopicIDs, mPhraseForms;
+    };
+}
+
+#endif
diff --git a/credits.txt b/credits.txt
index 063e9940a..5d486c74e 100644
--- a/credits.txt
+++ b/credits.txt
@@ -21,22 +21,25 @@ Cris Mihalache (Mirceam)
 Douglas Diniz (Dgdiniz)
 Eduard Cot (trombonecot)
 Eli2
+Emanuel "potatoesmaster" Guével
 gugus / gus
 Jacob Essex (Yacoby)
 Jannik Heller (scrawl)
 Jason Hooks (jhooks)
 Karl-Felix Glatzer (k1ll)
+lazydev
 Leon Saunders (emoose)
 Lukasz Gromanowski (lgro)
 Marcin Hulist (Gohan)
 Michael Mc Donnell
 Michael Papageorgiou (werdanith)
+Nathan Jeffords (blunted2night)
 Nikolay Kasyanov (corristo)
 Pieter van der Kloet (pvdk)
 Roman Melnik (Kromgart)
 Sebastian Wick (swick)
 Sylvain T. (Garvek)
-
+Tom Mason (wheybags)
 
 Packagers:
 Alexander Olofsson (Ace) - Windows
@@ -115,5 +118,5 @@ for the open-source EB Garamond fontface.
 Thanks to Dongle,
 for his Daedric fontface, see Daedric Font License.txt for his license terms.
 
-Thanks to Bitstream Inc.
-for their Bitstream Vera fontface, see Bitstream Vera License.txt for their license terms.
+Thanks to DejaVu team,
+for their DejaVuLGCSansMono fontface, see DejaVu Font License.txt for their license terms.
diff --git a/extern/shiny/Main/Factory.cpp b/extern/shiny/Main/Factory.cpp
index 678ee25c9..82d664811 100644
--- a/extern/shiny/Main/Factory.cpp
+++ b/extern/shiny/Main/Factory.cpp
@@ -224,7 +224,7 @@ namespace sh
 				if (!mShadersEnabled)
 					newInstance.setShadersEnabled (false);
 
-				newInstance.setSourceFile (it->second->m_fileName);
+				newInstance.setSourceFile (it->second->mFileName);
 
 				std::vector<ScriptNode*> props = it->second->getChildren();
 				for (std::vector<ScriptNode*>::const_iterator propIt = props.begin(); propIt != props.end(); ++propIt)
diff --git a/extern/shiny/Main/ScriptLoader.cpp b/extern/shiny/Main/ScriptLoader.cpp
index a8971dc87..93d728b02 100644
--- a/extern/shiny/Main/ScriptLoader.cpp
+++ b/extern/shiny/Main/ScriptLoader.cpp
@@ -14,9 +14,9 @@ namespace sh
 		for ( boost::filesystem::recursive_directory_iterator end, dir(path); dir != end; ++dir )
 		{
 			boost::filesystem::path p(*dir);
-			if(p.extension() == c->m_fileEnding)
+			if(p.extension() == c->mFileEnding)
 			{
-				c->m_currentFileName = (*dir).path().string();
+				c->mCurrentFileName = (*dir).path().string();
 				std::ifstream in((*dir).path().string().c_str(), std::ios::binary);
 				c->parseScript(in);
 			}
@@ -25,7 +25,7 @@ namespace sh
 
 	ScriptLoader::ScriptLoader(const std::string& fileEnding)
 	{
-		m_fileEnding = fileEnding;
+		mFileEnding = fileEnding;
 	}
 
 	ScriptLoader::~ScriptLoader()
@@ -70,7 +70,7 @@ namespace sh
 	{
 		//Get first token
 		_nextToken(stream);
-		if (tok == TOKEN_EOF)
+		if (mToken == TOKEN_EOF)
 		{
 			stream.close();
 			return;
@@ -87,7 +87,7 @@ namespace sh
 		//EOF token
 		if (!stream.good())
 		{
-			tok = TOKEN_EOF;
+			mToken = TOKEN_EOF;
 			return;
 		}
 
@@ -101,7 +101,7 @@ namespace sh
 
 		if (!stream.good())
 		{
-			tok = TOKEN_EOF;
+			mToken = TOKEN_EOF;
 			return;
 		}
 
@@ -115,21 +115,21 @@ namespace sh
 
 			stream.unget();
 
-			tok = TOKEN_NewLine;
+			mToken = TOKEN_NewLine;
 			return;
 		}
 
 		//Open brace token
 		else if (ch == '{')
 		{
-			tok = TOKEN_OpenBrace;
+			mToken = TOKEN_OpenBrace;
 			return;
 		}
 
 		//Close brace token
 		else if (ch == '}')
 		{
-			tok = TOKEN_CloseBrace;
+			mToken = TOKEN_CloseBrace;
 			return;
 		}
 
@@ -139,8 +139,8 @@ namespace sh
 			throw std::runtime_error("Parse Error: Invalid character, ConfigLoader::load()");
 		}
 
-		tokVal = "";
-		tok = TOKEN_Text;
+		mTokenValue = "";
+		mToken = TOKEN_Text;
 		do
 		{
 			//Skip comments
@@ -157,13 +157,13 @@ namespace sh
 						ch = stream.get();
 					} while (ch != '\r' && ch != '\n' && !stream.eof());
 
-					tok = TOKEN_NewLine;
+					mToken = TOKEN_NewLine;
 					return;
 				}
 			}
 
 			//Add valid char to tokVal
-			tokVal += (char)ch;
+			mTokenValue += (char)ch;
 
 			//Next char
 			ch = stream.get();
@@ -177,7 +177,7 @@ namespace sh
 
 	void ScriptLoader::_skipNewLines(std::ifstream &stream)
 	{
-		while (tok == TOKEN_NewLine)
+		while (mToken == TOKEN_NewLine)
 		{
 			_nextToken(stream);
 		}
@@ -189,7 +189,7 @@ namespace sh
 
 		while (true)
 		{
-			switch (tok)
+			switch (mToken)
 			{
 				//Node
 				case TOKEN_Text:
@@ -198,23 +198,23 @@ namespace sh
 					ScriptNode *newNode;
 					if (parent)
 					{
-						newNode = parent->addChild(tokVal);
+						newNode = parent->addChild(mTokenValue);
 					}
 					else
 					{
-						newNode = new ScriptNode(0, tokVal);
+						newNode = new ScriptNode(0, mTokenValue);
 					}
 
 					//Get values
 					_nextToken(stream);
 					std::string valueStr;
 					int i=0;
-					while (tok == TOKEN_Text)
+					while (mToken == TOKEN_Text)
 					{
 						if (i == 0)
-							valueStr += tokVal;
+							valueStr += mTokenValue;
 						else
-							valueStr += " " + tokVal;
+							valueStr += " " + mTokenValue;
 						_nextToken(stream);
 						++i;
 					}
@@ -235,13 +235,13 @@ namespace sh
 					_skipNewLines(stream);
 
 					//Add any sub-nodes
-					if (tok == TOKEN_OpenBrace)
+					if (mToken == TOKEN_OpenBrace)
 					{
 						//Parse nodes
 						_nextToken(stream);
 						_parseNodes(stream, newNode);
 						//Check for matching closing brace
-						if (tok != TOKEN_CloseBrace)
+						if (mToken != TOKEN_CloseBrace)
 						{
 							throw std::runtime_error("Parse Error: Expecting closing brace");
 						}
@@ -249,7 +249,7 @@ namespace sh
 						_skipNewLines(stream);
 					}
 
-					newNode->m_fileName = m_currentFileName;
+					newNode->mFileName = mCurrentFileName;
 
 					break;
 				}
@@ -276,16 +276,16 @@ namespace sh
 
 	ScriptNode::ScriptNode(ScriptNode *parent, const std::string &name)
 	{
-		m_name = name;
-		m_parent = parent;
-		_removeSelf = true;    //For proper destruction
-		m_lastChildFound = -1;
+		mName = name;
+		mParent = parent;
+		mRemoveSelf = true;    //For proper destruction
+		mLastChildFound = -1;
 
 		//Add self to parent's child list (unless this is the root node being created)
 		if (parent != NULL)
 		{
-			m_parent->m_children.push_back(this);
-			_iter = --(m_parent->m_children.end());
+			mParent->mChildren.push_back(this);
+			mIter = --(mParent->mChildren.end());
 		}
 	}
 
@@ -293,18 +293,18 @@ namespace sh
 	{
 		//Delete all children
 		std::vector<ScriptNode*>::iterator i;
-		for (i = m_children.begin(); i != m_children.end(); i++)
+		for (i = mChildren.begin(); i != mChildren.end(); i++)
 		{
 			ScriptNode *node = *i;
-			node->_removeSelf = false;
+			node->mRemoveSelf = false;
 			delete node;
 		}
-		m_children.clear();
+		mChildren.clear();
 
 		//Remove self from parent's child list
-		if (_removeSelf && m_parent != NULL)
+		if (mRemoveSelf && mParent != NULL)
 		{
-			m_parent->m_children.erase(_iter);
+			mParent->mChildren.erase(mIter);
 		}
 	}
 
@@ -324,20 +324,20 @@ namespace sh
 	ScriptNode *ScriptNode::findChild(const std::string &name, bool recursive)
 	{
 		int indx, prevC, nextC;
-		int childCount = (int)m_children.size();
+		int childCount = (int)mChildren.size();
 
-		if (m_lastChildFound != -1)
+		if (mLastChildFound != -1)
 		{
 			//If possible, try checking the nodes neighboring the last successful search
 			//(often nodes searched for in sequence, so this will boost search speeds).
-			prevC = m_lastChildFound-1; if (prevC < 0) prevC = 0; else if (prevC >= childCount) prevC = childCount-1;
-			nextC = m_lastChildFound+1; if (nextC < 0) nextC = 0; else if (nextC >= childCount) nextC = childCount-1;
+			prevC = mLastChildFound-1; if (prevC < 0) prevC = 0; else if (prevC >= childCount) prevC = childCount-1;
+			nextC = mLastChildFound+1; if (nextC < 0) nextC = 0; else if (nextC >= childCount) nextC = childCount-1;
 			for (indx = prevC; indx <= nextC; ++indx)
 			{
-				ScriptNode *node = m_children[indx];
-				if (node->m_name == name)
+				ScriptNode *node = mChildren[indx];
+				if (node->mName == name)
 				{
-					m_lastChildFound = indx;
+					mLastChildFound = indx;
 					return node;
 				}
 			}
@@ -346,17 +346,17 @@ namespace sh
 			//already searched area above.
 			for (indx = nextC + 1; indx < childCount; ++indx)
 			{
-				ScriptNode *node = m_children[indx];
-				if (node->m_name == name) {
-					m_lastChildFound = indx;
+				ScriptNode *node = mChildren[indx];
+				if (node->mName == name) {
+					mLastChildFound = indx;
 					return node;
 				}
 			}
 			for (indx = 0; indx < prevC; ++indx)
 			{
-				ScriptNode *node = m_children[indx];
-				if (node->m_name == name) {
-					m_lastChildFound = indx;
+				ScriptNode *node = mChildren[indx];
+				if (node->mName == name) {
+					mLastChildFound = indx;
 					return node;
 				}
 			}
@@ -365,9 +365,9 @@ namespace sh
 		{
 			//Search for the node from start to finish
 			for (indx = 0; indx < childCount; ++indx){
-				ScriptNode *node = m_children[indx];
-				if (node->m_name == name) {
-					m_lastChildFound = indx;
+				ScriptNode *node = mChildren[indx];
+				if (node->mName == name) {
+					mLastChildFound = indx;
 					return node;
 				}
 			}
@@ -378,7 +378,7 @@ namespace sh
 		{
 			for (indx = 0; indx < childCount; ++indx)
 			{
-				m_children[indx]->findChild(name, recursive);
+				mChildren[indx]->findChild(name, recursive);
 			}
 		}
 
@@ -389,13 +389,13 @@ namespace sh
 	void ScriptNode::setParent(ScriptNode *newParent)
 	{
 		//Remove self from current parent
-		m_parent->m_children.erase(_iter);
+		mParent->mChildren.erase(mIter);
 
 		//Set new parent
-		m_parent = newParent;
+		mParent = newParent;
 
 		//Add self to new parent
-		m_parent->m_children.push_back(this);
-		_iter = --(m_parent->m_children.end());
+		mParent->mChildren.push_back(this);
+		mIter = --(mParent->mChildren.end());
 	}
 }
diff --git a/extern/shiny/Main/ScriptLoader.hpp b/extern/shiny/Main/ScriptLoader.hpp
index caf743bd2..89720fb5d 100644
--- a/extern/shiny/Main/ScriptLoader.hpp
+++ b/extern/shiny/Main/ScriptLoader.hpp
@@ -23,7 +23,7 @@ namespace sh
 		ScriptLoader(const std::string& fileEnding);
 		virtual ~ScriptLoader();
 
-		std::string m_fileEnding;
+		std::string mFileEnding;
 
 		// For a line like
 		// entity animals/dog
@@ -38,11 +38,11 @@ namespace sh
 
 		void parseScript(std::ifstream &stream);
 
-		std::string m_currentFileName;
+		std::string mCurrentFileName;
 
 	protected:
 
-		float m_LoadOrder;
+		float mLoadOrder;
 		// like "*.object"
 
 		std::map <std::string, ScriptNode*> m_scriptList;
@@ -56,8 +56,8 @@ namespace sh
 			TOKEN_EOF
 		};
 
-		Token tok, lastTok;
-		std::string tokVal;
+		Token mToken, mLastToken;
+		std::string mTokenValue;
 
 		void _parseNodes(std::ifstream &stream, ScriptNode *parent);
 		void _nextToken(std::ifstream &stream);
@@ -74,22 +74,22 @@ namespace sh
 
 		inline void setName(const std::string &name)
 		{
-			this->m_name = name;
+			this->mName = name;
 		}
 
 		inline std::string &getName()
 		{
-			return m_name;
+			return mName;
 		}
 
 		inline void setValue(const std::string &value)
 		{
-			m_value = value;
+			mValue = value;
 		}
 
 		inline std::string &getValue()
 		{
-			return m_value;
+			return mValue;
 		}
 
 		ScriptNode *addChild(const std::string &name = "untitled", bool replaceExisting = false);
@@ -97,36 +97,36 @@ namespace sh
 
 		inline std::vector<ScriptNode*> &getChildren()
 		{
-			return m_children;
+			return mChildren;
 		}
 
 		inline ScriptNode *getChild(unsigned int index = 0)
 		{
-			assert(index < m_children.size());
-			return m_children[index];
+			assert(index < mChildren.size());
+			return mChildren[index];
 		}
 
 		void setParent(ScriptNode *newParent);
  
 		inline ScriptNode *getParent()
 		{
-			return m_parent;
+			return mParent;
 		}
 
-		std::string m_fileName;
+		std::string mFileName;
 
 
 	private:
-		std::string m_name;
-		std::string m_value;
-		std::vector<ScriptNode*> m_children;
-		ScriptNode *m_parent;
+		std::string mName;
+		std::string mValue;
+		std::vector<ScriptNode*> mChildren;
+		ScriptNode *mParent;
 
 
-		int m_lastChildFound;  //The last child node's index found with a call to findChild()
+		int mLastChildFound;  //The last child node's index found with a call to findChild()
 
-		std::vector<ScriptNode*>::iterator _iter;
-		bool _removeSelf;
+		std::vector<ScriptNode*>::iterator mIter;
+		bool mRemoveSelf;
 	};
  
 }
diff --git a/files/gbuffer/gbuffer.compositor b/files/gbuffer/gbuffer.compositor
index 04600ce9b..0a0675fa0 100644
--- a/files/gbuffer/gbuffer.compositor
+++ b/files/gbuffer/gbuffer.compositor
@@ -72,7 +72,7 @@ compositor gbufferFinalizer
             pass render_scene
             {
                 first_render_queue 51
-                last_render_queue 100
+                last_render_queue 105
             }
         }
         target_output
diff --git a/files/materials/core.h b/files/materials/core.h
index e9577bbf3..1c9ea1d1d 100644
--- a/files/materials/core.h
+++ b/files/materials/core.h
@@ -1,5 +1,6 @@
-#define gammaCorrectRead(v) pow(v, float3(gammaCorrection,gammaCorrection,gammaCorrection))
-#define gammaCorrectOutput(v) pow(v, float3(1.f/gammaCorrection,1.f/gammaCorrection,1.f/gammaCorrection))
+#define gammaCorrectRead(v) pow(max(v, 0.00001f), float3(gammaCorrection,gammaCorrection,gammaCorrection))
+#define gammaCorrectOutput(v) pow(max(v, 0.00001f), float3(1.f/gammaCorrection,1.f/gammaCorrection,1.f/gammaCorrection))
+
 
 
 #if SH_HLSL == 1 || SH_CG == 1
diff --git a/files/materials/objects.shader b/files/materials/objects.shader
index 5ea076342..25624351c 100644
--- a/files/materials/objects.shader
+++ b/files/materials/objects.shader
@@ -227,7 +227,7 @@
     float4 worldNormal = shMatrixMult(worldMatrix, float4(normal.xyz, 0));
     waterEyePos = intercept(worldPos, cameraPos.xyz - worldPos, float3(0,1,0), waterLevel);
     caustics = getCaustics(causticMap, worldPos, waterEyePos.xyz, worldNormal.xyz, lightDirectionWS0.xyz, waterLevel, waterTimer, windDir_windSpeed);
-    if (worldPos.y >= waterLevel || waterEnabled != 1)
+    if (worldPos.y >= waterLevel || waterEnabled != 1.f)
         caustics = float3(1,1,1);
 #endif
 
@@ -269,7 +269,7 @@
         
         #if UNDERWATER
         // regular fog only if fragment is above water
-        if (worldPos.y > waterLevel)
+        if (worldPos.y > waterLevel || waterEnabled != 1.f)
         #endif
         shOutputColour(0).xyz = shLerp (shOutputColour(0).xyz, gammaCorrectRead(fogColour), fogValue);
 #endif
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 562668a90..e7e5b695e 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -4,8 +4,6 @@ set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
 
 set(MYGUI_FILES
-    atlas1.cfg
-    mainmenu.cfg
     bigbars.png
     black.png
     core.skin
@@ -82,7 +80,7 @@ set(MYGUI_FILES
     openmw_travel_window.layout
     openmw_persuasion_dialog.layout
     smallbars.png
-    VeraMono.ttf
+    DejaVuLGCSansMono.ttf
     markers.png
 )
 
diff --git a/files/mygui/DejaVuLGCSansMono.ttf b/files/mygui/DejaVuLGCSansMono.ttf
new file mode 100644
index 000000000..80c45b73e
Binary files /dev/null and b/files/mygui/DejaVuLGCSansMono.ttf differ
diff --git a/files/mygui/VeraMono.ttf b/files/mygui/VeraMono.ttf
deleted file mode 100644
index 139f0b431..000000000
Binary files a/files/mygui/VeraMono.ttf and /dev/null differ
diff --git a/files/mygui/atlas1.cfg b/files/mygui/atlas1.cfg
deleted file mode 100644
index d1e05e041..000000000
--- a/files/mygui/atlas1.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-[settings]
-    size_x = 512
-    size_y = 512
-
-[tx_menubook_close_idle.dds]
-    x = 0
-    y = 0
-
-[tx_menubook_close_over.dds]
-    x = 128
-    y = 0
-
-[tx_menubook_close_pressed.dds]
-    x = 256
-    y = 0
-
-[tx_menubook_take_idle.dds]
-    x = 384
-    y = 0
-
-[tx_menubook_take_over.dds]
-    x = 0
-    y = 32
-
-[tx_menubook_take_pressed.dds]
-    x = 128
-    y = 32
-
-[tx_menubook_next_idle.dds]
-    x = 256
-    y = 32
-
-[tx_menubook_next_over.dds]
-    x = 384
-    y = 32
-
-[tx_menubook_next_pressed.dds]
-    x = 0
-    y = 64
-
-[tx_menubook_prev_idle.dds]
-    x = 128
-    y = 64
-
-[tx_menubook_prev_over.dds]
-    x = 256
-    y = 64
-
-[tx_menubook_prev_pressed.dds]
-    x = 384
-    y = 64
diff --git a/files/mygui/mainmenu.cfg b/files/mygui/mainmenu.cfg
deleted file mode 100644
index 7aaf8c1c7..000000000
--- a/files/mygui/mainmenu.cfg
+++ /dev/null
@@ -1,95 +0,0 @@
-[settings]
-    size_x = 512
-    size_y = 512
-
-
-[menu_newgame.dds]
-    x = 0
-    y = 0
-
-[menu_newgame_pressed.dds]
-    x = 128
-    y = 0
-
-[menu_newgame_over.dds]
-    x = 256
-    y = 0
-
-
-[menu_loadgame.dds]
-    x = 384
-    y = 0
-
-[menu_loadgame_pressed.dds]
-    x = 0
-    y = 64
-
-[menu_loadgame_over.dds]
-    x = 128
-    y = 64
-
-
-[menu_options.dds]
-    x = 256
-    y = 64
-
-[menu_options_pressed.dds]
-    x = 384
-    y = 64
-
-[menu_options_over.dds]
-    x = 0
-    y = 128
-
-
-[menu_credits.dds]
-    x = 128
-    y = 128
-
-[menu_credits_pressed.dds]
-    x = 256
-    y = 128
-
-[menu_credits_over.dds]
-    x = 384
-    y = 128
-
-
-[menu_exitgame.dds]
-    x = 0
-    y = 192
-
-[menu_exitgame_pressed.dds]
-    x = 128
-    y = 192
-
-[menu_exitgame_over.dds]
-    x = 256
-    y = 192
-
-
-[menu_savegame.dds]
-    x = 384
-    y = 192
-
-[menu_savegame_pressed.dds]
-    x = 0
-    y = 256
-
-[menu_savegame_over.dds]
-    x = 128
-    y = 256
-
-
-[menu_return.dds]
-    x = 256
-    y = 256
-
-[menu_return_pressed.dds]
-    x = 384
-    y = 256
-
-[menu_return_over.dds]
-    x = 0
-    y = 320
-
diff --git a/files/mygui/openmw_book.layout b/files/mygui/openmw_book.layout
index 6c708cdd3..894c1dbeb 100644
--- a/files/mygui/openmw_book.layout
+++ b/files/mygui/openmw_book.layout
@@ -7,17 +7,25 @@
     <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Top|Right" name="BookImage">     
         <Property key="ImageTexture" value="textures\tx_menubook.dds"/>
 
-        <Widget type="Button" skin="ButtonImage" position="251 220 57 24" name="NextPageBTN">
-            <Property key="ImageResource" value="MenuBook_Next"/>
+        <Widget type="ImageButton" skin="ImageBox" position="251 220 128 32" name="NextPageBTN">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_next_over.dds"/>
+	    <Property key="ImageNormal" value="textures\tx_menubook_next_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_next_pressed.dds"/>
         </Widget>
-        <Widget type="Button" skin="ButtonImage" position="165 220 96 24" name="PrevPageBTN">
-            <Property key="ImageResource" value="MenuBook_Prev"/>
+        <Widget type="ImageButton" skin="ImageBox" position="165 220 128 32" name="PrevPageBTN">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_prev_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_prev_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_prev_pressed.dds"/>
         </Widget>
-        <Widget type="Button" skin="ButtonImage" position="75 220 96 24" name="TakeButton">
-            <Property key="ImageResource" value="MenuBook_Take"/>
+        <Widget type="ImageButton" skin="ImageBox" position="75 220 128 32" name="TakeButton">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_take_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_take_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_take_pressed.dds"/>
         </Widget>
-        <Widget type="Button" skin="ButtonImage" position="360 220 96 24" name="CloseButton">
-            <Property key="ImageResource" value="MenuBook_Close"/>
+        <Widget type="ImageButton" skin="ImageBox" position="360 220 128 32" name="CloseButton">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_close_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_close_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_close_pressed.dds"/>
         </Widget>
 
         <Widget type="TextBox" skin="NormalText" position="155 215 24 24" name="LeftPageNumber">
diff --git a/files/mygui/openmw_font.xml b/files/mygui/openmw_font.xml
index cb5dd648f..b1446fae1 100644
--- a/files/mygui/openmw_font.xml
+++ b/files/mygui/openmw_font.xml
@@ -11,6 +11,7 @@
             <Code range="33 126"/>
             <Code range="192 382"/> <!-- Central and Eastern European languages glyphs -->
             <Code range="1025 1105"/>
+            <Code range="2026"/> <!-- Ellipsis -->
             <Code range="8470"/>
             <Code range="8211"/>   <!-- Minus -->
             <Code range="8216 8217"/> <!-- Single quotes -->
@@ -35,7 +36,7 @@
     </Resource>
 
    <Resource type="ResourceTrueTypeFont" name="MonoFont">
-       <Property key="Source" value="VeraMono.ttf"/>
+       <Property key="Source" value="DejaVuLGCSansMono.ttf"/>
        <Property key="Size" value="18"/>
        <Property key="Resolution" value="50"/>
        <Property key="Antialias" value="false"/>
diff --git a/files/mygui/openmw_journal.layout b/files/mygui/openmw_journal.layout
index e4c3c7e47..fdf82e4de 100644
--- a/files/mygui/openmw_journal.layout
+++ b/files/mygui/openmw_journal.layout
@@ -7,11 +7,15 @@
     <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Top|Right" name="JImage">     
         <Property key="ImageTexture" value="textures\tx_menubook.dds"/>
 
-        <Widget type="Button" skin="ButtonImage" position="370 220 57 24" name="NextPageBTN">
-            <Property key="ImageResource" value="MenuBook_Next"/>
+        <Widget type="ImageButton" skin="ImageBox" position="370 220 128 32" name="NextPageBTN">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_next_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_next_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_next_pressed.dds"/>
         </Widget>
-        <Widget type="Button" skin="ButtonImage" position="80 220 96 24" name="PrevPageBTN">
-            <Property key="ImageResource" value="MenuBook_Prev"/>
+        <Widget type="ImageButton" skin="ImageBox" position="80 220 128 32" name="PrevPageBTN">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_prev_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_prev_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_prev_pressed.dds"/>
         </Widget>
         <Widget type="EditBox" skin="MW_BookPage" position_real="0.15 0.1 0.3 0.75" name = "LeftText"/>
         <Widget type="EditBox" skin="MW_BookPage" position_real="0.55 0.1 0.3 0.75" name = "RightText"/>
diff --git a/files/mygui/openmw_mainmenu_skin.xml b/files/mygui/openmw_mainmenu_skin.xml
index 4100a2eb7..c7f2fbce3 100644
--- a/files/mygui/openmw_mainmenu_skin.xml
+++ b/files/mygui/openmw_mainmenu_skin.xml
@@ -1,34 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
-    <Skin name="ReturnButton" size="128 64" texture="textures\menu_return.dds">
-        <BasisSkin type="MainSkin" offset = "0 0 128 64">
-            <State name="normal" offset = "0 0 128 64"/>
-        </BasisSkin>
-    </Skin>
-    <Skin name="NewButton" size="128 64" texture="textures\menu_newgame.dds">
-        <BasisSkin type="MainSkin" offset = "0 0 128 64">
-            <State name="normal" offset = "0 0 128 64"/>
-        </BasisSkin>
-    </Skin>
-    <Skin name="SaveButton" size="128 64" texture="textures\menu_savegame.dds">
-        <BasisSkin type="MainSkin" offset = "0 0 128 64">
-            <State name="normal" offset = "0 0 128 64"/>
-        </BasisSkin>
-    </Skin>
-    <Skin name="LoadButton" size="128 64" texture="textures\menu_loadgame.dds">
-        <BasisSkin type="MainSkin" offset = "0 0 128 64">
-            <State name="normal" offset = "0 0 128 64"/>
-        </BasisSkin>
-    </Skin>
-    <Skin name="OptionsButton" size="128 64" texture="textures\menu_options.dds">
-        <BasisSkin type="MainSkin" offset = "0 0 128 64">
-            <State name="normal" offset = "0 0 128 64"/>
-        </BasisSkin>
-    </Skin>
-    <Skin name="ExitButton" size="128 64" texture="textures\menu_exitgame.dds">
-        <BasisSkin type="MainSkin" offset = "0 0 128 64">
-            <State name="normal" offset = "0 0 128 64"/>
-        </BasisSkin>
-    </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_scroll.layout b/files/mygui/openmw_scroll.layout
index 0f4a0be3e..6315c0241 100644
--- a/files/mygui/openmw_scroll.layout
+++ b/files/mygui/openmw_scroll.layout
@@ -7,12 +7,16 @@
     <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" name="ScrollImage">     
         <Property key="ImageTexture" value="textures\scroll.dds"/>
 
-        <Widget type="Button" skin="ButtonImage" position="12 18 96 24" name="TakeButton">
-            <Property key="ImageResource" value="MenuBook_Take"/>
+        <Widget type="ImageButton" skin="ImageBox" position="12 18 128 32" name="TakeButton">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_take_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_take_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_take_pressed.dds"/>
         </Widget>
 
-        <Widget type="Button" skin="ButtonImage" position="418 24 96 24" name="CloseButton">
-            <Property key="ImageResource" value="MenuBook_Close"/>
+        <Widget type="ImageButton" skin="ImageBox" position="418 24 128 32" name="CloseButton">
+            <Property key="ImageHighlighted" value="textures\tx_menubook_close_over.dds"/>
+            <Property key="ImageNormal" value="textures\tx_menubook_close_idle.dds"/>
+            <Property key="ImagePushed" value="textures\tx_menubook_close_pressed.dds"/>
         </Widget>
 
         <Widget type="ScrollView" skin="MW_ScrollView" position="60 130 410 300" name="TextView">
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index f320d009d..76bdb491d 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -122,8 +122,13 @@ namespace Physic
          */
         void runPmove();
 
-        
-
+//HACK: in Visual Studio 2010 and presumably above, this structures alignment
+//		must be 16, but the built in operator new & delete don't properly
+//		perform this alignment.
+#if _MSC_VER >= 1600
+		void * operator new (size_t Size) { return _aligned_malloc (Size, 16); }
+		void operator delete (void * Data) { _aligned_free (Data); }
+#endif
 
     private:
         
diff --git a/libs/openengine/gui/manager.cpp b/libs/openengine/gui/manager.cpp
index acb4ed9df..925891e1b 100644
--- a/libs/openengine/gui/manager.cpp
+++ b/libs/openengine/gui/manager.cpp
@@ -6,6 +6,19 @@
 
 using namespace OEngine::GUI;
 
+/*
+ *  As of MyGUI 3.2.0, MyGUI::OgreDataManager::isDataExist is unnecessarily complex
+ *  this override fixes the resulting performance issue.
+ */
+class FixedOgreDataManager : public MyGUI::OgreDataManager
+{
+public:
+    bool isDataExist(const std::string& _name)
+    {
+        return Ogre::ResourceGroupManager::getSingleton().resourceExistsInAnyGroup (_name);
+    }
+};
+
 void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool logging, const std::string& logDir)
 {
     assert(wnd);
@@ -25,11 +38,18 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
     if(!logDir.empty())
         theLogFile.insert(0, logDir);
 
-    // Set up OGRE platform. We might make this more generic later.
-    mPlatform = new OgrePlatform();
-    LogManager::getInstance().setSTDOutputEnabled(logging);
-    mPlatform->initialise(wnd, mgr, "General", theLogFile);
+    // Set up OGRE platform (bypassing OgrePlatform). We might make this more generic later.
+    mLogManager = new LogManager();
+    mRenderManager = new OgreRenderManager();
+    mDataManager = new FixedOgreDataManager();
 
+    LogManager::getInstance().setSTDOutputEnabled(logging);
+
+    if (!theLogFile.empty())
+        LogManager::getInstance().createDefaultSource(theLogFile);
+
+    mRenderManager->initialise(wnd, mgr);
+    mDataManager->initialise("General");
 
     // Create GUI
     mGui = new Gui();
@@ -40,11 +60,22 @@ void MyGUIManager::shutdown()
 {
     mGui->shutdown ();
     delete mGui;
-    if(mPlatform)
+    if(mRenderManager)
     {
-        mPlatform->shutdown();
-        delete mPlatform;
+        mRenderManager->shutdown();
+        delete mRenderManager;
+        mRenderManager = NULL;
+    }
+    if(mDataManager)
+    {
+        mDataManager->shutdown();
+        delete mDataManager;
+        mDataManager = NULL;
+    }
+    if (mLogManager)
+    {
+        delete mLogManager;
+        mLogManager = NULL;
     }
     mGui = NULL;
-    mPlatform = NULL;
 }
diff --git a/libs/openengine/gui/manager.hpp b/libs/openengine/gui/manager.hpp
index 1ec2e2fcf..c0f98da88 100644
--- a/libs/openengine/gui/manager.hpp
+++ b/libs/openengine/gui/manager.hpp
@@ -3,8 +3,10 @@
 
 namespace MyGUI
 {
-  class OgrePlatform;
   class Gui;
+  class LogManager;
+  class OgreDataManager;
+  class OgreRenderManager;
 }
 
 namespace Ogre
@@ -18,12 +20,15 @@ namespace GUI
 {
     class MyGUIManager
     {
-        MyGUI::OgrePlatform *mPlatform;
         MyGUI::Gui *mGui;
+        MyGUI::LogManager* mLogManager;
+        MyGUI::OgreDataManager* mDataManager;
+        MyGUI::OgreRenderManager* mRenderManager;
         Ogre::SceneManager* mSceneMgr;
 
+
     public:
-        MyGUIManager() : mPlatform(NULL), mGui(NULL) {}
+        MyGUIManager() : mLogManager(NULL), mDataManager(NULL), mRenderManager(NULL),  mGui(NULL) {}
         MyGUIManager(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool logging=false, const std::string& logDir = std::string(""))
         {
             setup(wnd,mgr,logging, logDir);
diff --git a/libs/openengine/ogre/atlas.cpp b/libs/openengine/ogre/atlas.cpp
deleted file mode 100644
index 01b84afab..000000000
--- a/libs/openengine/ogre/atlas.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "atlas.hpp"
-
-#include <OgreRoot.h>
-#include <OgreSceneManager.h>
-#include <OgreImage.h>
-#include <OgreTexture.h>
-#include <OgreRenderTarget.h>
-#include <OgreCamera.h>
-#include <OgreTextureUnitState.h>
-#include <OgreHardwarePixelBuffer.h>
-#include <OgreConfigFile.h>
-#include <OgreStringConverter.h>
-
-using namespace Ogre;
-using namespace OEngine::Render;
-
-void Atlas::createFromFile (const std::string& filename, const std::string& textureName, const std::string& texturePrefix)
-{
-    ConfigFile file;
-    file.load(filename, ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME, "\t:=", true);
-
-    Root* root = Ogre::Root::getSingletonPtr();
-
-    SceneManager* sceneMgr = root->createSceneManager(ST_GENERIC);
-    Camera* camera = sceneMgr->createCamera("AtlasCamera");
-
-    int width = StringConverter::parseInt(file.getSetting("size_x", "settings"));
-    int height = StringConverter::parseInt(file.getSetting("size_y", "settings"));
-
-    std::vector<Rectangle2D*> rectangles;
-    int i = 0;
-
-    ConfigFile::SectionIterator seci = file.getSectionIterator();
-    while (seci.hasMoreElements())
-    {
-        Ogre::String sectionName = seci.peekNextKey();
-        seci.getNext();
-
-        if (sectionName == "settings" || sectionName == "")
-            continue;
-
-        MaterialPtr material = MaterialManager::getSingleton().create("AtlasMaterial" + StringConverter::toString(i), ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-        material->getTechnique(0)->getPass(0)->setLightingEnabled(false);
-        material->getTechnique(0)->getPass(0)->setDepthCheckEnabled(false);
-        TextureUnitState* tus = material->getTechnique(0)->getPass(0)->createTextureUnitState(texturePrefix + sectionName);
-        tus->setTextureBorderColour(ColourValue(0, 0, 0, 0));
-
-        Rectangle2D* rect = new Rectangle2D(true);
-        rect->setMaterial("AtlasMaterial" + StringConverter::toString(i));
-        rect->setRenderQueueGroup(RENDER_QUEUE_BACKGROUND);
-
-        int x = StringConverter::parseInt(file.getSetting("x", sectionName));
-        int y = StringConverter::parseInt(file.getSetting("y", sectionName));
-
-        TexturePtr texture = TextureManager::getSingleton().getByName(texturePrefix + sectionName);
-        if (texture.isNull())
-        {
-            std::cerr << "OEngine::Render::Atlas: Can't find texture " << texturePrefix + sectionName << ", skipping..." << std::endl;
-            continue;
-        }
-        int textureWidth = texture->getWidth();
-        int textureHeight = texture->getHeight();
-
-        float left = x/float(width) * 2 - 1;
-        float top = (1-(y/float(height))) * 2 - 1;
-        float right = ((x+textureWidth))/float(width) * 2 - 1;
-        float bottom = (1-((y+textureHeight)/float(height))) * 2 - 1;
-        rect->setCorners(left, top, right, bottom);
-
-        // Use infinite AAB to always stay visible
-        AxisAlignedBox aabInf;
-        aabInf.setInfinite();
-        rect->setBoundingBox(aabInf);
-
-        // Attach background to the scene
-        SceneNode* node = sceneMgr->getRootSceneNode()->createChildSceneNode();
-        node->attachObject(rect);
-
-        rectangles.push_back(rect);
-        ++i;
-    }
-
-    TexturePtr destTexture = TextureManager::getSingleton().createManual(
-                    textureName,
-                    ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
-                    TEX_TYPE_2D,
-                    width, height,
-                    0,
-                    PF_FLOAT16_RGBA,
-                    TU_RENDERTARGET);
-
-    RenderTarget* rtt = destTexture->getBuffer()->getRenderTarget();
-    rtt->setAutoUpdated(false);
-    Viewport* vp = rtt->addViewport(camera);
-    vp->setOverlaysEnabled(false);
-    vp->setShadowsEnabled(false);
-    vp->setBackgroundColour(ColourValue(0,0,0,0));
-
-    rtt->update();
-
-    // remove all the junk we've created
-    for (std::vector<Rectangle2D*>::iterator it=rectangles.begin();
-        it!=rectangles.end(); ++it)
-    {
-        delete (*it);
-    }
-    while (i > 0)
-    {
-        MaterialManager::getSingleton().remove("AtlasMaterial" + StringConverter::toString(i-1));
-        --i;
-    }
-    root->destroySceneManager(sceneMgr);
-}
diff --git a/libs/openengine/ogre/atlas.hpp b/libs/openengine/ogre/atlas.hpp
deleted file mode 100644
index 5dcd409ca..000000000
--- a/libs/openengine/ogre/atlas.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef OENGINE_OGRE_ATLAS_HPP
-#define OENGINE_OGRE_ATLAS_HPP
-
-#include <string>
-
-namespace OEngine
-{
-namespace Render
-{
-
-    /// \brief Creates a texture atlas at runtime
-    class Atlas
-    {
-    public:
-        /**
-         * @param absolute path to file that specifies layout of the texture (positions of the textures it contains)
-         * @param name of the destination texture to save to (in memory)
-         * @param texture directory prefix
-         */
-        static void createFromFile (const std::string& filename, const std::string& textureName, const std::string& texturePrefix="textures\\");
-    };
-
-}
-}
-
-#endif
-
diff --git a/libs/openengine/ogre/imagerotate.cpp b/libs/openengine/ogre/imagerotate.cpp
index 11fd5eea6..3dd584078 100644
--- a/libs/openengine/ogre/imagerotate.cpp
+++ b/libs/openengine/ogre/imagerotate.cpp
@@ -16,6 +16,8 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
 {
     Root* root = Ogre::Root::getSingletonPtr();
 
+    std::string destImageRot = std::string(destImage) + std::string("_rot");
+
     SceneManager* sceneMgr = root->createSceneManager(ST_GENERIC);
     Camera* camera = sceneMgr->createCamera("ImageRotateCamera");
 
@@ -48,8 +50,8 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
     unsigned int width = sourceTexture->getWidth();
     unsigned int height = sourceTexture->getHeight();
 
-    TexturePtr destTexture = TextureManager::getSingleton().createManual(
-                    destImage,
+    TexturePtr destTextureRot = TextureManager::getSingleton().createManual(
+                    destImageRot,
                     ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
                     TEX_TYPE_2D,
                     width, height,
@@ -57,7 +59,7 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
                     PF_FLOAT16_RGBA,
                     TU_RENDERTARGET);
 
-    RenderTarget* rtt = destTexture->getBuffer()->getRenderTarget();
+    RenderTarget* rtt = destTextureRot->getBuffer()->getRenderTarget();
     rtt->setAutoUpdated(false);
     Viewport* vp = rtt->addViewport(camera);
     vp->setOverlaysEnabled(false);
@@ -66,7 +68,20 @@ void ImageRotate::rotate(const std::string& sourceImage, const std::string& dest
 
     rtt->update();
 
+    //copy the rotated image to a static texture
+    TexturePtr destTexture = TextureManager::getSingleton().createManual(
+            destImage,
+            ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
+            TEX_TYPE_2D,
+            width, height,
+            0,
+            PF_FLOAT16_RGBA,
+            Ogre::TU_STATIC);
+
+    destTexture->getBuffer()->blit(destTextureRot->getBuffer());
+
     // remove all the junk we've created
+    TextureManager::getSingleton().remove(destImageRot);
     MaterialManager::getSingleton().remove("ImageRotateMaterial");
     root->destroySceneManager(sceneMgr);
     delete rect;
diff --git a/libs/openengine/ogre/renderer.cpp b/libs/openengine/ogre/renderer.cpp
index 87ebe1139..3cdb00518 100644
--- a/libs/openengine/ogre/renderer.cpp
+++ b/libs/openengine/ogre/renderer.cpp
@@ -226,7 +226,7 @@ void OgreRenderer::createWindow(const std::string &title, const WindowSettings&
                     1, 1,
                     0,
                     Ogre::PF_A8R8G8B8,
-                    Ogre::TU_DYNAMIC_WRITE_ONLY);
+                    Ogre::TU_WRITE_ONLY);
 }
 
 void OgreRenderer::createScene(const std::string& camName, float fov, float nearClip)
diff --git a/readme.txt b/readme.txt
index 9a9010994..21ae85530 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.19.0
+Version: 0.20.0
 License: GPL (see GPL3.txt for more information)
 Website: http://www.openmw.org
 
@@ -69,12 +69,9 @@ Allowed options:
   --script-all [=arg(=1)] (=0)     compile all scripts (excluding dialogue scri
                                    pts) at startup
   --script-console [=arg(=1)] (=0) enable console-only script functionality
-  --script-run arg                 select a file that is executed in the consol
-                                   e on startup
+  --script-run arg                 select a file containing a list of console
+                                   commands that is executed on startup
 
-                                   Note: The file contains a list of script
-                                   lines, but not a complete scripts. That mean
-                                   s no begin/end and no variable declarations.
   --new-game [=arg(=1)] (=0)       activate char gen/new game mechanics
   --fs-strict [=arg(=1)] (=0)      strict file system handling (no case folding
                                    )
@@ -97,6 +94,36 @@ Allowed options:
 
 CHANGELOG
 
+0.20.0
+
+Bug #366: Changing the player's race during character creation does not change the look of the player character
+Bug #430: Teleporting and using loading doors linking within the same cell reloads the cell
+Bug #437: Stop animations when paused
+Bug #438: Time displays as "0 a.m." when it should be "12 a.m."
+Bug #439: Text in "name" field of potion/spell creation window is persistent
+Bug #440: Starting date at a new game is off by one day
+Bug #442: Console window doesn't close properly sometimes
+Bug #448: Do not break container window formatting when item names are very long
+Bug #458: Topics sometimes not automatically added to known topic list
+Bug #476: Auto-Moving allows player movement after using DisablePlayerControls
+Bug #478: After sleeping in a bed the rest dialogue window opens automtically again
+Bug #492: On creating potions the ingredients are removed twice
+Feature #63: Mercantile skill
+Feature #82: Persuasion Dialogue
+Feature #219: Missing dialogue filters/functions
+Feature #369: Add a FailedAction
+Feature #377: Select head/hair on character creation
+Feature #391: Dummy AI package classes
+Feature #435: Global Map, 2nd Layer
+Feature #450: Persuasion
+Feature #457: Add more script instructions
+Feature #474: update the global variable pcrace when the player's race is changed
+Task #158: Move dynamically generated classes from Player class to World Class
+Task #159: ESMStore rework and cleanup
+Task #163: More Component Namespace Cleanup
+Task #402: Move player data from MWWorld::Player to the player's NPC record
+Task #446: Fix no namespace in BulletShapeLoader
+
 0.19.0
 
 Bug #374: Character shakes in 3rd person mode near the origin