Major bug fixes and incl logical structure for GridObjects