zsh: more adjustments