Fixing bug in adjustments of mappings. Also updating specs with metadata specifications.