done with grid, few bugs left