#408 A few comments