Allow ZSH options to be set, misc cleanup