Rasterizing fix
Optimizing SVG output
Making the code more generic