more bug fixing on grid