merged corrections from Comune