Add grids, improve difficulty distribution
