updated order of dependencies, and unbind C-z key