Made some changes to the Makefile and some of the JS files.