Added many of Carey's revisions.