Updated makefile and run.sh