Redid drawing in prep for SVG
SVG rendering, looks good in FF at least...