Update Gruntfile and small fixes.