More Work on faction NPC scripts