lots of grid fixes