Merge + UNIFY final updates from Garrett to |-nico-rafe

The ideas is to take changes from `|-nico-garrett` and add them into `|-nico-rafe` and then we'll rename `|-nico-rafe` to **`nico-hen`** and remove the old one!