Add NPC Cillia, cleanup globalevents / fix raids