New class diagrams for API and minor changes

All API class diagrams now match our code to date.