Update run script and new Makefile