More quests and a few more tweaks