some fixes and diagrams