More work on Factional NPC scripts