fixed some key bindings after refactor