fix grunt & JS issues