more pic grid fixes