fixing Makefile to reference istanbul relatively
Making main.js better