Many revisions from Bob and some additions