Cleanup of key bindings...a work in progress