Change default output format to SVG.

Change default output format from PNG to SVG due to size concerns.
Minor bugfix also committed.