Added NPC tracking, changed how speed is set for NPCs