fix comments from Joseph