few map edits
Fix for some borked code after my cleanup
And now with the right CONST function aka get
Merge remote-tracking branch 'origin/master' into 3.1.4.8_Update