ENH: fixes + addresses discussion