further calculation (gap filling) improvements