Continuing the improving of ExtCalc