more mapkey tweaks.