corrections from Oliviera