some more corrections from Corre