Uncertainty and filter calcs updated