Bug fix/work on npc system