Edits from Nico's review

Also a typo fix.

Note that the changes to the sample code are not yet integrated
into the artwork in the XML file.