Improve key bindings and history...