Bug Fixes and Class Diagram Update

Some bugs found were fixed and an Update was made to the Diagrams