Small fixes and XML library dependency.
Removed unnecessary imports.