Fix gruntfile, minor tweaks