More work on Faction NPC scripts