network diagrams for 6, minor 6/7 cleanup