Small bug fixes, and new code to try SVG and PNG export.