Several edits for #327.