More work on groups and fix a problem with guess migration.