diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index a719750c6c..00547a2ba6 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -64,7 +64,7 @@ opencs_units (view/world
 
 opencs_units_noqt (view/world
     dialoguesubview subviews
-    enumdelegate vartypedelegate recordstatusdelegate refidtypedelegate datadisplaydelegate
+    enumdelegate vartypedelegate recordstatusdelegate idtypedelegate datadisplaydelegate
     scripthighlighter idvalidator
     )
 
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 1a2bf9df13..a13ac9a8a9 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1216,6 +1216,74 @@ namespace CSMWorld
             return true;
         }
     };
+
+    template<typename ESXRecordT>
+    struct PosColumn : public Column<ESXRecordT>
+    {
+        ESM::Position ESXRecordT::* mPosition;
+        int mIndex;
+
+        PosColumn (ESM::Position ESXRecordT::* position, int index, bool door)
+        : Column<ESXRecordT> (
+          (door ? Columns::ColumnId_DoorPositionXPos : Columns::ColumnId_PositionXPos)+index,
+          ColumnBase::Display_Float), mPosition (position), mIndex (index) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            const ESM::Position& position = record.get().*mPosition;
+            return position.pos[mIndex];
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            ESM::Position& position = record.get().*mPosition;
+
+            position.pos[mIndex] = data.toFloat();
+
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
+
+    template<typename ESXRecordT>
+    struct RotColumn : public Column<ESXRecordT>
+    {
+        ESM::Position ESXRecordT::* mPosition;
+        int mIndex;
+
+        RotColumn (ESM::Position ESXRecordT::* position, int index, bool door)
+        : Column<ESXRecordT> (
+          (door ? Columns::ColumnId_DoorPositionXRot : Columns::ColumnId_PositionXRot)+index,
+          ColumnBase::Display_Float), mPosition (position), mIndex (index) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            const ESM::Position& position = record.get().*mPosition;
+            return position.rot[mIndex];
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            ESM::Position& position = record.get().*mPosition;
+
+            position.rot[mIndex] = data.toFloat();
+
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
 }
 
 #endif
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 5616a4a481..25047807ab 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -147,6 +147,18 @@ namespace CSMWorld
             { ColumnId_Magical, "Magical" },
             { ColumnId_Silver, "Silver" },
             { ColumnId_Filter, "Filter" },
+            { ColumnId_PositionXPos, "Pos X" },
+            { ColumnId_PositionYPos, "Pos Y" },
+            { ColumnId_PositionZPos, "Pos Z" },
+            { ColumnId_PositionXRot, "Rot X" },
+            { ColumnId_PositionYRot, "Rot Y" },
+            { ColumnId_PositionZRot, "Rot Z" },
+            { ColumnId_DoorPositionXPos, "Teleport Pos X" },
+            { ColumnId_DoorPositionYPos, "Teleport Pos Y" },
+            { ColumnId_DoorPositionZPos, "Teleport Pos Z" },
+            { ColumnId_DoorPositionXRot, "Teleport Rot X" },
+            { ColumnId_DoorPositionYRot, "Teleport Rot Y" },
+            { ColumnId_DoorPositionZRot, "Teleport Rot Z" },
 
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 69b20583ae..582f5102b9 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -140,6 +140,18 @@ namespace CSMWorld
             ColumnId_Magical = 107,
             ColumnId_Silver = 108,
             ColumnId_Filter = 109,
+            ColumnId_PositionXPos = 110,
+            ColumnId_PositionYPos = 111,
+            ColumnId_PositionZPos = 112,
+            ColumnId_PositionXRot = 113,
+            ColumnId_PositionYRot = 114,
+            ColumnId_PositionZRot = 115,
+            ColumnId_DoorPositionXPos = 116,
+            ColumnId_DoorPositionYPos = 117,
+            ColumnId_DoorPositionZPos = 118,
+            ColumnId_DoorPositionXRot = 119,
+            ColumnId_DoorPositionYRot = 120,
+            ColumnId_DoorPositionZRot = 121,
 
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 7eb96a5c38..1e290d45f9 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -9,6 +9,7 @@
 #include <components/esm/esmreader.hpp>
 #include <components/esm/defs.hpp>
 #include <components/esm/loadglob.hpp>
+#include <components/esm/cellref.hpp>
 
 #include "idtable.hpp"
 #include "columnimp.hpp"
@@ -153,6 +154,12 @@ CSMWorld::Data::Data() : mRefs (mCells)
     mRefs.addColumn (new RecordStateColumn<CellRef>);
     mRefs.addColumn (new CellColumn<CellRef>);
     mRefs.addColumn (new IdColumn<CellRef>);
+    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mPos, 0, false));
+    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mPos, 1, false));
+    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mPos, 2, false));
+    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mPos, 0, false));
+    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mPos, 1, false));
+    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mPos, 2, false));
     mRefs.addColumn (new ScaleColumn<CellRef>);
     mRefs.addColumn (new OwnerColumn<CellRef>);
     mRefs.addColumn (new SoulColumn<CellRef>);
@@ -163,6 +170,12 @@ CSMWorld::Data::Data() : mRefs (mCells)
     mRefs.addColumn (new GoldValueColumn<CellRef>);
     mRefs.addColumn (new TeleportColumn<CellRef>);
     mRefs.addColumn (new TeleportCellColumn<CellRef>);
+    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mDoorDest, 0, true));
+    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mDoorDest, 1, true));
+    mRefs.addColumn (new PosColumn<CellRef> (&CellRef::mDoorDest, 2, true));
+    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mDoorDest, 0, true));
+    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mDoorDest, 1, true));
+    mRefs.addColumn (new RotColumn<CellRef> (&CellRef::mDoorDest, 2, true));
     mRefs.addColumn (new LockLevelColumn<CellRef>);
     mRefs.addColumn (new KeyColumn<CellRef>);
     mRefs.addColumn (new TrapColumn<CellRef>);
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index a5fe6d3568..83cd93e5dd 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -14,7 +14,7 @@
 #include "../world/enumdelegate.hpp"
 #include "../world/vartypedelegate.hpp"
 #include "../world/recordstatusdelegate.hpp"
-#include "../world/refidtypedelegate.hpp"
+#include "../world/idtypedelegate.hpp"
 #include "../settings/usersettingsdialog.hpp"
 
 #include "view.hpp"
@@ -56,7 +56,7 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         new CSVWorld::RecordStatusDelegateFactory());
 
     mDelegateFactories->add (CSMWorld::ColumnBase::Display_RefRecordType,
-        new CSVWorld::RefIdTypeDelegateFactory());
+        new CSVWorld::IdTypeDelegateFactory());
 
     struct Mapping
     {
diff --git a/apps/opencs/view/tools/reportsubview.cpp b/apps/opencs/view/tools/reportsubview.cpp
index fe1be85d79..182d1cdd6c 100644
--- a/apps/opencs/view/tools/reportsubview.cpp
+++ b/apps/opencs/view/tools/reportsubview.cpp
@@ -6,6 +6,8 @@
 
 #include "../../model/tools/reportmodel.hpp"
 
+#include "../../view/world/idtypedelegate.hpp"
+
 CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
 : CSVDoc::SubView (id), mModel (document.getReport (id))
 {
@@ -18,6 +20,11 @@ CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc:
     mTable->setSelectionBehavior (QAbstractItemView::SelectRows);
     mTable->setSelectionMode (QAbstractItemView::ExtendedSelection);
 
+    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (
+        document.getUndoStack(), this);
+
+    mTable->setItemDelegateForColumn (0, mIdTypeDelegate);
+
     connect (mTable, SIGNAL (doubleClicked (const QModelIndex&)), this, SLOT (show (const QModelIndex&)));
 }
 
@@ -26,6 +33,11 @@ void CSVTools::ReportSubView::setEditLock (bool locked)
     // ignored. We don't change document state anyway.
 }
 
+void CSVTools::ReportSubView::updateEditorSetting (const QString& key, const QString& value)
+{
+    mIdTypeDelegate->updateEditorSetting (key, value);
+}
+
 void CSVTools::ReportSubView::show (const QModelIndex& index)
 {
     focusId (mModel->getUniversalId (index.row()));
diff --git a/apps/opencs/view/tools/reportsubview.hpp b/apps/opencs/view/tools/reportsubview.hpp
index 626ceb663d..6503ebd278 100644
--- a/apps/opencs/view/tools/reportsubview.hpp
+++ b/apps/opencs/view/tools/reportsubview.hpp
@@ -16,6 +16,11 @@ namespace CSMTools
     class ReportModel;
 }
 
+namespace CSVWorld
+{
+    class CommandDelegate;
+}
+
 namespace CSVTools
 {
     class Table;
@@ -26,6 +31,7 @@ namespace CSVTools
 
             CSMTools::ReportModel *mModel;
             QTableView *mTable;
+            CSVWorld::CommandDelegate *mIdTypeDelegate;
 
         public:
 
@@ -33,6 +39,8 @@ namespace CSVTools
 
             virtual void setEditLock (bool locked);
 
+            virtual void updateEditorSetting (const QString&, const QString&);
+
         private slots:
 
             void show (const QModelIndex& index);
diff --git a/apps/opencs/view/world/idtypedelegate.cpp b/apps/opencs/view/world/idtypedelegate.cpp
new file mode 100755
index 0000000000..ce4e8f0148
--- /dev/null
+++ b/apps/opencs/view/world/idtypedelegate.cpp
@@ -0,0 +1,46 @@
+#include "idtypedelegate.hpp"
+
+#include "../../model/world/universalid.hpp"
+
+CSVWorld::IdTypeDelegate::IdTypeDelegate
+    (const ValueList &values, const IconList &icons, QUndoStack& undoStack, QObject *parent)
+    : DataDisplayDelegate (values, icons, undoStack, parent)
+{}
+
+bool CSVWorld::IdTypeDelegate::updateEditorSetting (const QString &settingName, const QString &settingValue)
+{
+    /// \todo make the setting key a member variable, that is initialised from a constructor argument
+    if (settingName == "Referenceable ID Type Display")
+    {
+        if (settingValue == "Icon and Text")
+            mDisplayMode = Mode_IconAndText;
+
+        else if (settingValue == "Icon Only")
+            mDisplayMode = Mode_IconOnly;
+
+        else if (settingValue == "Text Only")
+            mDisplayMode = Mode_TextOnly;
+
+        return true;
+    }
+
+    return false;
+}
+
+
+CSVWorld::IdTypeDelegateFactory::IdTypeDelegateFactory()
+{
+    for (int i=0; i<CSMWorld::UniversalId::NumberOfTypes; ++i)
+    {
+        CSMWorld::UniversalId id (static_cast<CSMWorld::UniversalId::Type> (i));
+
+        DataDisplayDelegateFactory::add (id.getType(), QString::fromUtf8 (id.getTypeName().c_str()),
+            QString::fromUtf8 (id.getIcon().c_str()));
+    }
+}
+
+CSVWorld::CommandDelegate *CSVWorld::IdTypeDelegateFactory::makeDelegate (QUndoStack& undoStack,
+    QObject *parent) const
+{
+    return new IdTypeDelegate (mValues, mIcons, undoStack, parent);
+}
diff --git a/apps/opencs/view/world/refidtypedelegate.hpp b/apps/opencs/view/world/idtypedelegate.hpp
similarity index 51%
rename from apps/opencs/view/world/refidtypedelegate.hpp
rename to apps/opencs/view/world/idtypedelegate.hpp
index 384aebb98d..ea80fd0d92 100755
--- a/apps/opencs/view/world/refidtypedelegate.hpp
+++ b/apps/opencs/view/world/idtypedelegate.hpp
@@ -1,5 +1,5 @@
-#ifndef REFIDTYPEDELEGATE_HPP
-#define REFIDTYPEDELEGATE_HPP
+#ifndef IDTYPEDELEGATE_HPP
+#define IDTYPEDELEGATE_HPP
 
 #include "enumdelegate.hpp"
 #include "util.hpp"
@@ -8,29 +8,23 @@
 
 namespace CSVWorld
 {
-    class RefIdTypeDelegate : public DataDisplayDelegate
+    class IdTypeDelegate : public DataDisplayDelegate
     {
         public:
-            RefIdTypeDelegate (const ValueList &mValues, const IconList &icons, QUndoStack& undoStack, QObject *parent);
+            IdTypeDelegate (const ValueList &mValues, const IconList &icons, QUndoStack& undoStack, QObject *parent);
 
             virtual bool updateEditorSetting (const QString &settingName, const QString &settingValue);
 
     };
 
-    class RefIdTypeDelegateFactory : public DataDisplayDelegateFactory
+    class IdTypeDelegateFactory : public DataDisplayDelegateFactory
     {
-
-        typedef std::vector < std::pair <CSMWorld::UniversalId::Type, QString> > UidTypeList;
-
         public:
-            RefIdTypeDelegateFactory();
+
+            IdTypeDelegateFactory();
 
             virtual CommandDelegate *makeDelegate (QUndoStack& undoStack, QObject *parent) const;
             ///< The ownership of the returned CommandDelegate is transferred to the caller.
-
-    private:
-            UidTypeList buildUidTypeList () const;
-
     };
 }
 
diff --git a/apps/opencs/view/world/refidtypedelegate.cpp b/apps/opencs/view/world/refidtypedelegate.cpp
deleted file mode 100755
index 7cffbf3dda..0000000000
--- a/apps/opencs/view/world/refidtypedelegate.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "refidtypedelegate.hpp"
-
-#include "../../model/world/universalid.hpp"
-
-CSVWorld::RefIdTypeDelegate::RefIdTypeDelegate
-    (const ValueList &values, const IconList &icons, QUndoStack& undoStack, QObject *parent)
-    : DataDisplayDelegate (values, icons, undoStack, parent)
-{}
-
-bool CSVWorld::RefIdTypeDelegate::updateEditorSetting (const QString &settingName, const QString &settingValue)
-{
-    if (settingName == "Referenceable ID Type Display")
-    {
-        if (settingValue == "Icon and Text")
-            mDisplayMode = Mode_IconAndText;
-
-        else if (settingValue == "Icon Only")
-            mDisplayMode = Mode_IconOnly;
-
-        else if (settingValue == "Text Only")
-            mDisplayMode = Mode_TextOnly;
-
-        return true;
-    }
-
-    return false;
-}
-
-
-CSVWorld::RefIdTypeDelegateFactory::RefIdTypeDelegateFactory()
-{
-    UidTypeList uIdList = buildUidTypeList();
-
-    for (UidTypeList::const_iterator it = uIdList.begin(); it != uIdList.end(); it++)
-    {
-        int i = it->first;
-        DataDisplayDelegateFactory::add (i, QString::fromStdString(CSMWorld::UniversalId(it->first, "").getTypeName()), it->second);
-    }
-}
-
-CSVWorld::CommandDelegate *CSVWorld::RefIdTypeDelegateFactory::makeDelegate (QUndoStack& undoStack,
-    QObject *parent) const
-{
-    return new RefIdTypeDelegate (mValues, mIcons, undoStack, parent);
-}
-
-CSVWorld::RefIdTypeDelegateFactory::UidTypeList CSVWorld::RefIdTypeDelegateFactory::buildUidTypeList() const
-{
-    UidTypeList list;
-
-    std::vector<CSMWorld::UniversalId::Type> types = CSMWorld::UniversalId::listReferenceableTypes();
-
-    for (std::vector<CSMWorld::UniversalId::Type>::const_iterator iter (types.begin());
-         iter!=types.end(); ++iter)
-    {
-        CSMWorld::UniversalId id (*iter, "");
-
-        list.push_back (std::make_pair (id.getType(), id.getIcon().c_str()));
-    }
-
-    return list;
-}
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 72e78c738e..6167c084a0 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -12,8 +12,8 @@
 #include "../../model/world/idtableproxymodel.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/record.hpp"
+
 #include "recordstatusdelegate.hpp"
-#include "refidtypedelegate.hpp"
 #include "util.hpp"
 
 void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 88227c7512..1db6e9ecd2 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -70,7 +70,10 @@ namespace MWGui
     {
         MWBase::Environment::get().getSoundManager()->playSound("Menu Click", 1.f, 1.f);
         if (sender == mButtons["return"])
+        {
+            MWBase::Environment::get().getSoundManager ()->resumeSounds (MWBase::SoundManager::Play_TypeSfx);
             MWBase::Environment::get().getWindowManager ()->removeGuiMode (GM_MainMenu);
+        }
         else if (sender == mButtons["options"])
             MWBase::Environment::get().getWindowManager ()->pushGuiMode (GM_Settings);
         else if (sender == mButtons["exitgame"])
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 430a5d8430..43f2bcc15f 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -577,8 +577,8 @@ namespace MWInput
             rot[0] = -y;
             rot[1] = 0.0f;
             rot[2] = x;
-            
-            // Only actually turn player when we're not in vanity mode 
+
+            // Only actually turn player when we're not in vanity mode
             if(!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot))
             {
                 mPlayer->yaw(x/scale);
@@ -617,9 +617,15 @@ namespace MWInput
         if (MWBase::Environment::get().getWindowManager()->isGuiMode () && MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_Video)
             MWBase::Environment::get().getWorld ()->stopVideo ();
         else if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_MainMenu))
+        {
             MWBase::Environment::get().getWindowManager()->popGuiMode();
+            MWBase::Environment::get().getSoundManager()->resumeSounds (MWBase::SoundManager::Play_TypeSfx);
+        }
         else
+        {
             MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_MainMenu);
+            MWBase::Environment::get().getSoundManager()->pauseSounds (MWBase::SoundManager::Play_TypeSfx);
+        }
     }
 
     void InputManager::toggleSpell()
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index cb7c2feb07..402eadefb4 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -425,7 +425,7 @@ void Node::getProperties(const Nif::NiTexturingProperty *&texprop,
 
 Ogre::Matrix4 Node::getLocalTransform() const
 {
-    Ogre::Matrix4 mat4(Ogre::Matrix4::IDENTITY);
+    Ogre::Matrix4 mat4 = Ogre::Matrix4(Ogre::Matrix4::IDENTITY);
     mat4.makeTransform(trafo.pos, Ogre::Vector3(trafo.scale), Ogre::Quaternion(trafo.rotation));
     return mat4;
 }