Update keybinding and minor changes