Performance improvements
Update gruntfile
Fix gruntfile