update Makefile && misc