fix comments from Clayton