Made chsh-ing to zsh optional and maybe fixed issues touching files