update main and makefile