Fixed a lot of bugs in the composite grids