Grunt package update and minor changes