added programming tweaks to mappings