Fixing numbering of figures/tables.
Changes to class diagrams.