Integrate a bunch of new text from Guido.
1 file changed