More Grunt tasks, multiple fixes