Various key-bindings + alias updates