updated mapping.yml; minor corrections