Several corrections...