Modify SVG singleton structure and minor bug fixes in parser.