Fixed class diagrams & WIP "Exceptions"