fix and improve grunt file