ENH: addressing more comments