Changed Makefile and Node modules