- more comments and comment-cleanup