Couple more revisions from Ellen

Also line break fixes