[PD-dev] Few improvements to "grid"