change to nvcc, little corrections