modification mapping improvements and fixes #96

Closed tristan-ranff closed 2 years ago