Quick improvements on grid.