Keybindings + some fixes