maping adjustments and fixes
rest of changes