Lots of bug fixes and keybind tweaks