few fixes to fit Clotilde's comments