Made npc movement better