No more grid.
Fix a couple of minor issues.