fix and update Makefile