Additional debugging tools, SVG fixes