Minor updates for events/quests management features
merging changes