ENH: fixes + addresses discussion

COSMITS

COSMITS