Changing some keybindings
merge