minor improvements in grid