Added units to overview diagram.

Also:
 - some minor renaming of association ends.
 - some minor tidying, e.g. hiding association names on some diagrams.  Will probably do this in other places.