Fixed 2 bugs in grid helper and grid loading code. Should be more flexible.