tweaking Makefile
removing extraneous npm modules
merge