diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3626c05
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+run*
+settings.json
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f0a5b92..03618a9 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,16 @@
 RUNDIR       ?= run
 ETICS_LMAX   ?= 2
 ETICS_NMAX   ?= 10
-GPUARCH      ?= sm_75
-CUDAHOME     ?= /usr/local/cuda
-MPIHOME      ?= /home/meiron/local
+GPUARCH      ?= sm_80
+CUDA_HOME    ?= /usr/local/cuda
+MPI_HOME     ?= /home/meiron/local
 OPTIMIZATION ?= 3
 CXXFLAGS     += $(CFLAGS)
 CUDAFLAGS    ?=
 
 CXX          ?= g++
 MPICC        ?= mpicc
-NVCC         ?= $(CUDAHOME)/bin/nvcc
+NVCC         ?= $(CUDA_HOME)/bin/nvcc -ccbin=$(CXX)
 
 export
 
diff --git a/etics b/etics
index b12ed61..c22bb63 160000
--- a/etics
+++ b/etics
@@ -1 +1 @@
-Subproject commit b12ed6130078f9bc020df88b5007d21d937d13c9
+Subproject commit c22bb6340c13b760e399b46c6b5746220f7f3640
diff --git a/grapite b/grapite
index aa58cd9..ee61f45 160000
--- a/grapite
+++ b/grapite
@@ -1 +1 @@
-Subproject commit aa58cd9b21892ece6729fbdf9062746286ae2374
+Subproject commit ee61f453267a1e69793a94258c8a317ca630aa0d
diff --git a/phigrape b/phigrape
index 0a23445..064eb4e 160000
--- a/phigrape
+++ b/phigrape
@@ -1 +1 @@
-Subproject commit 0a2344563d4916a0947f4da7f661a5206ace098e
+Subproject commit 064eb4e3c594b57a2c5a35d4ac119ed79bb6eefd
diff --git a/sapporo2/patch.diff b/sapporo2/patch.diff
index 0bbc0c5..c2a084c 100644
--- a/sapporo2/patch.diff
+++ b/sapporo2/patch.diff
@@ -103,8 +103,8 @@ diff -ruN
  .SUFFIXES: .o .cpp .ptx .cu
  
 -CUDA_TK  ?= /usr/local/cuda
-+CUDAHOME ?= /usr/local/cuda
-+CUDA_TK   = $(CUDAHOME)
++CUDA_HOME ?= /usr/local/cuda
++CUDA_TK    = $(CUDA_HOME)
 +OPTIMIZATION ?= 3
  
  
diff --git a/yebisu b/yebisu
index 604f1cb..ab99a3d 160000
--- a/yebisu
+++ b/yebisu
@@ -1 +1 @@
-Subproject commit 604f1cb18abfc8e72d858d8922fa5176c6dba636
+Subproject commit ab99a3d8f51eb1081bbbb45d58673fef128f880e