various changes, .zshrc streamlining