changes + keybinding
more changes.