minor optimization and SVG renderer support