Minor change
1) Reorder sets to be in numerical order. Fix up many derived variables for sets 1 and 2