diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
index 7bcf68a7..57c09a74 100644
--- a/src/servers/Scripts/quest/ManWil001.cpp
+++ b/src/servers/Scripts/quest/ManWil001.cpp
@@ -27,100 +27,137 @@ private:
 
    void Scene00000( Entity::Player& player )
    {
-      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 )
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            player.setOpeningSequence( 2 );
-            Scene00001( player );
-         }
-      };
-
-      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
+            if( result.param2 == 1 )
+            {
+               player.setOpeningSequence( 2 );
+               Scene00001( player );
+            }
+         } );
    }
 
    void Scene00001( Entity::Player& player )
    {
-      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         Scene00002( player );
-      };
-
-      player.playScene( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
+      player.playScene( getId(), 1, 0xF8482EFB,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00002( player );
+            player.updateQuest( getId(), SEQ_FINISH );
+         } );
    }
 
    void Scene00002( Entity::Player& player )
    {
-      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 );
-      };
-
-      player.playScene( getId(), 2, NONE, 0, 0, callback );
+      player.playScene( getId(), 2, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 );
+         } );
    }
 
    void Scene00003( Entity::Player& player )
    {
-      player.playScene( getId(), 3, NONE, 0, 0 );
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 3, NONE, 0, 0 );
+         });
    }
 
    void Scene00004( Entity::Player& player )
    {
-      player.playSceneChain( getId(), 4, 0x2c02, bindScene( &ManWil001::Scene00005 ) );
+      player.playScene( getId(), 4, 0x2c02,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00005( player );
+         } );
    }
 
    void Scene00005( Entity::Player& player )
    {
-      auto callback = [this]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         if( result.param2 == 1 )
+      player.playScene( getId(), 5, INVIS_OTHER_PC,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
          {
-            if( player.giveQuestRewards( getId(), 0 ))
-               player.finishQuest( getId());
-         }
-      };
-
-      player.playScene( getId(), 5, INVIS_OTHER_PC, 0, 0, callback );
+            if( result.param2 == 1 )
+            {
+               if( player.giveQuestRewards( getId(), 0 ) )
+                  player.finishQuest( getId() );
+            }
+         } );
    }
 
    void Scene00006( Entity::Player& player )
    {
-      player.playScene( getId(), 6, 0, 0, 0 );
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 6, 0, 0, 0 );
+         } );
    }
 
    void Scene00007( Entity::Player& player )
    {
-      player.playScene( getId(), 7, 0, 0, 0 );
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 7, 0, 0, 0 );
+         } );
    }
 
    void Scene00008( Entity::Player& player )
    {
-      player.playScene( getId(), 8, 0, 0, 0 );
+      player.playScene( getId(), 8, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 8, 0, 0, 0 );
+         } );
    }
 
    void Scene00009( Entity::Player& player )
    {
-      player.playScene( getId(), 9, 0, 0, 0 );
+      player.playScene( getId(), 9, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 9, 0, 0, 0 );
+         } );
    }
 
    void Scene00010( Entity::Player& player )
    {
-      player.playScene( getId(), 10, 0, 0, 0 );
+      player.playScene( getId(), 10, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 10, 0, 0, 0 );
+         } );
    }
 
    void Scene00011( Entity::Player& player )
    {
-      player.playScene( getId(), 11, 0, 0, 0 );
+      player.playScene( getId(), 11, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 11, 0, 0, 0 );
+         } );
    }
 
    void Scene00012( Entity::Player& player )
    {
-      player.playScene( getId(), 12, 0, 0, 0 );
+      player.playScene( getId(), 12, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 12, 0, 0, 0 );
+         } );
    }
 
    void Scene00013( Entity::Player& player )
    {
-      player.playScene( getId(), 13, 0, 0, 0 );
+      player.playScene( getId(), 13, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.playScene( getId(), 13, 0, 0, 0 );
+         } );
    }
 
 
@@ -133,8 +170,12 @@ public:
       auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
       if( actor == ACTOR0 )
+      {
          Scene00000( player );
+      }
       else if( actor == ACTOR1 )
+      {
          Scene00004( player );
+      }
    }
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp
index f0956f0b..c690f06b 100644
--- a/src/servers/Scripts/quest/ManWil002.cpp
+++ b/src/servers/Scripts/quest/ManWil002.cpp
@@ -1,5 +1,5 @@
 #include <Actor/Player.h>
-#include "Event/EventHelper.h"
+#include <Event/EventHelper.h>
 #include <ScriptObject.h>
 
 // Quest Script: ManWil002_00568
@@ -10,150 +10,226 @@
 
 class ManWil002 : public EventScript
 {
-private:
-   static constexpr auto SEQ_0 = 0;
-   static constexpr auto SEQ_1 = 1;
-   static constexpr auto SEQ_FINISH = 255;
+   private:
+      // Basic quest information 
+      // Quest vars / flags used
+      // GetQuestBitFlag8
+      // GetQuestUI8AL
+      // GetQuestUI8BH
+      // GetQuestUI8BL
+      // GetQuestUI8CH
 
-
-   static constexpr auto ACTOR0 = 1003988;
-   static constexpr auto ACTOR1 = 1002277;
-   static constexpr auto ACTOR2 = 1003908;
-   static constexpr auto ACTOR20 = 1001637;
-   static constexpr auto ACTOR3 = 1001353;
-   static constexpr auto AETHERYTE0 = 9;
-   static constexpr auto BIND_ACTOR0 = 6229228;
-   static constexpr auto ITEM0 = 2000386;
-   static constexpr auto LOC_ACTION1 = 605;
-   static constexpr auto LOC_ACTION2 = 1005;
-   static constexpr auto LOC_MARKER_01 = 4009142;
-   static constexpr auto LOC_MARKER_02 = 4009152;
-   static constexpr auto LOC_POS_CAM1 = 4105872;
-   static constexpr auto LOC_POS_CAM2 = 4105874;
-   static constexpr auto LOC_POS_CAM3 = 4009150;
-   static constexpr auto LOC_POS_CAM4 = 4143488;
-   static constexpr auto POPRANGE0 = 4110794;
-   static constexpr auto REWARD0 = 1;
-   static constexpr auto SCREENIMAGE0 = 14;
-   static constexpr auto SEQ_0_ACTOR0_LQ = 50;
-   static constexpr auto TERRITORYTYPE0 = 130;
-
-   void Scene00000( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
+      enum Sequence : uint8_t
       {
-         if( result.param2 == 1 ) // accept quest
-            Scene00050( player );
+         Seq0 = 0,
+         Seq1 = 1,
+         SeqFinish = 255,
       };
 
-      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 0, callback );
-   }
+      // Quest rewards 
+      static constexpr auto RewardExpFactor = 100;
+      static constexpr auto RewardGil = 107;
 
-   void Scene00001( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
+      // Entities found in the script data of the quest
+      static constexpr auto Actor0 = 1003988;
+      static constexpr auto Actor1 = 1002277;
+      static constexpr auto Actor2 = 1003908;
+      static constexpr auto Actor20 = 1001637;
+      static constexpr auto Actor3 = 1001353;
+      static constexpr auto Aetheryte0 = 9;
+      static constexpr auto BindActor0 = 6229228;
+      static constexpr auto Item0 = 2000386;
+      static constexpr auto LocAction1 = 605;
+      static constexpr auto LocAction2 = 1005;
+      static constexpr auto LocMarker01 = 4009142;
+      static constexpr auto LocMarker02 = 4009152;
+      static constexpr auto LocPosCam1 = 4105872;
+      static constexpr auto LocPosCam2 = 4105874;
+      static constexpr auto LocPosCam3 = 4009150;
+      static constexpr auto LocPosCam4 = 4143488;
+      static constexpr auto Poprange0 = 4110794;
+      static constexpr auto Reward0 = 1;
+      static constexpr auto Screenimage0 = 14;
+      static constexpr auto Seq0Actor0Lq = 50;
+      static constexpr auto Territorytype0 = 130;
 
-      };
-
-      player.playScene( getId(), 1, NONE, callback );
-   }
-
-   void Scene00002( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 2, NONE, callback );
-   }
-
-   void Scene00003( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 3, NONE, callback );
-   }
-
-   void Scene00004( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 4, NONE, callback );
-   }
-
-   void Scene00005( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 5, NONE, callback );
-   }
-
-   void Scene00006( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 6, NONE, callback );
-   }
-
-   void Scene00007( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 7, NONE, callback );
-   }
-
-   void Scene00008( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-
-      };
-
-      player.playScene( getId(), 8, NONE, callback );
-   }
-
-   void Scene00050( Entity::Player& player )
-   {
-      auto callback = [&]( Entity::Player& player, const Event::SceneResult& result )
-      {
-         // on quest accept
-         player.updateQuest( getId(), 1 );
-         player.setQuestUI8CH( getId(), 1 ); // receive key item
-
-         // teleport to real gridania
-         player.forceZoneing( 130 );
-      };
-
-      player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI, 0, 0, callback );
-   }
-
-
-public:
-   ManWil002() : EventScript( 66104 )
-   { }
+   public:
+      ManWil002() : EventScript( 66104 )
+      {}; 
+      ~ManWil002()
+      {}; 
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
    {
       auto actor = Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) );
 
-      if( actor == ACTOR0 )
+      if( actor == Actor0 )
+      {
          Scene00000( player );
+      }
+      else if( actor == Actor1)
+      {
+         Scene00003( player );
+      }
+      else if( actor == Actor2 )
+      {
+         Scene00004(player);
+      }
+      else if( actor == Actor3 )
+      {
+         Scene00008( player );
+      }
+      else if( actor == Aetheryte0 )
+      {
+         player.eventActionStart( 0x050002, 0x13,
+            [&]( Entity::Player& player, uint32_t eventId, uint64_t additional )
+            {
+               player.sendQuestMessage( 0x050002, 0, 1, 0, 0 );
+               player.registerAetheryte( 2 );
+               player.learnAction( 1 );
+               Scene00001( player );
+            },
+               nullptr, eventId );
+      }
    }
-};
\ No newline at end of file
+
+   private:
+
+   void checkQuestCompletion( Entity::Player& player, uint32_t varIdx )
+   {
+      if( varIdx == 1 )
+      {
+         player.sendQuestMessage( getId(), 1, 0, 0, 0 );
+      }
+      else if( varIdx == 2 )
+      {
+         player.sendQuestMessage( getId(), 2, 0, 0, 0 );
+      }
+      else
+      {
+         player.sendQuestMessage( getId(), 0, 0, 0, 0 );
+      }
+
+      auto questId = getId();
+
+      auto QUEST_VAR_ATTUNE = player.getQuestUI8AL( questId );
+      auto QUEST_VAR_CLASS = player.getQuestUI8BH( questId );
+      auto QUEST_VAR_TRADE = player.getQuestUI8BL( questId );
+
+      if( QUEST_VAR_ATTUNE == 1 && QUEST_VAR_CLASS == 1 && QUEST_VAR_TRADE == 1 )
+      {
+         player.updateQuest( questId, SeqFinish );
+      }
+   }
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 ) // accept quest
+            {
+               Scene00050( player );
+            }
+         } );
+   }
+
+   void Scene00001( Entity::Player& player )
+   {
+      player.playScene( getId(), 1, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            Scene00002( player );
+         } );
+   }
+
+   void Scene00002( Entity::Player& player )
+   {
+      player.playScene( getId(), 2, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8BL( getId(), 1 );
+            checkQuestCompletion( player, 0 );
+         } );
+   }
+
+   void Scene00003( Entity::Player& player )
+   {
+      player.playScene( getId(), 3, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8AL( getId(), 1 );
+            checkQuestCompletion( player, 1 );
+         } );
+   }
+
+   void Scene00004( Entity::Player& player )
+   {
+      player.playScene( getId(), 4, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 )
+            {
+               Scene00005( player );
+            }
+            else return;
+         } );
+   }
+
+   void Scene00005( Entity::Player& player )
+   {
+      player.playScene( getId(), 5, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            player.setQuestUI8CH( getId(), 0 );
+            player.setQuestUI8BH( getId(), 1 );
+            checkQuestCompletion( player, 2 );
+         } );
+   }
+
+   void Scene00006( Entity::Player& player )
+   {
+      player.playScene( getId(), 6, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+         } );
+   }
+
+   void Scene00007( Entity::Player& player )
+   {
+      player.playScene( getId(), 7, HIDE_HOTBAR,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+         } );
+   }
+
+   void Scene00008( Entity::Player& player )
+   {
+      player.playScene( getId(), 8, SET_EOBJ_BASE | HIDE_HOTBAR | INVIS_EOBJ,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            if( result.param2 == 1 )
+            {
+               if( player.giveQuestRewards( getId(), 0 ) )
+               {
+                  player.finishQuest( getId() );
+               }
+            }
+         } );
+   }
+
+   void Scene00050( Entity::Player& player )
+   {
+      player.playScene( getId(), 50, FADE_OUT | CONDITION_CUTSCENE | HIDE_UI,
+         [&]( Entity::Player& player, const Event::SceneResult& result )
+         {
+            // on quest accept
+            player.updateQuest( getId(), Seq1 );
+            player.setQuestUI8CH( getId(), 1 ); // receive key item
+
+            // teleport to real ul'dah
+            player.forceZoneing( 130 );
+         } );
+   }
+};
+