Various comment-fixes