Some text changes and more comments