ENH: updates based on feedback from my bros @ElDeveloper, @ElBrogrammer, @adamrp and @ebolyen