move generated diagrams out of tikz and into diagrams
fix some diagrams