Grunt watch + fixes