Minor updates and keybindings