Updates to Quests

Changed a few things around to accommodate new quests.