Added alternative keybindings.
Small fixes for compilation warnings etc.