Fix some merge residues
Refactor the indexing/setting state variables via string system a bit so that it works for Groups in general