grid bug fixes