Upgrading data grid.
Bug fixes and tweaks.