More revisions and polishing