more grid fixes relating to #2