Several edits. refs #395.