fix Groupement bug, make small style changes