#800: Edits to help