updating makefile
fixing bug in gpu version, still in progress