Major grunt refactoring
Grunt fixes.