ENH: address all comments