BF and ENH. See commit info for details

Please ignore the July 23rd commit and revert items listed; mistake on my part. ;(