Editing of comments
Changes for release