diff --git a/New Text Document.txt b/New Text Document.txt
index bf549af..1904266 100644
--- a/New Text Document.txt	
+++ b/New Text Document.txt	
@@ -1 +1 @@
-next: 17584
\ No newline at end of file
+next: 17585
\ No newline at end of file
diff --git a/config.lua b/config.lua
index 2cf2d9c..8ea8c12 100644
--- a/config.lua
+++ b/config.lua
@@ -54,7 +54,7 @@ timeBetweenExActions = 1000
 
 -- Map
 -- NOTE: set mapName WITHOUT .otbm at the end
-mapName = "mymap"
+mapName = "map"
 mapAuthor = "CipSoft"
 
 -- MySQL
diff --git a/data/XML/quests.xml b/data/XML/quests.xml
index fed047e..957b897 100644
--- a/data/XML/quests.xml
+++ b/data/XML/quests.xml
@@ -1116,52 +1116,13 @@
 		<mission name="The Plague Seal" storageid="50019" startvalue="1" endvalue="1" description="You broke the second seal." />
 		<mission name="All Seals" storageid="50021" startvalue="1" endvalue="1" description="You broke all the seals." />
 	</quest>
-	<quest name="The White Raven Monastery" startstorageid="50200" startstoragevalue="1">
-		<mission name="Access to the Isle of Kings" storageid="50201" endvalue="1">
-			<missionstate id="1" description="You are a friend of Dalbrect. Since you returned his family brooch he will sail you to the Isle of Kings unless you do something stupid." />
+	<quest name="The White Raven Monastery" startstorageid="62" startstoragevalue="2">
+		<mission name="Access to the Isle of Kings" storageid="62" endvalue="2">
+			<missionstate id="2" description="You are a friend of Dalbrect. Since you returned his family brooch he will sail you to the Isle of Kings unless you do something stupid." />
 		</mission>
-		<mission name="The Investigation" storageid="50202" startvalue="1" endvalue="2">
+		<mission name="The Investigation" storageid="17584" startvalue="1" endvalue="2">
 			<missionstate id="1" description="Investigate the catacombs. Abbot Costello should be interested in information about brother Fugio." />
 			<missionstate id="2" description="You returned Fugio's Diary. Costello was very thankful about your help and gave you a blessed ankh as reward." />
 		</mission>
 	</quest>
-	<quest name="Tibia Tales" startstorageid="12650" startstoragevalue="1">
-		<mission name="Against the Spider Cult" storageid="12652" startvalue="1" endvalue="6">
-			<missionstate id="1" description="Daniel Steelsoul in Edron wants you to infiltrate the Edron Orc Cave and destroy 4 Spider Eggs." />
-			<missionstate id="2" description="You destroyed 1 of 4 Spider Eggs in the Edron Orc Cave" />
-			<missionstate id="3" description="You destroyed 2 of 4 Spider Eggs in the Edron Orc Cave" />
-			<missionstate id="4" description="You destroyed 3 of 4 Spider Eggs in the Edron Orc Cave" />
-			<missionstate id="5" description="You destroyed all Spider Eggs in the Edron Orc Cave, report back to Daniel Steelsoul!" />
-			<missionstate id="6" description="You have completed the Quest!" />
-		</mission>
-		<mission name="An Interest In Botany" storageid="12653" startvalue="1" endvalue="4">
-			<missionstate id="1" description="Rabaz in Farmine asked you to collect samples from rare plant specimen in Zao. Go to the storage room to the west and receive the Botany Almanach. Find then the Giant Dreadcoil and use your Obsidian Knife on it to obtain a sample." />
-			<missionstate id="2" description="Now you must find the second plant, a Giant Verminous and use your Obsidian Knife on it to obtain a sample." />
-			<missionstate id="3" description="You found the two samples, report back to Rabaz in Farmine!" />
-			<missionstate id="4" description="You have completed the Quest!" />
-		</mission>
-		<mission name="Graves Sanctified - In Progress" storageid="3941" startvalue="1" endvalue="15" description="You sanctified |STATE| of 15 graves." />
-		<mission name="Into the Bone Pit" storageid="3938" startvalue="1" endvalue="3">
-			<missionstate id="1" description="Search the Cursed Bone Pit in the dungeon north of Thais and dig for a well-preserved human bone for Muriel." />
-			<missionstate id="2" description="You have found a desecrated bone for Muriel." />
-			<missionstate id="3" description="You helped Muriel to obtain a desecrated bone." />
-		</mission>
-		<mission name="Rest in Hallowed Ground" storageid="3940" startvalue="1" endvalue="5">
-			<missionstate id="1" description="Go to the white raven monastery and ask for some holy water for Amanda." />
-			<missionstate id="2" description="You got the holy water from the white raven monastery. Go back to Amanda and report about your mission." />
-			<missionstate id="3" description="Sanctify every single grave at the unholy graveyard north of Edron with the holy water." />
-			<missionstate id="4" description="You have sanctified all graves at the unholy graveyard of Edron. Report about your mission at Amanda." />
-			<missionstate id="5" description="You helped Amanda by sanctifying the cursed graveyard of Edron." />
-		</mission>
-		<mission name="The Exterminator" storageid="3939" startvalue="1" endvalue="3">
-			<missionstate id="1" description="Padreia in Carlin asked you to exterminate the slimes in the sewers of Carlin by poisoning their spawn pool." />
-			<missionstate id="2" description="You poisoned the spawn pool of the slimes in the sewers of Carlin. Report to Padreia about your mission." />
-			<missionstate id="3" description="You successfully helped Padreia in saving Carlin from a slimy disease." />
-		</mission>
-		<mission name="The Ultimate Booze" storageid="12651" startvalue="1" endvalue="3">
-			<missionstate id="1" description="Boozer in Vernore asked you to bring him some special dwarven brown ale. You may find some in the brewery in Kazordoon." />
-			<missionstate id="2" description="You found the special dwarven brown ale. Bring it to Boozer in Vernore." />
-			<missionstate id="3" description="You have completed The Ultimate Booze Quest!" />
-		</mission>
-	</quest>
 </quests>
diff --git a/data/npc/costello.npc b/data/npc/costello.npc
index 37f48ff..b78dfc5 100644
--- a/data/npc/costello.npc
+++ b/data/npc/costello.npc
@@ -70,7 +70,7 @@ Topic=4,!                             -> "Then be gone!", Idle
 
 "fugio",QuestValue(63)<1          -> "To be honest, I fear the omen in my dreams may be true. Perhaps Fugio is unable to see the danger down there. Perhaps ... you are willing to investigate this matter?", topic=1
 "alright",QuestValue(63)<1        -> *
-Topic=1,"yes"    -> "Thank you very much! From now on you may open the warded doors to the catacombs", SetQuestValue(63,1), SetQuestValue(64,1)
+Topic=1,"yes"    -> "Thank you very much! From now on you may open the warded doors to the catacombs", SetQuestValue(63,1), SetQuestValue(64,1), SetQuestValue(17584,1)
 
 # 63=forschen 64=questtür wg. eingang von unten
 
@@ -81,7 +81,7 @@ Topic=1          -> *
 "diary",QuestValue(219)=0       -> "Do you want me to inspect a diary?",Type=3212, Amount=1,topic=2
 "diary",QuestValue(219)>0       -> "Thank you again for handing me that diary."
 
-Topic=2,"yes",Count(Type)>=Amount  -> "By the gods! This is brother Fugio's handwriting and what I read is horrible indeed! You have done our order a great favour by giving this diary to me! Take this blessed Ankh. May it protect you in even your darkest hours.", Delete(Type), Create(3214),SetQuestValue(219,2)
+Topic=2,"yes",Count(Type)>=Amount  -> "By the gods! This is brother Fugio's handwriting and what I read is horrible indeed! You have done our order a great favour by giving this diary to me! Take this blessed Ankh. May it protect you in even your darkest hours.", Delete(Type), Create(3214),SetQuestValue(219,2),SetQuestValue(17584,2)
 Topic=2,"no"     -> "Uhm, as you wish."
 Topic=2          -> *