Updates after Seb's feedback on this branch