Some more cleanup and safety added in the Quests system