Updated Makefile and benchmark script