ENH Improvements & fixes