testing, diagrams, fix