More fixes and SVG rendering progress.