corrections from Massimo's comments