mantis #8012, reorder of npc triggers to resolve issue
Edit to Cado census npc
misc npc file work