ENH: updates from @ElDeveloper