Bug fixes and new key bindings