WIP: minor ba edits
ENH:  Preparing for merge.
ENH:  Preparing for merge.