more shortcut mappings and improvements