small edits from john