ENH: Bring up to date with all the recent changes