Grunt improvements and Events