tikz diagrams and other small edits