minor Grid bug fixes / refactor