More xml changes...
Merge pull request #7 from JHaun/FirstFixes

More xml changes...