Fixed several recommended changes by jvazquez-r7, Also Correct a XML parsing issue