XMI24 — frequent mentions of MOF attributes and references as opposed to properties

There are still frequent mentions of MOF attributes and references as opposed to properties. For example 4.8.1 has several mentions such as "model attributes and references is the short name of the attribute or reference." And 4.8.5 is actually titled 'Reference representation' (4.8.4 should be "DataType-typed Properties' and 4.8.5 should be 'Class-typed Properties"). The text needs to be qualified also - for example "For multi-valued Properties, no XML attributes are declared; each value is encoded as an XML element." is wrong if the property is Class-typed.
4.8.6: Should use "Class-typed Property" instead of "association roles".
4.8.8: "AssociationEnds with references" should be "Class-typed properties"
4.11.4: "You may choose features (MOF attribute or reference)"
4.11.4: "The feature is a multi-valued attribute, or

• The feature is an attribute whose type is not a simple data type." (note that in the last clause 'simple data type' is not a well-defined term).
  4.11.5: "and for attributes and association ends belonging to the class. For example, the element tag applies to attributes and association ends. If the element tag is set to true for a class, the class itself is not affected, but each attribute and association end belonging to the class is treated as if the element tag were set to true for all of them."
  5.2 rule 2 has "Associations without References," and rule 3 has "based on the attributes and references". Rule 4 contains numerous rules for Attributes and References.
  6.4.2 likewise

Clarify as proposed