minor changes (and 12 pages!) --Martin