Minor tweaks, function key mappings