+ minor revision of comments