Fixed wrong mapping.
Clean up.
Added mappings for a few xmpMM tags.
Introduced wildcards for rules and some mapping fixes.