final report, makefile, minor adjustments