More XML syntax fixes
Merge pull request #20 from patheard/basic

More XML syntax fixes