Some log fixes
xml parsing update according to standard