some reordering of the comment-section.