Proper moving NPCs finally