Some small additions / corrections.
Note: a new upstream version of xelatex fixes the issues with the alignment
of the pictures. Building PDF should work ok now.