Some changes, working keybindings etc