ENH:  Fixed Arno's comments