various minor revisions