More revisions and comments