More changes made to comments, as requested by jvrv