minor revisions, including two fontspec changes (more to come...)