fix Makefile, fix package.json/scripts