Feature/grunt tweaks