Cleaning up
Getting ready for zsh
Adapt to zsh
Better zsh support
Cleaning up