Grunt changes/improvements