Improvements, copy in stuff from my other zshrc that was a total mess