changes from Suzanne's email, and others. Penultimate revision.