NPC and PC overhaul