incorporate Juliens suggestions and update the changelog