XMP: validation & bugfix
clean up