fixed npc issues from previous changes