loads of fixes, html/svg WIP