#528: Edits to help