added optional arguments to wrapfig (Thanks Giovanni)
fixed svg inside of picture template so that it respects id and class