diff --git a/data/XML/quests.xml b/data/XML/quests.xml
index c3af367..cb4f22c 100644
--- a/data/XML/quests.xml
+++ b/data/XML/quests.xml
@@ -218,15 +218,15 @@
 			<missionstate id="4" description="Bring Elane one piece of royal steel, draconian steel and hell steel each." />
 			<missionstate id="5" description="You got the Outfit!" />
 		</mission>
-		<mission name="Knight Addon: Helmet" storageid="12154" startvalue="1" endvalue="6">
+		<!-- /\ -->
+		<mission name="Knight Addon: Helmet" storageid="17542" startvalue="1" endvalue="6">
 			<missionstate id="1" description="Your current task is to bring 100 perfect behemoth fangs to Gregor in Thais." />
 			<missionstate id="2" description="Your current task is to retrieve the helmet of Ramsay the Reckless from Banuta. These pesky apes steal everything they can get their dirty hands on." />
 			<missionstate id="3" description="Your current task is to obtain a flask of warrior's sweat, which can be magicially extracted from headgear worn by a true warrior, but only in small amounts. Djinns are said to be good at this." />
 			<missionstate id="4" description="Your current task is to bring royal steel to Gregor in Thais. Royal steel can only be refined by very skilled smiths." />
 			<missionstate id="5" description="You have delivered all items required for the helmet addon. Go talk to Sam and tell him Gregor sent you. He will be glad to refine your helmet." />
-			<missionstate id="6" description="Sam is currently creating the helmet for you. Be patient and don't forget to check on it later!" />
+			<missionstate id="6" description="You got the Outfit!" />
 		</mission>
-		<!-- /\ -->
 		<mission name="Mage &amp; Summoner Addon: Wand" storageid="17549" startvalue="1" endvalue="7">
 			<missionstate id="1" description="You found Angelina in a Prison. She told you a secret: Lynda in Thais can create a blessed wand. Greet her from Angelina, maybe she will aid you." />
 			<missionstate id="2" description="Lynda send you to bring her a sample of all five wands and five rods (Snakebite, Moonlight, Volcanic, Quagmire, Tempest, Vortex, Dragonbreath, Plague, Cosmic Energy and Inferno)" />
@@ -253,8 +253,7 @@
 			<missionstate id="11" description="Go talk to Zoltan in Edron and tell him that Myra nominated you for an award." />
 			<missionstate id="12" description="You got the Outfit!" />
 		</mission>
-		<!-- Todo missing other parts -->
-		<mission name="Warrior Addon: Shoulder Spike" storageid="12067" startvalue="1" endvalue="7">
+		<mission name="Warrior Addon: Shoulder Spike" storageid="17558" startvalue="1" endvalue="7">
 			<missionstate id="1" description="Your current task is to bring 100 hardened bones to Trisha in Carlin. They can sometimes be extracted from creatures that consist only of - you guessed it, bones. You need an obsidian knife though." />
 			<missionstate id="2" description="Your current task is to bring 100 turtle shells to Trisha in Carlin. Turtles can be found on some idyllic islands which have recently been discovered." />
 			<missionstate id="3" description="Your current task is to show that you have fighting spirit. Maybe someone grants you a wish...?" />
diff --git a/data/npc/gregor.npc b/data/npc/gregor.npc
index fe4a42c..d4f5338 100644
--- a/data/npc/gregor.npc
+++ b/data/npc/gregor.npc
@@ -93,7 +93,7 @@ Topic=4,"yes" -> "Well then, listen closely. First, you will have to prove that
 				"Lastly, I will have our smith refine your helmet if you bring me royal steel, an especially noble metal. ...",
 				"Did you understand everything I told you and are willing to handle this task?", Topic=5
 Topic=4 -> "However."
-Topic=5,"yes" -> "Alright then. Come back to me once you have collected 100 perfect behemoth fangs.", SetQuestValue(17542,1)
+Topic=5,"yes" -> "Alright then. Come back to me once you have collected 100 perfect behemoth fangs.", SetQuestValue(17542,1), SetQuestValue(17594,1)
 Topic=5 -> "Maybe another time."
 
 "behemoth","fang",QuestValue(17542)=1 -> Type=5893, Amount=100, "Have you really managed to fulfill the task and brought me 100 perfect behemoth fangs?", Topic=6
diff --git a/data/npc/trisha.npc b/data/npc/trisha.npc
index c566b99..a47f726 100644
--- a/data/npc/trisha.npc
+++ b/data/npc/trisha.npc
@@ -73,7 +73,7 @@ Topic=5,"yes" -> "Okay, who knows, maybe you have a chance. A really small one t
 				"The last task is the hardest. You will need to bring me a claw from a mighty dragon king. ...",
 				"Did you understand everything I told you and are willing to handle this task?", Topic=6
 Topic=5 -> "Maybe next time."
-Topic=6,"yes" -> "Excellent! Come back to me once you have collected 100 hardened bones.", SetQuestValue(17558,1)
+Topic=6,"yes" -> "Excellent! Come back to me once you have collected 100 hardened bones.", SetQuestValue(17558,1), SetQuestValue(17594,1)
 Topic=6 -> "Maybe next time."
 
 "hardened","bone",QuestValue(17558)=1 -> Type=5925, Amount=100, "How are you faring with your mission? Have you collected all 100 hardened bones?", Topic=7