Graphviz conversion now optional
Minor changes