Misc changes, and svg graphics