Minor changes + BBox&Grid added