add namespaces
remove unneeded function
cleanup, xml serialization