did a lot of cleaning, also added keybindings.