Made grunt suite more comprehensive