Minor changes
Started replacing diagrams