some corrections by seb