grid updated and bug fixes