Fixed map collisions, need to fix current grid