removed unwanted key-bindings, minor modifications