not quite there for zsh yet, but changes didn't break bash