- a bit of organization in Mapper
- renamed a variable in Mapper