lots of cleanup to 2-group stuff, plus citations for Cori-Rossin