diff --git a/.bash_aliases b/.bash_aliases
index a197932..a143d49 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -61,6 +61,8 @@ alias gcal='gcalcli'
 
 #Sysdadmin
 alias aptsearch="aptitude search"
+alias pki="pk i"
+alias pks="pk s"
 alias openports="lsof -i 4 -n"
 alias saupdate="sa-learn --mbox --spam ~/mail/spam"
 alias pshosers="ps axeo pcpu,pid,user,command | sort -k 1 -r | head -11 "
diff --git a/.bashrc b/.bashrc
index c9709c9..8435c4b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -39,9 +39,9 @@ fi
 PERL5LIB=$HOME/local/lib64/perl5/site_perl/5.8.8/
 
 #Go Language stuff
-export GOROOT=$HOME/local/go
-export GOARCH=amd64
-export GOOS=linux
+#export GOROOT=$HOME/local/go
+#export GOARCH=amd64
+#export GOOS=linux
 case `uname` in
 Darwin)
 	export GOOS=darwin
diff --git a/.muttrc b/.muttrc
index 4726739..0b88984 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,5 +1,8 @@
 set alias_file=~/.mutt_alias
-set folder=~/Maildir/
+#set folder=~/Maildir/
+#set spoolfile="~/Maildir"
+set folder=imaps://imap.barakmich.com/
+set spoolfile=imaps://imap.barakmich.com/INBOX
 set move=no
 set mark_old=no
 set pager_stop=yes
@@ -9,7 +12,7 @@ set mbox_type=Maildir
 set mbox="~/Maildir"
 set record="+.Sent"
 set postponed="+.Drafts"
-set spoolfile="~/Maildir"
+set imap_user="barak"
 mailboxes `echo -n "+ "; find ~/Maildir -maxdepth 1 -type d -name ".*" -printf "+'%f' "`
 #set sort=date-received
 #set spoolfile=+michener.com
diff --git a/.zprofile b/.zprofile
index 5b88f32..2ab9277 100644
--- a/.zprofile
+++ b/.zprofile
@@ -6,7 +6,7 @@
 #
 
 # remove /usr/games and /usr/X11R6/bin if you want
-PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH
+PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin:$PATH; export PATH
 case `uname` in
 SunOS)
 	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH
diff --git a/.zshrc b/.zshrc
index 61486b3..6e6de85 100644
--- a/.zshrc
+++ b/.zshrc
@@ -56,7 +56,8 @@ esac
 	PROMPT='$PR_STITLE$PR_LIGHT_BLUE($PR_LIGHT_YELLOW%D{%H:%M}|%!$PR_BLUE%)[%(!.$PR_RED.$PR_GREEN)%n@%m$PR_LIGHT_CYAN %~$PR_BLUE]$PR_NO_COLOUR%(!.#.$) '
 	#source .zshprompt
 
-source ~/.zsh_profile
+#source ~/.zsh_profile
+source ~/.zprofile
 source ~/.bash_aliases
 source ~/.zshenv
 if [ -n "`which fortune`" ]; then
diff --git a/bin/pk b/bin/pk
index 7a4d7a6..8516758 100755
--- a/bin/pk
+++ b/bin/pk
@@ -2,7 +2,7 @@
 search () {
   shift 
   if which pacman >/dev/null; then
-    pacman -Ss $1
+    pacman -Ss $1 || aurget -Ss $1
   elif which port >/dev/null; then
     port search $1
   elif which portmaster >/dev/null; then
@@ -15,10 +15,23 @@ search () {
   fi
 }
 
+update () {
+  shift
+  if which pacman >/dev/null; then
+    pacman -Sy
+  elif which port >/dev/null; then
+    port selfupdate
+  elif which portmaster >/dev/null; then
+    portsnap fetch && portsnap upgrade
+  elif which apt-get >/dev/null; then
+    apt-get update
+  fi
+}
+
 install () {
   shift 
   if which pacman >/dev/null; then
-    pacman -S $*
+    pacman -S $* || aurget -Ss --asroot $*
   elif which port >/dev/null; then
     port install $*
   elif which portmaster >/dev/null; then
@@ -35,5 +48,8 @@ in
 
   "s" | "search") 
     search $*;;
+
+  "u" | "update") 
+    update $*;;
 esac