Added pythia makefile and other changes