added changes yet again to try and make svg stuff more consistent and flexable