ENH:  Arno's edits + some of my own.