Updates prompted by Pam's work

Produce both EPS and PDF files, control rotation of labels, fix a
labelling bug