Updated some Edron NPCs, ref #1192

PS: pushed this early so #1170 can be done