Merge pull request #101 from ernstchan/bugfixes

Fixed lost order of files 2-4 on schema update. Better SVG support.
took some files from live -> git
Code cleanup