collapsed zsh opts
changed exports
Assorted formatting/comments changes
Removed some unnecessary quotes
Unnessary 'function'
Minor cleanups
Merged uni changes