Few not really relevant fixes of comments
further comments