Added more errors and dom4j
them merge conflicts....