Some cleanup
Support other diagram formats and make SVG default