Fixing issue with subgrids

Fixed problem with workspace expansion and subgrid weighting problem.