ENH: final changes, surely...