fix up grid and baseUnit