Modified to support zsh and removed some options
Comment fixup