diff --git a/apps/browser/PingHelper.cpp b/apps/browser/PingHelper.cpp
index 030f71610..b5f946b8a 100644
--- a/apps/browser/PingHelper.cpp
+++ b/apps/browser/PingHelper.cpp
@@ -14,6 +14,12 @@ void PingHelper::Add(int row, const AddrPair &addrPair)
         pingThread->start();
 }
 
+void PingHelper::Reset()
+{
+    //if (pingThread->isRunning())
+    Stop();
+}
+
 void PingHelper::Stop()
 {
     emit pingUpdater->stop();
diff --git a/apps/browser/PingHelper.hpp b/apps/browser/PingHelper.hpp
index 7866d7bfc..808757482 100644
--- a/apps/browser/PingHelper.hpp
+++ b/apps/browser/PingHelper.hpp
@@ -17,6 +17,7 @@ class PingHelper : public QObject
     Q_OBJECT
 public:
 
+    void Reset();
     void Add(int row, const AddrPair &addrPair);
     void Stop();
     void SetModel(QAbstractTableModel *model);
diff --git a/apps/browser/PingUpdater.cpp b/apps/browser/PingUpdater.cpp
index 54122ffd8..befea9c3c 100644
--- a/apps/browser/PingUpdater.cpp
+++ b/apps/browser/PingUpdater.cpp
@@ -42,7 +42,7 @@ void PingUpdater::process()
         unsigned ping = PingRakNetServer(server.second.first.toLatin1(), server.second.second);
 
         qDebug() << "Pong from" << server.second.first + "|" + QString::number(server.second.second)
-                 << ":" << ping << "ms";
+                 << ":" << ping << "ms" << "Sizeof servers: " << servers.size();
 
         emit updateModel(server.first, ping);
     }
diff --git a/apps/browser/QueryHelper.cpp b/apps/browser/QueryHelper.cpp
index 2e1be8df2..8fee88db8 100644
--- a/apps/browser/QueryHelper.cpp
+++ b/apps/browser/QueryHelper.cpp
@@ -29,6 +29,7 @@ void QueryHelper::refresh()
     if (!queryThread->isRunning())
     {
         _model->removeRows(0, _model->rowCount());
+        PingHelper::Get().Stop();
         queryThread->start();
         emit started();
     }
diff --git a/apps/openmw-mp/Actors.cpp b/apps/openmw-mp/Actors.cpp
index 1f7f379e4..ffe0090ae 100644
--- a/apps/openmw-mp/Actors.cpp
+++ b/apps/openmw-mp/Actors.cpp
@@ -239,7 +239,7 @@ void ActorController::sendList(std::shared_ptr<Player> player, std::vector<std::
 {
     actorList.cell = player->cell;
     actorList.guid = player->guid;
-    actorList.action = mwmp::BaseActorList::SET;
+    actorList.action = mwmp::BaseActorList::Action::Set;
 
     for (auto &actor : actors)
     {
@@ -257,7 +257,7 @@ void ActorController::requestList(std::shared_ptr<Player> player, const ESM::Cel
 {
     actorList.cell = player->cell;
     actorList.guid = player->guid;
-    actorList.action = mwmp::BaseActorList::REQUEST;
+    actorList.action = mwmp::BaseActorList::Action::Request;
 
     auto packet = mwmp::Networking::get().getActorPacketController()->GetPacket(ID_ACTOR_LIST);
     packet->setActorList(&actorList);
@@ -270,9 +270,9 @@ std::vector<std::shared_ptr<Actor>> ActorController::getActors(std::shared_ptr<P
 
     std::vector<std::shared_ptr<Actor>> actorList;
 
-    for (auto actor : serverCell->getActorList()->baseActors)
+    for (const auto &actor : serverCell->getActorList()->baseActors)
     {
-        Actor *a = new Actor;
+        auto a = new Actor;
         a->actor = actor;
         actorList.emplace_back(a);
     }
diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index bb53ef3fc..f1e6f1a3a 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -34,6 +34,7 @@ using namespace std;
 Networking *Networking::sThis = nullptr;
 
 static int currentMpNum = 0;
+static bool pluginEnforcementState = true;
 
 Networking::Networking(RakNet::RakPeerInterface *peer) : mclient(nullptr)
 {
@@ -226,14 +227,16 @@ bool Networking::update(RakNet::Packet *packet)
             packetPreInit.SetSendStream(&bs);
 
             // If the loop above was broken, then the client's plugins do not match the server's
-            if (plugin != plugins.end())
+            if (pluginEnforcementState && plugin != plugins.end())
             {
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "%s was not allowed to connect due to incompatible plugins", packet->systemAddress.ToString());
                 packetPreInit.setChecksums(&samples);
                 packetPreInit.Send(packet->systemAddress);
                 peer->CloseConnection(packet->systemAddress, true);
             }
             else
             {
+                LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "%s was allowed to connect", packet->systemAddress.ToString());
                 PacketPreInit::PluginContainer tmp;
                 packetPreInit.setChecksums(&tmp);
                 packetPreInit.Send(packet->systemAddress);
@@ -371,12 +374,21 @@ int Networking::incrementMpNum()
     return currentMpNum;
 }
 
+bool Networking::getPluginEnforcementState()
+{
+    return pluginEnforcementState;
+}
+
+void Networking::setPluginEnforcementState(bool state)
+{
+    pluginEnforcementState = state;
+}
+
 Networking &Networking::get()
 {
     return *sThis;
 }
 
-
 Networking *Networking::getPtr()
 {
     return sThis;
diff --git a/apps/openmw-mp/Networking.hpp b/apps/openmw-mp/Networking.hpp
index 64c5c7bc6..6d936b0cc 100644
--- a/apps/openmw-mp/Networking.hpp
+++ b/apps/openmw-mp/Networking.hpp
@@ -62,6 +62,9 @@ namespace  mwmp
         void setCurrentMpNum(int value);
         int incrementMpNum();
 
+        bool getPluginEnforcementState();
+        void setPluginEnforcementState(bool state);
+
         MasterClient *getMasterClient();
         void InitQuery(const std::string &queryAddr, unsigned short queryPort);
         void setServerPassword(std::string passw) noexcept;
diff --git a/apps/openmw-mp/Script/LuaState.cpp b/apps/openmw-mp/Script/LuaState.cpp
index 7790bb8ab..5f6cd6db3 100644
--- a/apps/openmw-mp/Script/LuaState.cpp
+++ b/apps/openmw-mp/Script/LuaState.cpp
@@ -170,6 +170,14 @@ LuaState::LuaState()
         mwmp::Networking::getPtr()->setCurrentMpNum(num);
     });
 
+    lua->set_function("getPluginEnforcementState", []() {
+        return mwmp::Networking::getPtr()->getPluginEnforcementState();
+    });
+
+    lua->set_function("setPluginEnforcementState", [](bool state) {
+        mwmp::Networking::getPtr()->setPluginEnforcementState(state);
+    });
+
     lua->set_function("getCaseInsensitiveFilename", [](const char *folderPath, const char *filename) {
         if (!boost::filesystem::exists(folderPath)) return "invalid";
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 9289ba32d..1f8dfd7c4 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -390,21 +390,29 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
             }
         }
 
-        if(mJumpState == JumpState_InAir)
+        if (!mCurrentJump.empty())
         {
             mAnimation->disable(mCurrentJump);
-            mCurrentJump = jumpAnimName;
-            if (mAnimation->hasAnimation("jump"))
-                mAnimation->play(mCurrentJump, Priority_Jump, jumpmask, false,
+            mCurrentJump.clear();
+        }
+
+        if(mJumpState == JumpState_InAir)
+        {
+            if (mAnimation->hasAnimation(jumpAnimName))
+            {
+                mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, false,
                              1.0f, (startAtLoop?"loop start":"start"), "stop", 0.0f, ~0ul);
+                mCurrentJump = jumpAnimName;
+            }
         }
-        else
+        else if (mJumpState == JumpState_Landing)
         {
-            mAnimation->disable(mCurrentJump);
-            mCurrentJump.clear();
-            if (mAnimation->hasAnimation("jump"))
+             if (mAnimation->hasAnimation(jumpAnimName))
+             {
                 mAnimation->play(jumpAnimName, Priority_Jump, jumpmask, true,
                              1.0f, "loop stop", "stop", 0.0f, 0);
+                mCurrentJump = jumpAnimName;
+            }
         }
     }
 }
@@ -1825,7 +1833,6 @@ void CharacterController::update(float duration)
         mHasMovedInXY = std::abs(vec.x())+std::abs(vec.y()) > 0.0f;
         isrunning = isrunning && mHasMovedInXY;
 
-
         // advance athletics
         if(mHasMovedInXY && mPtr == getPlayer())
         {
@@ -1908,7 +1915,7 @@ void CharacterController::update(float duration)
             vec.y() *= factor;
             vec.z()  = 0.0f;
         }
-        else if(vec.z() > 0.0f && mJumpState == JumpState_None)
+        else if(vec.z() > 0.0f && mJumpState != JumpState_InAir)
         {
             // Started a jump.
             float z = cls.getJump(mPtr);
@@ -1980,7 +1987,8 @@ void CharacterController::update(float duration)
         }
         else
         {
-            jumpstate = JumpState_None;
+            jumpstate = mAnimation->isPlaying(mCurrentJump) ? JumpState_Landing : JumpState_None;
+
             vec.z() = 0.0f;
 
             inJump = false;
@@ -2010,9 +2018,15 @@ void CharacterController::update(float duration)
             else if(rot.z() != 0.0f && !sneak && !(mPtr == getPlayer() && MWBase::Environment::get().getWorld()->isFirstPerson()))
             {
                 if(rot.z() > 0.0f)
+                {
                     movestate = inwater ? CharState_SwimTurnRight : CharState_TurnRight;
+                    mAnimation->disable(mCurrentJump);
+                }
                 else if(rot.z() < 0.0f)
+                {
                     movestate = inwater ? CharState_SwimTurnLeft : CharState_TurnLeft;
+                    mAnimation->disable(mCurrentJump);
+                }
             }
         }
 
diff --git a/apps/openmw/mwmp/ActorList.cpp b/apps/openmw/mwmp/ActorList.cpp
index 5c8f5a354..3c96ebb5f 100644
--- a/apps/openmw/mwmp/ActorList.cpp
+++ b/apps/openmw/mwmp/ActorList.cpp
@@ -172,7 +172,7 @@ void ActorList::sendActorsInCell(MWWorld::CellStore* cellStore)
 {
     reset();
     cell = *cellStore->getCell();
-    action = BaseActorList::SET;
+    action = BaseActorList::Action::Set;
 
     auto createActor = [](const MWWorld::Ptr &ptr){
         BaseActor *actor = new BaseActor;
diff --git a/apps/openmw/mwmp/GUI/GUIChat.cpp b/apps/openmw/mwmp/GUI/GUIChat.cpp
index d1670b4e2..c3cd91987 100644
--- a/apps/openmw/mwmp/GUI/GUIChat.cpp
+++ b/apps/openmw/mwmp/GUI/GUIChat.cpp
@@ -75,7 +75,7 @@ namespace mwmp
     {
         // Give keyboard focus to the combo box whenever the console is
         // turned on
-        SetEditState(0);
+        setEditState(0);
         windowState = CHAT_ENABLED;
     }
 
@@ -84,7 +84,7 @@ namespace mwmp
         // Apparently, hidden widgets can retain key focus
         // Remove for MyGUI 3.2.2
         windowState = CHAT_DISABLED;
-        SetEditState(0);
+        setEditState(0);
     }
 
     bool GUIChat::exit()
@@ -102,7 +102,7 @@ namespace mwmp
         if (cm.empty())
         {
             mCommandLine->setCaption("");
-            SetEditState(false);
+            setEditState(false);
             return;
         }
 
@@ -140,8 +140,7 @@ namespace mwmp
         mEditString.clear();
 
         mCommandLine->setCaption("");
-        SetEditState(false);
-
+        setEditState(false);
     }
 
     void GUIChat::onResChange(int width, int height)
@@ -226,7 +225,7 @@ namespace mwmp
         {
             case CHAT_DISABLED:
                 this->mMainWidget->setVisible(false);
-                SetEditState(false);
+                setEditState(false);
                 break;
             case CHAT_ENABLED:
                 this->mMainWidget->setVisible(true);
@@ -237,7 +236,7 @@ namespace mwmp
         }
     }
 
-    void GUIChat::SetEditState(bool state)
+    void GUIChat::setEditState(bool state)
     {
         editState = state;
         mCommandLine->setVisible(editState);
@@ -249,17 +248,17 @@ namespace mwmp
     {
         if (windowState == CHAT_DISABLED)
             return;
-        else if (windowState == CHAT_HIDDENMODE)
+
+        if (!mCommandLine->getVisible())
+            LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Opening chat.");
+
+        if (windowState == CHAT_HIDDENMODE)
         {
             setVisible(true);
             curTime = 0;
-            editState = true;
         }
-        else // CHAT_ENABLED
-            editState = true;
 
-        LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Opening chat.");
-        SetEditState(editState);
+        setEditState(true);
     }
 
     void GUIChat::keyPress(MyGUI::Widget *_sender, MyGUI::KeyCode key, MyGUI::Char _char)
@@ -294,14 +293,14 @@ namespace mwmp
         }
     }
 
-    void GUIChat::Update(float dt)
+    void GUIChat::update(float dt)
     {
         if (windowState == CHAT_HIDDENMODE && !editState && isVisible())
         {
             curTime += dt;
             if (curTime >= delay)
             {
-                SetEditState(false);
+                setEditState(false);
                 this->mMainWidget->setVisible(false);
             }
         }
diff --git a/apps/openmw/mwmp/GUI/GUIChat.hpp b/apps/openmw/mwmp/GUI/GUIChat.hpp
index 30089d0b8..c0d0fa063 100644
--- a/apps/openmw/mwmp/GUI/GUIChat.hpp
+++ b/apps/openmw/mwmp/GUI/GUIChat.hpp
@@ -47,7 +47,7 @@ namespace mwmp
         void pressedSay(); // switch chat focus (if chat mode != CHAT_DISABLED)
         void setDelay(float delay);
 
-        void Update(float dt);
+        void update(float dt);
 
         void setCaption(const std::string &str);
 
@@ -93,7 +93,7 @@ namespace mwmp
 
         void acceptCommand(MyGUI::EditBox* _sender);
 
-        void SetEditState(bool state);
+        void setEditState(bool state);
 
         int windowState;
         bool editState;
diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp
index 920a965a4..57921ce34 100644
--- a/apps/openmw/mwmp/GUIController.cpp
+++ b/apps/openmw/mwmp/GUIController.cpp
@@ -247,7 +247,7 @@ bool mwmp::GUIController:: hasFocusedElement()
 void mwmp::GUIController::update(float dt)
 {
     if (mChat != nullptr)
-        mChat->Update(dt);
+        mChat->update(dt);
 
     // Make sure we read the pressed button without resetting it, because it may also get
     // checked somewhere else
diff --git a/apps/openmw/mwmp/WorldEvent.cpp b/apps/openmw/mwmp/WorldEvent.cpp
index 04fa2cd1d..66b701b0d 100644
--- a/apps/openmw/mwmp/WorldEvent.cpp
+++ b/apps/openmw/mwmp/WorldEvent.cpp
@@ -462,13 +462,16 @@ void WorldEvent::runConsoleCommands(MWWorld::CellStore* cellStore)
                     windowManager->setConsolePtr(static_cast<LocalPlayer*>(player)->getPlayerPtr());
                     windowManager->executeCommandInConsole(consoleCommand);
                 }
-                else if (player != 0)
+                else
                 {
-                    player = PlayerList::getPlayer(guid);
+                    player = PlayerList::getPlayer(worldObject.guid);
 
-                    LOG_APPEND(Log::LOG_VERBOSE, "-- running on player %s", player->npc.mName.c_str());
-                    windowManager->setConsolePtr(static_cast<DedicatedPlayer*>(player)->getPtr());
-                    windowManager->executeCommandInConsole(consoleCommand);
+                    if (player != 0)
+                    {
+                        LOG_APPEND(Log::LOG_VERBOSE, "-- running on player %s", player->npc.mName.c_str());
+                        windowManager->setConsolePtr(static_cast<DedicatedPlayer*>(player)->getPtr());
+                        windowManager->executeCommandInConsole(consoleCommand);
+                    }
                 }
             }
             else
diff --git a/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp b/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp
index 41ab06c78..556c98bbc 100644
--- a/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp
+++ b/apps/openmw/mwmp/processors/actor/ProcessorActorList.hpp
@@ -23,10 +23,10 @@ namespace mwmp
             if (!ptrCellStore) return;
 
             LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s about %s", strPacketID.c_str(), actorList.cell.getDescription().c_str());
-            LOG_APPEND(Log::LOG_VERBOSE, "- action: %i", actorList.action);
+            LOG_APPEND(Log::LOG_VERBOSE, "- action: %i", (int) actorList.action);
 
             // If we've received a request for information, comply with it
-            if (actorList.action == mwmp::BaseActorList::REQUEST)
+            if (actorList.action == mwmp::BaseActorList::Action::Request)
             {
                 MechanicsHelper::spawnLeveledCreatures(ptrCellStore);
                 actorList.sendActorsInCell(ptrCellStore);
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 36041a85e..174560e6b 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -705,7 +705,7 @@ namespace MWPhysics
             if (physFramerate > 0)
             {
                 mPhysicsDt = 1.f / physFramerate;
-                std::cerr << "Warning: physics framerate was overriden (a new value is " << physFramerate << ")."  << std::endl;
+                std::cerr << "Warning: physics framerate was overridden (a new value is " << physFramerate << ")."  << std::endl;
             }
         }
     }
diff --git a/components/nif/data.cpp b/components/nif/data.cpp
index a6721fde1..d19c8321e 100644
--- a/components/nif/data.cpp
+++ b/components/nif/data.cpp
@@ -153,12 +153,12 @@ void NiPixelData::read(NIFStream *nif)
     // Unknown
     nif->skip(12);
 
-    mips = nif->getInt();
+    numberOfMipmaps = nif->getInt();
 
     // Bytes per pixel, should be bpp * 8
     /* int bytes = */ nif->getInt();
 
-    for(int i=0; i<mips; i++)
+    for(int i=0; i<numberOfMipmaps; i++)
     {
         // Image size and offset in the following data field
         Mipmap m;
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index e6227b52a..9b4a3a67c 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -115,7 +115,7 @@ public:
     Format fmt;
 
     unsigned int rmask, gmask, bmask, amask;
-    int bpp, mips;
+    int bpp, numberOfMipmaps;
 
     struct Mipmap
     {
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index a3b81338e..6e04c6405 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -268,7 +268,7 @@ namespace NifOsg
                 osg::ref_ptr<SceneUtil::Skeleton> skel = new SceneUtil::Skeleton;
 
                 osg::Group* root = created->asGroup();
-                if (root && root->getDataVariance() == osg::Object::STATIC)
+                if (root && root->getDataVariance() == osg::Object::STATIC && !root->asTransform())
                 {
                     skel->setStateSet(root->getStateSet());
                     skel->setName(root->getName());
@@ -440,7 +440,7 @@ namespace NifOsg
                 // The Root node can be created as a Group if no transformation is required.
                 // This takes advantage of the fact root nodes can't have additional controllers
                 // loaded from an external .kf file (original engine just throws "can't find node" errors if you try).
-                if (!nifNode->parent && nifNode->controller.empty())
+                if (!nifNode->parent && nifNode->controller.empty() && nifNode->trafo.isIdentity())
                 {
                     node = new osg::Group;
                     dataVariance = osg::Object::STATIC;
diff --git a/components/openmw-mp/Base/BaseActor.hpp b/components/openmw-mp/Base/BaseActor.hpp
index 64f2fa460..f86ede32a 100644
--- a/components/openmw-mp/Base/BaseActor.hpp
+++ b/components/openmw-mp/Base/BaseActor.hpp
@@ -46,12 +46,12 @@ namespace mwmp
             cell.blank();
         }
 
-        enum ACTOR_ACTION
+        enum class Action: uint8_t
         {
-            SET = 0,
-            ADD = 1,
-            REMOVE = 2,
-            REQUEST = 3
+            Set = 0,
+            Add,
+            Remsove,
+            Request
         };
 
         RakNet::RakNetGUID guid;
@@ -60,7 +60,7 @@ namespace mwmp
 
         ESM::Cell cell;
 
-        unsigned char action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item, 3 - Request items
+        Action action;
 
         bool isValid;
     };
diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp
index 7e42f711a..38c7ca42c 100644
--- a/components/openmw-mp/Base/BasePlayer.hpp
+++ b/components/openmw-mp/Base/BasePlayer.hpp
@@ -21,7 +21,7 @@ namespace mwmp
 {
     struct Chat
     {
-        enum class Action : uint8_t {
+        enum class Action: uint8_t {
             print = 0,
             clear,
             addchannel,
@@ -46,7 +46,7 @@ namespace mwmp
     {
         std::string quest;
         int index;
-        enum class Type
+        enum class Type: uint8_t
         {
             Entry = 0,
             Index = 1
@@ -85,7 +85,7 @@ namespace mwmp
     {
         std::string itemId;
 
-        enum class Type : uint8_t
+        enum class Type: uint8_t
         {   
             Item = 0,
             Magic,
diff --git a/components/openmw-mp/Master/PacketMasterAnnounce.cpp b/components/openmw-mp/Master/PacketMasterAnnounce.cpp
index ac8b3cecb..ff22b6465 100644
--- a/components/openmw-mp/Master/PacketMasterAnnounce.cpp
+++ b/components/openmw-mp/Master/PacketMasterAnnounce.cpp
@@ -35,7 +35,7 @@ void PacketMasterAnnounce::SetServer(QueryData *_server)
     server = _server;
 }
 
-void PacketMasterAnnounce::SetFunc(int _func)
+void PacketMasterAnnounce::SetFunc(uint32_t _func)
 {
     func = _func;
 }
diff --git a/components/openmw-mp/Master/PacketMasterAnnounce.hpp b/components/openmw-mp/Master/PacketMasterAnnounce.hpp
index 4a3a81be0..5af7ad4e0 100644
--- a/components/openmw-mp/Master/PacketMasterAnnounce.hpp
+++ b/components/openmw-mp/Master/PacketMasterAnnounce.hpp
@@ -15,12 +15,12 @@ namespace mwmp
     {
         friend class ProxyMasterPacket;
     public:
-        PacketMasterAnnounce(RakNet::RakPeerInterface *peer);
+        explicit PacketMasterAnnounce(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        void Packet(RakNet::BitStream *bs, bool send) override;
 
         void SetServer(QueryData *server);
-        void SetFunc(int keep);
+        void SetFunc(uint32_t keep);
         int GetFunc();
 
         enum Func
@@ -31,7 +31,7 @@ namespace mwmp
         };
     private:
         QueryData *server;
-        int func;
+        uint32_t func;
     };
 }
 
diff --git a/components/openmw-mp/Master/PacketMasterQuery.cpp b/components/openmw-mp/Master/PacketMasterQuery.cpp
index 1850de6c5..015b36d97 100644
--- a/components/openmw-mp/Master/PacketMasterQuery.cpp
+++ b/components/openmw-mp/Master/PacketMasterQuery.cpp
@@ -26,7 +26,7 @@ void PacketMasterQuery::Packet(RakNet::BitStream *bs, bool send)
     if (send)
         bs->Write(packetID);
 
-    int serversCount = servers->size();
+    int32_t serversCount = servers->size();
 
     RW(serversCount, send);
 
@@ -36,7 +36,7 @@ void PacketMasterQuery::Packet(RakNet::BitStream *bs, bool send)
 
     QueryData server;
     string addr;
-    unsigned short port;
+    uint16_t port;
     while (serversCount--)
     {
         if (send)
@@ -50,6 +50,12 @@ void PacketMasterQuery::Packet(RakNet::BitStream *bs, bool send)
 
         ProxyMasterPacket::addServer(this, server, send);
 
+        if(addr.empty())
+        {
+            cout << "Address empty. Aborting PacketMasterQuery::Packet" << endl;
+            return;
+        }
+
         if (send)
             serverIt++;
         else
diff --git a/components/openmw-mp/Master/PacketMasterQuery.hpp b/components/openmw-mp/Master/PacketMasterQuery.hpp
index ada4b308d..43eeafee0 100644
--- a/components/openmw-mp/Master/PacketMasterQuery.hpp
+++ b/components/openmw-mp/Master/PacketMasterQuery.hpp
@@ -15,9 +15,9 @@ namespace mwmp
     {
         friend class ProxyMasterPacket;
     public:
-        PacketMasterQuery(RakNet::RakPeerInterface *peer);
+        explicit PacketMasterQuery(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        void Packet(RakNet::BitStream *bs, bool send) override;
 
         void SetServers(std::map<RakNet::SystemAddress, QueryData> *serverMap);
     private:
diff --git a/components/openmw-mp/Master/PacketMasterUpdate.cpp b/components/openmw-mp/Master/PacketMasterUpdate.cpp
index 54f32e266..33ef10ec4 100644
--- a/components/openmw-mp/Master/PacketMasterUpdate.cpp
+++ b/components/openmw-mp/Master/PacketMasterUpdate.cpp
@@ -24,7 +24,7 @@ void PacketMasterUpdate::Packet(RakNet::BitStream *bs, bool send)
         bs->Write(packetID);
 
     string addr = server->first.ToString(false);
-    unsigned short port = server->first.GetPort();
+    uint16_t port = server->first.GetPort();
 
     RW(addr, send);
     RW(port, send);
diff --git a/components/openmw-mp/Master/PacketMasterUpdate.hpp b/components/openmw-mp/Master/PacketMasterUpdate.hpp
index 37adf2216..f3c254dbb 100644
--- a/components/openmw-mp/Master/PacketMasterUpdate.hpp
+++ b/components/openmw-mp/Master/PacketMasterUpdate.hpp
@@ -15,9 +15,9 @@ namespace mwmp
     {
         friend class ProxyMasterPacket;
     public:
-        PacketMasterUpdate(RakNet::RakPeerInterface *peer);
+        explicit PacketMasterUpdate(RakNet::RakPeerInterface *peer);
 
-        virtual void Packet(RakNet::BitStream *bs, bool send);
+        void Packet(RakNet::BitStream *bs, bool send) override;
 
         void SetServer(std::pair<RakNet::SystemAddress, QueryData> *serverPair);
     private:
diff --git a/components/openmw-mp/Master/ProxyMasterPacket.hpp b/components/openmw-mp/Master/ProxyMasterPacket.hpp
index d5d4506b5..25ca39c1f 100644
--- a/components/openmw-mp/Master/ProxyMasterPacket.hpp
+++ b/components/openmw-mp/Master/ProxyMasterPacket.hpp
@@ -14,9 +14,8 @@ namespace mwmp
     class ProxyMasterPacket : public BasePacket
     {
     private:
-        ProxyMasterPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
+        explicit ProxyMasterPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
         {
-
         }
 
     public:
@@ -25,8 +24,7 @@ namespace mwmp
         {
             using namespace std;
 
-            int rulesSize = server.rules.size();
-
+            int32_t rulesSize = server.rules.size();
             packet->RW(rulesSize, send);
 
             if (rulesSize > 2000)
@@ -38,7 +36,7 @@ namespace mwmp
 
             while (rulesSize--)
             {
-                ServerRule *rule = 0;
+                ServerRule *rule = nullptr;
                 string key;
                 if (send)
                 {
@@ -66,56 +64,38 @@ namespace mwmp
 
             vector<string>::iterator plIt;
 
-            if (send)
-                plIt = server.players.begin();
-            else
-                server.players.clear();
-
-            int playersCount = server.players.size();
+            int32_t playersCount = server.players.size();
             packet->RW(playersCount, send);
 
             if (playersCount > 2000)
                 playersCount = 0;
 
-            while (playersCount--)
+            if(!send)
             {
-                string player;
-                if (send)
-                    player = *plIt;
+                server.players.clear();
+                server.players.resize(playersCount);
+            }
 
+            for(auto &&player : server.players)
                 packet->RW(player, send);
 
-                if (!send)
-                    server.players.push_back(player);
-                else
-                    plIt++;
-            }
 
-            int pluginsCount = server.plugins.size();
+            int32_t pluginsCount = server.plugins.size();
             packet->RW(pluginsCount, send);
 
             if (pluginsCount > 2000)
                 pluginsCount = 0;
 
-            vector<Plugin>::iterator pluginIt;
-
-            if (send)
-                pluginIt = server.plugins.begin();
-            else
+            if(!send)
+            {
                 server.plugins.clear();
+                server.plugins.resize(pluginsCount);
+            }
 
-            while (pluginsCount--)
+            for(auto &&plugin : server.plugins)
             {
-                Plugin plugin;
-                if (send)
-                    plugin = *pluginIt;
-
                 packet->RW(plugin.name, send);
                 packet->RW(plugin.hash, send);
-                if (!send)
-                    server.plugins.push_back(plugin);
-                else
-                    pluginIt++;
             }
         }
     };
diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
index 1c16cb9a4..932c82ad7 100644
--- a/files/openmw.appdata.xml
+++ b/files/openmw.appdata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 Alexandre Moine <nobrakal@gmail.com> -->
-<application>
- <id type="desktop">openmw.desktop</id>
+<!--
+Copyright 2015 Alexandre Moine <nobrakal@gmail.com>
+Copyright 2017 Bret Curtis <psi29a@gmail.com>
+-->
+<component>
+ <id>org.openmw.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
- <project_license> GPL-3.0 and MIT and zlib</project_license>
+ <project_license> GPL-3.0 and MIT</project_license>
  <name>OpenMW</name>
  <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
  <description>
@@ -32,8 +35,7 @@
    <caption>Vivec seen from Ebonheart on OpenMW</caption>
   </screenshot>
  </screenshots>
-<updatecontact>nobrakal@gmail.com</updatecontact>
  <url type="homepage">https://openmw.org</url>
  <url type="bugtracker">https://bugs.openmw.org/</url>
  <url type="faq">https://openmw.org/faq/</url>
-</application>
+</component>