Support SVGs and other improvements