Some revisions from Bill's comments