svg_image type and some other fixes