manually merge and Commit QuestorManager fixes and additions by Daxten: https://github.com/Daxten/Questor/tree/0271854f4a7ce46f1b4ca3e131dc6f73f8534446