diff --git a/Makefile b/Makefile
index 96e84e5..e2d723d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all:bash ghc git python vim zsh
+all:bash ghc git python valgrind vim zsh
 
 bash:
 	cp bash_profile ~/.bash_profile
@@ -13,6 +13,9 @@ git:
 python:
 	cp pythonrc ~/.pythonrc
 
+valgrind:
+	cp valgrindrc ~/.valgrindrc
+
 vim:
 	cp vimrc ~/.vimrc
 
diff --git a/README.md b/README.md
index 43f2042..919b541 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 ![WTFPL Licensed!](http://img.shields.io/badge/license-WTFPL-blue.svg)
 
-The dotfiles I use. Includes configuration files for vim, bash, ghci, python,
+The dotfiles I use. Includes configuration files for vim, bash, ghci, python, valgrind,
 zsh and git; also a pip installation script.
 
 Some of the configurations are OS X-centric(some of it is also usable on Debian,
diff --git a/ghci b/ghci
index 865fc32..5e4090a 100644
--- a/ghci
+++ b/ghci
@@ -1,4 +1,4 @@
-:set prompt "ghci> "
+:set prompt "λ: "
 {- :set -Wall -}
 
 let ghciEscapeShellArg arg = "'" ++ concatMap (\c -> if c == '\'' then "'\"'\"'" else [c]) arg ++ "'"
diff --git a/gitconfig b/gitconfig
index 15fb292..83e7ee3 100644
--- a/gitconfig
+++ b/gitconfig
@@ -72,7 +72,7 @@
     default = simple
 
 [user]
-	name = Veit Heller
+	name = hellerve
 	email = veit.heller@student.htw-berlin.de
 [credential]
 	helper = osxkeychain
diff --git a/valgrindrc b/valgrindrc
new file mode 100644
index 0000000..b099a88
--- /dev/null
+++ b/valgrindrc
@@ -0,0 +1,20 @@
+--memcheck:leak-check=yes
+--memcheck:show-reachable=yes
+--memcheck:dsymutil=yes
+--memcheck:track-fds=yes
+--memcheck:track-origins=yes
+--memcheck:gen-suppressions=all
+
+--massif:time-unit=B
+--massif:max-snapshots=128
+--massif:stacks=yes
+--massif:peak-inaccuracy=0.5
+
+--callgrind:dump-instr=yes
+--callgrind:compress-strings=no
+--callgrind:compress-pos=no
+
+--cachegrind:I1=32768,8,64
+--cachegrind:D1=32768,8,64
+--cachegrind:L2=2097152,8,64
+--cachegrind:branch-sim=yes
diff --git a/zshrc b/zshrc
index 5fec8c3..7d1fc00 100644
--- a/zshrc
+++ b/zshrc
@@ -28,6 +28,7 @@ alias g++="g++-4.9"
 alias pupgrade="sudo python ~/.pip-upgrade 2"
 alias pupgrade3="sudo python3.4 ~/.pip-upgrade 3"
 alias cupgrade="cabal update; cabal list --simple-output --installed | awk '{print $1}' | uniq | xargs -I {} cabal install {} --reinstall"
+alias ghci="ghci -v0"
 alias psg="ps aux | grep -v grep | grep -i -e VSZ -e"
 alias qmake="/usr/local/Cellar/qt5/5.3.2/bin/qmake"
 alias lupdate="/usr/local/Cellar/qt5/5.3.2/bin/lupdate"
@@ -43,7 +44,6 @@ alias cdz="cd ~/Documents/Code/Github/zepto"
 alias cdg="cd ~/Documents/Code/Github"
 alias cdd="cd ~/Documents/Code/Github/decode"
 alias cdot="cd ~/Documents/Code/Github/.dotfiles"
-alias cdf="cd ~/Documents/Code/FKI"
 alias cdh="cd ~/Documents/Code/Github/hiss"
 alias cdw="cd ~/Documents/Code/Work"
 alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl"
@@ -136,6 +136,7 @@ save_dotfiles(){
     cp ~/.gitignore ${DOTPATH}gitignore
     cp ~/.gitconfig ${DOTPATH}gitconfig
     cp ~/.pythonrc ${DOTPATH}pythonrc
+    cp ~/.valgrindrc ${DOTPATH}valgrindrc
     cp ~/.vimrc ${DOTPATH}vimrc
     cp ~/.zshrc ${DOTPATH}zshrc
     cp ~/.pip-upgrade ${DOTPATH}pip-upgrade
@@ -147,6 +148,10 @@ makepass(){
     echo ''
 }
 
+massif(){
+    valgrind --tool=massif --massif-out-file=massif.prof $1 && ms_print massif.prof | less
+}
+
 upgrade () {
   if [ ! $1 ] ; then
         if [ `uname` = "Darwin" ]; then