DOM and SAX complited
Minor fixes