Added set names. Other minor tweaks.