Diagram updated and fixed some errors