some npc fixes