diff --git a/deps/datReader/Exd/Structs.h b/deps/datReader/Exd/Structs.h
index 878876e5..873b82e8 100644
--- a/deps/datReader/Exd/Structs.h
+++ b/deps/datReader/Exd/Structs.h
@@ -65,7 +65,6 @@ namespace Component::Excel
     int8_t CNT;
     int8_t GEN;
     int8_t DEF;
-    int8_t padding0[2];
   };
 
   /* 33331 */
@@ -94,7 +93,7 @@ namespace Component::Excel
     uint16_t RecastTime;
     uint16_t Action;
     uint16_t Salvage;
-    int16_t BonusValue[6];
+    int16_t BonusValue[7];
     uint8_t Level;
     uint8_t EquipLevel;
     uint8_t EquipPvPRank;
@@ -133,7 +132,7 @@ namespace Component::Excel
     uint8_t ConditionFemale : 1;
     uint8_t ConditionMale : 1;
     uint8_t DisableSameAccount : 1;
-    int8_t padding2[6];
+    int8_t padding2[4];
   };
 
   /* 35156 */
@@ -617,6 +616,7 @@ namespace Component::Excel
   struct Emote
   {
     EmoteTextStruct Text;
+    uint32_t Unknown;
     int32_t TimelineID;
     int32_t TimelineID_Begin;
     int32_t TimelineID_End;
diff --git a/deps/datReader/zlib.h b/deps/datReader/zlib.h
index 97c368f2..6d81153e 100644
--- a/deps/datReader/zlib.h
+++ b/deps/datReader/zlib.h
@@ -1,6 +1,7 @@
 #ifndef XIV_UTILS_ZLIB_H
 #define XIV_UTILS_ZLIB_H
 
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 3137f8e4..1a8b5719 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -711,14 +711,16 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
     uint8_t LinkFamily;
     uint8_t LinkParent;
     uint8_t PoseEmote;
+    uint8_t __padding3;
+    uint16_t Flag;
     uint8_t __padding2;
-    uint32_t Flag;
+    uint8_t __padding4;
     Common::StatusWork Status[30];
     MountStruct Mount;
     uint8_t Name[32];
     uint8_t Customize[26];
-    uint8_t __padding3;
-    uint8_t __padding4;
+    uint8_t __padding5;
+    uint8_t __padding6;
     uint32_t Equipment[10];
     float Pos[3];
     uint8_t FreeCompanyTag[6];
diff --git a/src/scripts/quest/ManWil002.cpp b/src/scripts/quest/ManWil002.cpp
index 63f56ca0..9f07d245 100644
--- a/src/scripts/quest/ManWil002.cpp
+++ b/src/scripts/quest/ManWil002.cpp
@@ -69,19 +69,19 @@ public:
   {
     if( actorId == Actor0 )
     {
-      Scene00000( player );
+      Scene00000( quest, player );
     }
     else if( actorId == Actor1 )
     {
-      Scene00003( player );
+      Scene00003( quest, player );
     }
     else if( actorId == Actor2 )
     {
-      Scene00004( player );
+      Scene00004( quest, player );
     }
     else if( actorId == Actor3 )
     {
-      Scene00008( player );
+      Scene00008( quest, player );
     }
     else if( actorId == Aetheryte0 )
     {
@@ -91,7 +91,7 @@ public:
                                  player.sendEventNotice( 0x050002, 0, 1, 0, 0 );
                                  player.registerAetheryte( 2 );
                                  player.learnAction( Common::UnlockEntry::Return );
-                                 Scene00001( player );
+                                 Scene00001( quest, player );
                                },
                                nullptr, getId() );
     }
@@ -99,7 +99,7 @@ public:
 
 private:
 
-  void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+  void checkQuestCompletion( World::Quest& quest, Entity::Player& player, uint32_t varIdx )
   {
     if( varIdx == 1 )
     {
@@ -114,141 +114,125 @@ private:
       player.sendEventNotice( getId(), 0, 0, 0, 0 );
     }
 
-    auto pQuest = player.getQuest( getId() );
-    if( !pQuest )
-      return;
-
-    auto QUEST_VAR_ATTUNE = pQuest->getUI8AL();
-    auto QUEST_VAR_CLASS = pQuest->getUI8BH();
-    auto QUEST_VAR_TRADE = pQuest->getUI8BL();
+    auto QUEST_VAR_ATTUNE = quest.getUI8AL();
+    auto QUEST_VAR_CLASS = quest.getUI8BH();
+    auto QUEST_VAR_TRADE = quest.getUI8BL();
 
     if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
     {
-      pQuest->setSeq( SeqFinish );
+      quest.setSeq( SeqFinish );
     }
   }
 
-  void Scene00000( Entity::Player& player )
+  void Scene00000( World::Quest& quest, Entity::Player& player )
   {
-    eventMgr().playScene( player, getId(), 0, HIDE_HOTBAR,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        if( result.getResult( 0 ) == 1 ) // accept quest
-                        {
-                          Scene00050( player );
-                        }
-                      } );
+    eventMgr().playQuestScene( player, getId(), 0, HIDE_HOTBAR, bindSceneReturn( &ManWil002::Scene00000Return ) );
   }
 
-  void Scene00001( Entity::Player& player )
+  void Scene00000Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
   {
-    eventMgr().playScene( player, getId(), 1, HIDE_HOTBAR,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        Scene00002( player );
-                      } );
+    if( result.getResult( 0 ) == 1 )
+    {
+      Scene00050( quest, player );
+    }
   }
 
-  void Scene00002( Entity::Player& player )
+  void Scene00001( World::Quest& quest, Entity::Player& player )
   {
-    eventMgr().playScene( player, getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        auto pQuest = player.getQuest( getId() );
-                        if( !pQuest )
-                          return;
-                        pQuest->setUI8BL( 1 );
-                        checkQuestCompletion( player, 0 );
-                      } );
+    eventMgr().playQuestScene( player, getId(), 1, HIDE_HOTBAR, bindSceneReturn( &ManWil002::Scene00001Return ) );
   }
 
-  void Scene00003( Entity::Player& player )
+  void Scene00001Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
   {
-    eventMgr().playScene( player, getId(), 3, HIDE_HOTBAR,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        auto pQuest = player.getQuest( getId() );
-                        if( !pQuest )
-                          return;
-                        pQuest->setUI8AL( 1 );
-                        checkQuestCompletion( player, 1 );
-                      } );
+    Scene00002( quest, player );
   }
 
-  void Scene00004( Entity::Player& player )
+  void Scene00002( World::Quest& quest, Entity::Player& player )
   {
-    eventMgr().playScene( player, getId(), 4, HIDE_HOTBAR,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        if( result.getResult( 0 ) == 1 )
-                        {
-                          Scene00005( player );
-                        }
-                        else
-                          return;
-                      } );
+    eventMgr().playQuestScene( player, getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ManWil002::Scene00002Return ) );
   }
 
-  void Scene00005( Entity::Player& player )
+  void Scene00002Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
   {
-    eventMgr().playScene( player, getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        auto pQuest = player.getQuest( getId() );
-                        if( !pQuest )
-                          return;
-                        pQuest->setUI8CH( 0 );
-                        pQuest->setUI8BH( 1 );
-                        checkQuestCompletion( player, 2 );
-                      } );
+    quest.setUI8BL( 1 );
+    checkQuestCompletion( quest, player, 0 );
   }
 
-  void Scene00006( Entity::Player& player )
+  void Scene00003( World::Quest& quest, Entity::Player& player )
   {
-    eventMgr().playScene( player, getId(), 6, HIDE_HOTBAR,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                      } );
+    eventMgr().playQuestScene( player, getId(), 3, HIDE_HOTBAR, bindSceneReturn( &ManWil002::Scene00003Return ) );
   }
 
-  void Scene00007( Entity::Player& player )
+  void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
   {
-    eventMgr().playScene( player, getId(), 7, HIDE_HOTBAR,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                      } );
+    quest.setUI8AL( 1 );
+    checkQuestCompletion( quest, player, 1 );
   }
 
-  void Scene00008( Entity::Player& player )
+  void Scene00004( World::Quest& quest, Entity::Player& player )
   {
-    eventMgr().playScene( player, getId(), 8, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        if( result.getResult( 0 ) == 1 )
-                        {
-                          if( player.giveQuestRewards( getId(), 0 ) )
-                          {
-                            player.finishQuest( getId() );
-                          }
-                        }
-                      } );
+    eventMgr().playQuestScene( player, getId(), 4, HIDE_HOTBAR, bindSceneReturn( &ManWil002::Scene00004Return ) );
   }
 
-  void Scene00050( Entity::Player& player )
+  void Scene00004Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
   {
-    eventMgr().playScene( player, getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
-                      [ & ]( Entity::Player& player, const Event::SceneResult& result )
-                      {
-                        auto pQuest = player.getQuest( getId() );
-                        if( !pQuest )
-                          return;
-                        // on quest accept
-                        pQuest->setSeq( Seq1 );
-                        pQuest->setUI8CH( 1 ); // receive key item
+    if( result.getResult( 0 ) == 1 )
+    {
+      Scene00005( quest, player );
+    }
+  }
 
-                        // teleport to real ul'dah
-                        player.forceZoneing( 130 );
-                      } );
+  void Scene00005( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ManWil002::Scene00005Return ) );
+  }
+
+  void Scene00005Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    quest.setUI8CH( 0 );
+    quest.setUI8BH( 1 );
+    checkQuestCompletion( quest, player, 2 );
+  }
+
+  void Scene00006( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 6, HIDE_HOTBAR );
+  }
+
+  void Scene00007( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 7, HIDE_HOTBAR );
+  }
+
+  void Scene00008( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 8, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ, bindSceneReturn( &ManWil002::Scene00008Return ) );
+  }
+
+  void Scene00008Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    if( result.getResult( 0 ) == 1 )
+    {
+      if( player.giveQuestRewards( getId(), 0 ) )
+      {
+        player.finishQuest( getId() );
+      }
+    }
+  }
+
+  void Scene00050( World::Quest& quest, Entity::Player& player )
+  {
+    eventMgr().playQuestScene( player, getId(), 50, HIDE_HOTBAR, bindSceneReturn( &ManWil002::Scene00050Return ) );
+  }
+
+  void Scene00050Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
+  {
+    // On quest accept
+    quest.setSeq( Seq1 );
+    quest.setUI8CH( 1 ); // Receive key item
+
+    // Teleport to real ul'dah
+    player.forceZoneing( 130 );
   }
 };
 
diff --git a/src/world/Action/ActionLut.h b/src/world/Action/ActionLut.h
index a7e37d51..46d5bdf5 100644
--- a/src/world/Action/ActionLut.h
+++ b/src/world/Action/ActionLut.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <unordered_map>
 
 namespace Sapphire::World::Action
@@ -25,4 +26,4 @@ namespace Sapphire::World::Action
 
     static Lut m_actionLut;
   };
-}
\ No newline at end of file
+}
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index 0e881f39..fd7e61f1 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -998,7 +998,12 @@ void Sapphire::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 {
   Logger::debug( "[{0}] Spawning {1} for {2}", pTarget->getId(), getName(), pTarget->getName() );
 
-  pTarget->queuePacket( std::make_shared< PlayerSpawnPacket >( *this, *pTarget ) );
+  auto spawnPacket = std::make_shared< PlayerSpawnPacket >( *this, *pTarget );
+  FILE *fp;
+  fp = fopen( "spawnPacket1.bin", "wb" );
+  fwrite( spawnPacket->getData().data(), spawnPacket->getData().size(), 1, fp );
+  fclose( fp );
+  pTarget->queuePacket( spawnPacket );
 }
 
 // despawn
@@ -1628,10 +1633,6 @@ void Sapphire::Entity::Player::sendZonePackets()
     queuePacket( contentFinderList );
 
     auto statusPacket = makePlayerSetup( *this );
-    /*FILE *fp;
-    fp = fopen( "statusDump.bin", "wb" );
-    fwrite( statusPacket->getData().data(), statusPacket->getData().size(), 1, fp );
-    fclose( fp );*/
 
     queuePacket( statusPacket );
 
diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp
index f66a8fea..fb830971 100644
--- a/src/world/Actor/PlayerInventory.cpp
+++ b/src/world/Actor/PlayerInventory.cpp
@@ -522,7 +522,7 @@ void Sapphire::Entity::Player::writeInventory( InventoryType type )
     query += "container_" + std::to_string( i ) + " = " + std::to_string( currItem ? currItem->getUId() : 0 );
   }
 
-  query += " WHERE CharacterId = " + std::to_string( getId() );
+  query += " WHERE CharacterId = " + std::to_string( getCharacterId() );
 
   if( storage->isMultiStorage() )
     query += " AND storageId = " + std::to_string( static_cast< uint16_t >( type ) );
diff --git a/src/world/Manager/ShopMgr.cpp b/src/world/Manager/ShopMgr.cpp
index a9e7b034..9c2610db 100644
--- a/src/world/Manager/ShopMgr.cpp
+++ b/src/world/Manager/ShopMgr.cpp
@@ -5,7 +5,6 @@
 #include <Inventory/Item.h>
 #include <Common.h>
 #include <Service.h>
-#include <Exd/ExdData.h>
 
 using namespace Sapphire;
 
diff --git a/src/world/Network/Handlers/PacketHandlers.cpp b/src/world/Network/Handlers/PacketHandlers.cpp
index c84d56f6..7193f96f 100644
--- a/src/world/Network/Handlers/PacketHandlers.cpp
+++ b/src/world/Network/Handlers/PacketHandlers.cpp
@@ -432,21 +432,16 @@ void Sapphire::Network::GameConnection::newDiscoveryHandler( const Packets::FFXI
 
 
 
-void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
-                                                      Entity::Player& player )
+void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
 {
   auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
-  teriMgr.joinWorld( player );
-
   // init handler means this is a login procedure
   player.setIsLogin( true );
-
-  player.sendZonePackets();
+  teriMgr.joinWorld( player );
 }
 
 
-void Sapphire::Network::GameConnection::getBlacklistHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket,
-                                                             Entity::Player& player )
+void Sapphire::Network::GameConnection::getBlacklistHandler( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
 {
   const auto packet = ZoneChannelPacket< Client::FFXIVIpcGetBlacklist >( inPacket );
   auto& data = packet.data();
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index c539575d..c208222a 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -42,7 +42,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
 
       m_data.Lv = player.getLevel();
       m_data.GMRank = player.getGmRank();
-      m_data.ModeArgs = player.getPose();
+      m_data.ModeArgs = player.getPersistentEmote();
+      m_data.PoseEmote = player.getPose();
 
       if( player.isDirectorInitialized() )
       {
@@ -78,8 +79,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
       m_data.Title = player.getTitle();
       m_data.Voice = player.getVoiceId();
 
-      //m_data.activeMinion = player.getCurrentCompanion();
-      //m_data.activeMinion = 0;
+      m_data.Companion = player.getCurrentCompanion();
+      m_data.Mount.Id = player.getCurrentMount();
 
       m_data.OnlineStatus = static_cast< uint8_t >( player.getOnlineStatus() );
 
@@ -90,7 +91,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
       m_data.ObjType = 4;
       if( target.getId() == player.getId() )
       {
-        m_data.Index = 0x00;
+        m_data.Index = 0;
       }
       else
       {
@@ -128,7 +129,6 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
       }
 
      // m_data.currentMount = player.getCurrentMount();
-     // m_data.persistentEmote = player.getPersistentEmote();
 
       m_data.MainTarget = player.getTargetId();
       //m_data.type = 1;
diff --git a/src/world/Quest/Quest.cpp b/src/world/Quest/Quest.cpp
index aad86b8e..2c012957 100644
--- a/src/world/Quest/Quest.cpp
+++ b/src/world/Quest/Quest.cpp
@@ -19,32 +19,38 @@ uint16_t Sapphire::World::Quest::getId() const
 
 bool Sapphire::World::Quest::getBitFlag8( uint8_t index )
 {
-  return m_data.a.BitFlag8 & ( 1 << index );
+  uint8_t realIdx = 8 - index;
+  return m_data.a.BitFlag8 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag16( uint8_t index )
 {
-  return m_data.a.BitFlag16 & ( 1 << index );
+  uint8_t realIdx = 8 - index;
+  return m_data.a.BitFlag16 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag24( uint8_t index )
 {
-  return m_data.a.BitFlag24 & ( 1 << index );
+  uint8_t realIdx = 8 - index;
+  return m_data.a.BitFlag24 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag32( uint8_t index )
 {
-  return m_data.a.BitFlag32 & ( 1 << index );
+  uint8_t realIdx = 8 - index;
+  return m_data.a.BitFlag32 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag40( uint8_t index )
 {
-  return m_data.a.BitFlag40 & ( 1 << index );
+  uint8_t realIdx = 8 - index;
+  return m_data.a.BitFlag40 & ( 1 << realIdx );
 }
 
 bool Sapphire::World::Quest::getBitFlag48( uint8_t index )
 {
-  return m_data.a.BitFlag48 & ( 1 << index );
+  uint8_t realIdx = 8 - index;
+  return m_data.a.BitFlag48 & ( 1 << realIdx );
 }
 
 uint8_t Sapphire::World::Quest::getUI8A() const
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index 4c652573..e021b98c 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -508,7 +508,7 @@ void Sapphire::Territory::updateSessions( uint64_t tickCount, bool changedWeathe
     // this session is not linked to this area anymore, remove it from zone session list
     if( ( !pPlayer->getCurrentTerritory() ) || ( pPlayer->getCurrentTerritory() != shared_from_this() ) )
     {
-      Logger::debug( "removeActor( pPlayer );" );
+      Logger::debug( "[{}] removeActor( pPlayer );", pPlayer->getId() );
       removeActor( pPlayer );
       return;
     }
@@ -733,12 +733,12 @@ void Sapphire::Territory::updateInRangeSet( Entity::GameObjectPtr pActor, CellPt
 
 void Sapphire::Territory::onPlayerZoneIn( Entity::Player& player )
 {
-  Logger::debug( "Territory::onEnterTerritory: Territory#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() );
+  Logger::debug( "[{2}] Territory::onEnterTerritory: Territory#{0}|{1}", getGuId(), getTerritoryTypeId(), player.getId() );
 }
 
 void Sapphire::Territory::onLeaveTerritory( Entity::Player& player )
 {
-  Logger::debug( "Territory::onLeaveTerritory: Territory#{0}|{1}, Entity#{2}", getGuId(), getTerritoryTypeId(), player.getId() );
+  Logger::debug( "[{2}] Territory::onLeaveTerritory: Territory#{0}|{1}", getGuId(), getTerritoryTypeId(), player.getId() );
 }
 
 void Sapphire::Territory::onUpdate( uint64_t tickCount )
diff --git a/src/world/WorldServer.cpp b/src/world/WorldServer.cpp
index 18067c84..c30e37bb 100644
--- a/src/world/WorldServer.cpp
+++ b/src/world/WorldServer.cpp
@@ -614,8 +614,10 @@ Sapphire::Entity::PlayerPtr Sapphire::World::WorldServer::syncPlayer( uint64_t c
   // get db last write
   auto dbSync = pPlayer->getLastDBWrite();
 
+
   // db was updated and we lost track of it  - update
-  if( dbSync != lastCacheSync )
+  // @todo for now, always reload the player on login.
+  //if( dbSync != lastCacheSync )
   {
     // clear current maps
     m_playerMapById[ pPlayer->getId() ] = nullptr;