lots of little revisions, mostly formatting