Better npc handling