changed some keybindings, worked on functions