ENH minor improbements