- just some misc non-function changing updates
- makes this consistent with the rest of the mapper files and codebase in general - this affects new and edited files in recent commits