Commit No. 12 - XML corrections