improve cmdline mappings