Fixed MAJOR issues with GridMap

Fixed