#585: Help edits