makefile and main.h changes