comments and add comments adjusted