Fixing more bugs in Grunt, getting rdy for a release