diff --git a/bench/Makefile.am b/bench/Makefile.am
index 90b2338..8126719 100644
--- a/bench/Makefile.am
+++ b/bench/Makefile.am
@@ -1,20 +1,23 @@
 AUTOMAKE_OPTIONS = subdir-objects
 include $(top_srcdir)/atrip.mk
 
-AM_CPPFLAGS = -I$(top_srcdir)/include/ $(CTF_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir) $(CTF_CPPFLAGS)
 AM_LDFLAGS =   @LAPACK_LIBS@ @BLAS_LIBS@
 
-bin_PROGRAMS = test_main
+bin_PROGRAMS = test_main tuples-distribution
 test_main_SOURCES = test_main.cxx
+tuples_distribution_SOURCES = tuples-distribution.cxx
 
 
-test_main_LDADD  = \
-	$(top_builddir)/src/libatrip.a
+test_main_LDADD  = $(top_builddir)/src/libatrip.a
+tuples_distribution_LDADD  = $(top_builddir)/src/libatrip.a
 
 if WITH_BUILD_CTF
 test_main_LDADD += $(CTF_BUILD_PATH)/lib/libctf.a
+tuples_distribution_LDADD  += $(CTF_BUILD_PATH)/lib/libctf.a
 else
 test_main_LDADD += @LIBCTF_LD_LIBRARY_PATH@/libctf.a
+tuples_distribution_LDADD  += @LIBCTF_LD_LIBRARY_PATH@/libctf.a
 endif
 
 if WITH_CUDA
diff --git a/etc/make/ctf.mk b/etc/make/ctf.mk
index c38ecf4..2222979 100644
--- a/etc/make/ctf.mk
+++ b/etc/make/ctf.mk
@@ -16,7 +16,7 @@ $(CTF_SRC_PATH)/configure:
 
 # Here make sure that ctf does not builld with CUDA support
 # since it is broken anyways
-# 
+#
 # Also we patch the file kernel.h because it mostl
 # doesn't work when we try to include ctf in a CUDACC
 # compiler code.
diff --git a/etc/nix/openblas.nix b/etc/nix/openblas.nix
index b57a4ee..4a88833 100644
--- a/etc/nix/openblas.nix
+++ b/etc/nix/openblas.nix
@@ -20,6 +20,8 @@ in
 
 {
 
+  pkg = myopenblas;
+
   buildInputs = with pkgs; [
     myopenblas
     scalapack
diff --git a/etc/nix/vendor-shell.nix b/etc/nix/vendor-shell.nix
new file mode 100644
index 0000000..ef7d97d
--- /dev/null
+++ b/etc/nix/vendor-shell.nix
@@ -0,0 +1,27 @@
+rec {
+
+  directory = "vendor";
+  src = ''
+
+    _add_vendor_cpath () {
+      export CPATH=$CPATH:$1
+      mkdir -p ${directory}/include
+      ln -frs $1/* ${directory}/include/
+    }
+
+    _add_vendor_lib () {
+      mkdir -p ${directory}/lib
+      ln -frs $1/* ${directory}/lib/
+    }
+
+  '';
+
+  cpath = path: ''
+    _add_vendor_cpath ${path}
+  '';
+
+  lib = path: ''
+    _add_vendor_lib ${path}
+  '';
+
+}
diff --git a/include/atrip/Debug.hpp b/include/atrip/Debug.hpp
index bf79b51..6618813 100644
--- a/include/atrip/Debug.hpp
+++ b/include/atrip/Debug.hpp
@@ -76,7 +76,7 @@
 
 // [[file:~/cuda/atrip/atrip.org::*Macros][Macros:2]]
 #ifndef LOG
-#define LOG(level, name) if (Atrip::rank == 0) std::cout << name << ": "
+#define LOG(level, name) if (atrip::Atrip::rank == 0) std::cout << name << ": "
 #endif
 // Macros:2 ends here
 
diff --git a/shell.nix b/shell.nix
index 3eeecc7..0b0899a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,5 +1,5 @@
 { compiler ? "gcc"
-, pkgs ? import <nixpkgs> {} 
+, pkgs ? import <nixpkgs> {}
 , mkl ? false
 , cuda ? false
 , docs ? true