ENH: More improvements
ENH: More improvements

cpatrick/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,jcfr/CDash