more edits for #563