Minor revisions to the object diagram / design.