Olivier comments and fixes. Prepare version 5.1