Mostly done with Alexis' comments.
Making some progress through Olivier's comments.