bugfixes, xml, functionality