makefile update
main update