General cleanup, exposed key bindings to API.