Makefile tweaks, added compiled js