Minor updates to command and insert mode mappings