data adjustment changes and some new mappings