Cleanup, add calculators and triplex calculators, add multiresult directive