Remove warning about writing an integer instead of a string
Added SVG filename template, currently unused
Ensured math is done on floating point values