added scholar, fixed auto-stun, simplified perpetuation sets, added new armor