Bug fix. We were overrunning "range" causing
problems when running on lots of GPUs
Also a small Makefile change