modified comments output and comment form