Some changes to the UML.

Some changes we discussed Tuesday. Associations need to be inserted
still. Some work to be done.