correction bugs + modification makefile