revised header, other small revisions