fixed some npcs bugs