corrections after discussing with Bruno