Bug fixing the xml parser
Small bug corrections