better folding behavior; clean up zsh options