Update the xml format to better show changes in git
Small fixes