Christph edits and a line for John. --Lindley