Few mods and also edit grunt